Skip to content

Commit

Permalink
chore: remove references to terraform-validator repository from code …
Browse files Browse the repository at this point in the history
…and active documentation (#1031)

Co-authored-by: Andrew Peabody <andrewpeabody@google.com>
  • Loading branch information
daniel-cit and apeabody authored Dec 3, 2023
1 parent 2697627 commit 27a7427
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion 0-bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Using GitHub Actions requires manual creation of the GitHub repositories used in
gcloud beta terraform vet bootstrap.json --policy-library="../policy-library" --project ${VET_PROJECT_ID}
```

*`A-VALID-PROJECT-ID`* must be an existing project you have access to. This is necessary because Terraform-validator needs to link resources to a valid Google Cloud Platform project.
*`A-VALID-PROJECT-ID`* must be an existing project you have access to. This is necessary because `gcloud beta terraform vet` needs to link resources to a valid Google Cloud Platform project.

1. Run `terraform apply`.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ Development happens on feature and bug fix branches (which can be named `feature

After validated in `development`, changes can be promoted to `non-production` by opening a PR or MR targeting the `non-production` branch and merging them. Similarly, changes can be promoted from `non-production` to `production`.

### Terraform-validator
### Policy validation

This repo uses the [terraform-tools](https://cloud.google.com/docs/terraform/policy-validation/validate-policies) component of the `gcloud` CLI to validate the Terraform plans against a [library of Google Cloud policies](https://github.com/GoogleCloudPlatform/policy-library).

Expand Down
2 changes: 1 addition & 1 deletion build/cloudbuild-tf-apply.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 3600s
substitutions:
_POLICY_REPO: '/workspace/policy-library' # add path to policies as per https://github.com/GoogleCloudPlatform/terraform-validator/blob/main/docs/policy_library.md
_POLICY_REPO: '/workspace/policy-library' # add path to policies as per https://github.com/GoogleCloudPlatform/policy-library/blob/main/docs/user_guide.md#how-to-set-up-constraints-with-policy-library
_DOCKER_TAG_VERSION_TERRAFORM: 'latest'
steps:
- id: 'setup'
Expand Down
2 changes: 1 addition & 1 deletion build/cloudbuild-tf-plan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

timeout: 1200s
substitutions:
_POLICY_REPO: '/workspace/policy-library' # add path to policies as per https://github.com/GoogleCloudPlatform/terraform-validator/blob/main/docs/policy_library.md
_POLICY_REPO: '/workspace/policy-library' # add path to policies as per https://github.com/GoogleCloudPlatform/policy-library/blob/main/docs/user_guide.md#how-to-set-up-constraints-with-policy-library
_DOCKER_TAG_VERSION_TERRAFORM: 'latest'
steps:
- id: 'setup'
Expand Down
2 changes: 1 addition & 1 deletion build/tf-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ tf_validate() {
echo "*****************************************************"
if [ -z "$policy_file_path" ]; then
echo "no policy repo found! Check the argument provided for policy_source to this script."
echo "https://github.com/GoogleCloudPlatform/terraform-validator/blob/main/docs/policy_library.md"
echo "https://github.com/GoogleCloudPlatform/policy-library/blob/main/docs/user_guide.md#how-to-set-up-constraints-with-policy-library"
else
if [ -d "$path" ]; then
cd "$path" || exit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
}
# get_labels for Spanner Instances. API format.
# This method matches data generated by Terraform Validator and other
# This method matches data generated by other
# tools that use the API format to represent resources.
get_labels(asset, non_standard_types) = resource_labels {
asset.asset_type == "spanner.googleapis.com/Instance"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ spec:
# The Beta version of the API uses the identityNamespace field instead
# It won't appear in Cloud Asset Inventory data, but it will appear
# in conversions from Terraform Validator (using the Beta provider).
# in conversions using the Beta provider.
workload_identity_field_exists(workload_identity_config) {
lib.has_field(workload_identity_config, "identityNamespace")
}
Expand Down

0 comments on commit 27a7427

Please sign in to comment.