diff --git a/0-bootstrap/README.md b/0-bootstrap/README.md index 4ec2e3e9f..34b5628bd 100644 --- a/0-bootstrap/README.md +++ b/0-bootstrap/README.md @@ -371,6 +371,7 @@ The following steps will guide you through deploying without using Cloud Build. cd gcp-bootstrap git init + git commit -m "initialize empty directory" --allow-empty git checkout -b plan git checkout -b shared @@ -428,10 +429,10 @@ The following steps will guide you through deploying without using Cloud Build. git commit -m 'Initialize policy library repo' ``` -1. Navigate out of the policies repo. +1. Navigate back to `gcp-bootstrap` repo. ```bash - cd .. + cd ../gcp-bootstrap ``` 1. To validate your policies, run `gcloud beta terraform vet`. For installation instructions, see [Install Google Cloud CLI](https://cloud.google.com/docs/terraform/policy-validation/validate-policies#install). @@ -439,7 +440,7 @@ The following steps will guide you through deploying without using Cloud Build. 1. Run the following commands and check for violations: ```bash - export VET_PROJECT_ID=pjr-seed-serverless-test + export VET_PROJECT_ID=A-VALID-PROJECT-ID terraform show -json bootstrap.tfplan > bootstrap.json gcloud beta terraform vet bootstrap.json --policy-library="../terraform-example-foundation/policy-library" --project ${VET_PROJECT_ID} ``` @@ -502,6 +503,7 @@ The following steps will guide you through deploying without using Cloud Build. 1. Commit the new code version, so you can manage versions locally. ```sh + git add backend.tf git commit -m "Init gcs backend." cd ../ ``` diff --git a/1-org/README.md b/1-org/README.md index 031102c59..46c20eeb1 100644 --- a/1-org/README.md +++ b/1-org/README.md @@ -229,6 +229,7 @@ Create `gcp-org` folder, copy `1-org` content and Terraform wrapper script; ensu ```bash git init + git commit -m "initialize empty directory" --allow-empty git checkout -b plan git checkout -b production ``` diff --git a/2-environments/README.md b/2-environments/README.md index 580188841..454920f65 100644 --- a/2-environments/README.md +++ b/2-environments/README.md @@ -194,6 +194,7 @@ See `0-bootstrap` [README-GitHub.md](../0-bootstrap/README-GitHub.md#deploying-s ```bash cd gcp-environments git init + git commit -m "initialize empty directory" --allow-empty git checkout -b production git checkout -b nonproduction git checkout -b development diff --git a/3-networks-dual-svpc/README.md b/3-networks-dual-svpc/README.md index 6582cc23a..c3e5fadf8 100644 --- a/3-networks-dual-svpc/README.md +++ b/3-networks-dual-svpc/README.md @@ -288,7 +288,7 @@ See `0-bootstrap` [README-GitHub.md](../0-bootstrap/README-GitHub.md#deploying-s cp -R terraform-example-foundation/3-networks-dual-svpc/* gcp-network cp terraform-example-foundation/build/tf-wrapper.sh gcp-network/ cp terraform-example-foundation/.gitignore gcp-network - chmod 755 ./gcp-environments/tf-wrapper.sh + chmod 755 ./gcp-network/tf-wrapper.sh ``` 1. Navigate to `gcp-network` and initialize a local Git repository to manage versions locally. Then, create the environment branches. @@ -296,6 +296,7 @@ See `0-bootstrap` [README-GitHub.md](../0-bootstrap/README-GitHub.md#deploying-s ```bash cd gcp-network git init + git commit -m "initialize empty directory" --allow-empty git checkout -b shared git checkout -b development git checkout -b nonproduction diff --git a/4-projects/README.md b/4-projects/README.md index cf5ca5d1c..5eb0d0776 100644 --- a/4-projects/README.md +++ b/4-projects/README.md @@ -243,7 +243,7 @@ See `0-bootstrap` [README-GitHub.md](../0-bootstrap/README-GitHub.md#deploying-s cp -R terraform-example-foundation/4-projects/* gcp-projects cp terraform-example-foundation/build/tf-wrapper.sh gcp-projects/ cp terraform-example-foundation/.gitignore gcp-projects - chmod 755 ./gcp-environments/tf-wrapper.sh + chmod 755 ./gcp-projects/tf-wrapper.sh ``` 1. Navigate to `gcp-projects` and initialize a local Git repository to manage versions locally. Then, create the environment branches. @@ -251,6 +251,7 @@ See `0-bootstrap` [README-GitHub.md](../0-bootstrap/README-GitHub.md#deploying-s ```bash cd gcp-projects git init + git commit -m "initialize empty directory" --allow-empty git checkout -b shared git checkout -b development git checkout -b nonproduction