Update readme files #399
Merged
Update readme files #399
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bharathkkb
approved these changes
Mar 30, 2021
1-org/README.md
Outdated
| 1. Check if your organization already has a Access Context Manager Policy `gcloud access-context-manager policies list --organization YOUR-ORGANIZATION_ID --format="value(name)"`. | ||
| 1. Rename `./envs/shared/terraform.example.tfvars` to `./envs/shared/terraform.tfvars` and update the file with values from your environment and bootstrap (you can re-run `terraform output` in the 0-bootstrap directory to find these values). Make sure that `default_region` is set to a valid [BigQuery dataset region](https://cloud.google.com/bigquery/docs/locations). Also if the previous step showed a numeric value, make sure to un-comment the variable `create_access_context_manager_access_policy = false`. | ||
| 1. Check if your organization already has a Access Context Manager Policy `gcloud access-context-manager policies list --organization YOUR_ORGANIZATION_ID --format="value(name)"`. | ||
| 1. Rename `./envs/shared/terraform.example.tfvars` to `./envs/shared/terraform.tfvars` and update the file with values from your environment and bootstrap step (you can re-run `terraform output` in the 0-bootstrap directory to find these values, the `terraform_service_account` variable is the bootstrap `terraform_sa_email` output). Make sure that `default_region` is set to a valid [BigQuery dataset region](https://cloud.google.com/bigquery/docs/locations). Also if the previous step showed a numeric value, make sure to un-comment the variable `create_access_context_manager_access_policy = false`. See the shared folder [README.md](./envs/shared/README.md) for additional information on the values in the `terraform.tfvars` file. |
There was a problem hiding this comment.
the
terraform_service_accountvariable is the bootstrapterraform_sa_emailoutput
Can we standardize this to one, maybe terraform_service_account throughout
There was a problem hiding this comment.
Hi @bharathkkb this change would be to replace terraform_sa_email with terraform_service_account in all the code?
This change would touch these files:
- terraform-example-foundation/0-bootstrap/outputs.tf
- terraform-example-foundation/0-bootstrap/README.md
- terraform-example-foundation/0-bootstrap/modules/jenkins-agent/README.md
- terraform-example-foundation/0-bootstrap/modules/jenkins-agent/variables.tf
- terraform-example-foundation/1-org/README.md
- terraform-example-foundation/test/network_test_prepare.sh
- terraform-example-foundation/test/fixtures/bootstrap/outputs.tf
- terraform-example-foundation/test/fixtures/envs/main.tf
- terraform-example-foundation/test/fixtures/envs/variables.tf
- terraform-example-foundation/test/fixtures/networks/main.tf
- terraform-example-foundation/test/fixtures/networks/variables.tf
- terraform-example-foundation/test/fixtures/org/main.tf
- terraform-example-foundation/test/fixtures/org/variables.tf
- terraform-example-foundation/test/fixtures/projects/main.tf
- terraform-example-foundation/test/fixtures/projects/variables.tf
- terraform-example-foundation/test/fixtures/shared/main.tf
- terraform-example-foundation/test/fixtures/shared/variables.tf
- terraform-example-foundation/test/integration/bootstrap/inspec.yml
- terraform-example-foundation/test/integration/bootstrap/controls/gcp_bootstrap.rb
- terraform-example-foundation/test/setup/outputs.tf
OR
Would it be to duplicate the terraform output in the 0-bootstrap step like it was done in the test setup outputs.tf file
output "terraform_sa_email" {
value = google_service_account.int_test.email
}
output "terraform_service_account" {
value = google_service_account.int_test.email
}
There was a problem hiding this comment.
@daniel-cit so anything in test/* is not user facing and we can change. Then the only user facing change is in the output in 0-bootstrap and aligning it with the rest of the inputs makes sense. WDYT?
daniel-cit
force-pushed
the
update-readme-files
branch
from
763949a to
abc54b1
Compare
|
@bharathkkb I switched base to main branch and rebased the code |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update/Fix issue in README files: