Skip to content

Commit

Permalink
fix: fixing conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@caetano-colin
caetano-colin committed May 2, 2024
1 parent f688d61 commit e6eef0f
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 32 deletions.
Binary file modified 5-app-infra/4-service-catalog-repo/img/workflow.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions 5-app-infra/4-service-catalog-repo/modules/artifact_registry/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ No modules.

No outputs.
<!-- END_TF_DOCS -->
<<<<<<< HEAD
=======
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

Expand All @@ -73,5 +71,4 @@ No outputs.

No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
>>>>>>> main
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5 changes: 1 addition & 4 deletions 5-app-infra/source_repos/service-catalog/modules/artifact_registry/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ No modules.

No outputs.
<!-- END_TF_DOCS -->
<<<<<<< HEAD
=======
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

Expand All @@ -73,5 +71,4 @@ No outputs.

No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
>>>>>>> main
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5 changes: 1 addition & 4 deletions 5-app-infra/source_repos/service-catalog/modules/bigquery/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ No requirements.

No outputs.
<!-- END_TF_DOCS -->
<<<<<<< HEAD
=======
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

Expand All @@ -75,5 +73,4 @@ No outputs.

No outputs.

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
>>>>>>> main
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5 changes: 1 addition & 4 deletions 5-app-infra/source_repos/service-catalog/modules/composer/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ The following table outlines which of the suggested controls for Vertex Generati
| Name | Control ID | NIST 800-53 | CRI Profile | Category | Source Blueprint
|------|------------|-------------|-------------|----------| ----------------|
|Customer Managed Encryption Keys| COM-CO-2.3| SC-12 <br />SC-13| PR.DS-1.1 <br /> PR.DS-2.1 <br /> PR.DS-2.2 <br /> PR.DS-5.1 | Recommended | Secure Foundation v4
<<<<<<< HEAD
=======
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

Expand Down Expand Up @@ -128,5 +126,4 @@ The following table outlines which of the suggested controls for Vertex Generati
| gcs\_bucket | Google Cloud Storage bucket which hosts DAGs for the Cloud Composer Environment. |
| gke\_cluster | Google Kubernetes Engine cluster used to run the Cloud Composer Environment. |

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
>>>>>>> main
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5 changes: 1 addition & 4 deletions 5-app-infra/source_repos/service-catalog/modules/metadata/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ No modules.
|------|-------------|
| <a name="output_vertex_ai_metadata_store"></a> [vertex\_ai\_metadata\_store](#output\_vertex\_ai\_metadata\_store) | Vertex AI Metadata Store. |
<!-- END_TF_DOCS -->
<<<<<<< HEAD
=======
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

Expand All @@ -69,5 +67,4 @@ No modules.
|------|-------------|
| vertex\_ai\_metadata\_store | Vertex AI Metadata Store. |

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
>>>>>>> main
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5 changes: 1 addition & 4 deletions 5-app-infra/source_repos/service-catalog/modules/pubsub/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ The following table outlines which of the suggested controls for Vertex Generati
|------|------------|-------------|-------------|----------| ----------------|
|Customer Managed Encryption Keys for Pub/Sub Messages| PS-CO-6.1| SC-12 <br />SC-13| PR.DS-1.1 <br />PR.DS-1.2<br /> PR.DS-2.1 <br /> PR.DS-2.2 <br /> PR.DS-5.1 | Recommended | Secure Foundation v4
|Configure Message Storage Policies | PS-CO-4.1 | AC-3 <br /> AC-17 <br /> AC-20 <br />| PR.AC-3.1 <br />PR.AC-3.2<br /> PR.AC-4.1 <br /> PR.AC-4.2 <br /> PR.AC-4.3 <br /> PR.AC-6.1 <br /> PR.PT-3.1 <br /> PR.PT-4.1 | Optional | ML Foundation v0.1.0-alpha.1
<<<<<<< HEAD
=======
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

Expand All @@ -81,5 +79,4 @@ The following table outlines which of the suggested controls for Vertex Generati
|------|-------------|
| pubsub\_topic | Pub/Sub Topic. |

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
>>>>>>> main
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5 changes: 1 addition & 4 deletions 5-app-infra/source_repos/service-catalog/modules/secrets/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ The following table outlines which of the suggested controls for Vertex Generati
|Customer Managed Encryption Keys| COM-CO-2.3| SC-12 <br />SC-13 | PR.DS-1.1 <br />PR.DS-2.1<br /> PR.DS-2.2 <br /> PR.DS-5.1 | Recommended | Secure Foundation v4
|Automatic Secret Replication| SM-CO-6.1| SC-12 <br /> SC-13| None | Recommended based on customer use case | ML Foundation v0.1.0-alpha.1
|Set up Automatic Rotation of Secrets| SM-CO-6.2| SC-12 <br /> SC-13| None | Recommended based on customer use case | ML Foundation v0.1.0-alpha.1
<<<<<<< HEAD
=======
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

Expand All @@ -78,5 +76,4 @@ The following table outlines which of the suggested controls for Vertex Generati
|------|-------------|
| secret\_manager | Secret Manager resource. |

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
>>>>>>> main
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
5 changes: 1 addition & 4 deletions 5-app-infra/source_repos/service-catalog/modules/tensorboard/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ No modules.
|------|-------------|
| <a name="output_vertex_ai_tensorboard"></a> [vertex\_ai\_tensorboard](#output\_vertex\_ai\_tensorboard) | TensorBoard resource. |
<!-- END_TF_DOCS -->
<<<<<<< HEAD
=======
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
## Inputs

Expand All @@ -68,5 +66,4 @@ No modules.
|------|-------------|
| vertex\_ai\_tensorboard | TensorBoard resource. |

<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
>>>>>>> main
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

0 comments on commit e6eef0f

Please sign in to comment.