Feature/336 gcloud module #343
Merged
Conversation
This file contains 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
|
Tests look good and show its working as intended again PreconditionStep #2 - "converge": module.project-factory.module.project-factory.null_resource.preconditions (local-exec): Executing: ["/bin/sh" "-c" "python3 /workspace/test/fixtures/minimal/../../../modules/core_project_factory/scripts/preconditions/preconditions.py --billing_account=\"01D904-DAF6EC-F34EF7\" --credentials_path=\"\" --folder_id=\"folders/898319216858\" --impersonate_service_account=\"\" --org_id=\"943740911108\" --shared_vpc=\"\" "]
Step #2 - "converge": module.project-factory.module.project-factory.null_resource.preconditions: Creation complete after 7s [id=6995777690283997562]modify-service-account.sh with bundled gcoudStep #2 - "converge": module.project-factory.module.project-factory.null_resource.disable_default_compute_service_account[0]: Creating...
Step #2 - "converge": module.project-factory.module.project-factory.null_resource.disable_default_compute_service_account[0]: Provisioning with 'local-exec'...
Step #2 - "converge": module.project-factory.module.project-factory.null_resource.disable_default_compute_service_account[0] (local-exec): Executing: ["/bin/sh" "-c" "../../../modules/core_project_factory/scripts/modify-service-account.sh \\\n --project_id='pf-ci-test-minimal-465f74-be61' \\\n --sa_id='674049482515-compute@developer.gserviceaccount.com' \\\n --credentials_path='' \\\n --impersonate-service-account='' \\\n --action='disable' \\\n --gcloud_bin='.terraform/modules/project-factory.project-factory.gcloud/terraform-google-modules-terraform-google-gcloud-81086f8/cache/linux/google-cloud-sdk/bin/gcloud'\n"]
Step #2 - "converge": module.project-factory.module.project-factory.null_resource.disable_default_compute_service_account[0] (local-exec): Using gcloud binary at .terraform/modules/project-factory.project-factory.gcloud/terraform-google-modules-terraform-google-gcloud-81086f8/cache/linux/google-cloud-sdk/bin/gcloud
Step #2 - "converge": module.project-factory.module.project-factory.null_resource.disable_default_compute_service_account[0] (local-exec): Disabling service account 674049482515-compute@developer.gserviceaccount.com in project pf-ci-test-minimal-465f74-be61
Step #2 - "converge": module.project-factory.module.project-factory.null_resource.disable_default_compute_service_account[0] (local-exec): Disabled service account [674049482515-compute@developer.gserviceaccount.com].
Step #2 - "converge": module.project-factory.module.project-factory.null_resource.disable_default_compute_service_account[0]: Creation complete after 2s [id=4504532100494043745] |
morgante
suggested changes
Dec 18, 2019
|
Script runs at the right time with dependencies, runs in the gcloud module, and uses the gcloud module's binary Step #2 - "converge": module.project-factory.module.project-factory.module.project_services.google_project_service.project_services["compute.googleapis.com"]: Creation complete after 27s [id=pf-ci-test-minimal-adcd52-b866/compute.googleapis.com]
Step #2 - "converge": module.project-factory.module.project-factory.module.gcloud_disable.null_resource.run_script_create[0]: Creating...
Step #2 - "converge": module.project-factory.module.project-factory.module.gcloud_disable.null_resource.run_script_create[0]: Provisioning with 'local-exec'...
Step #2 - "converge": module.project-factory.module.project-factory.module.gcloud_disable.null_resource.run_script_create[0] (local-exec): Executing: ["/bin/sh" "-c" "PATH=/workspace/test/fixtures/minimal/.terraform/modules/project-factory.project-factory.gcloud_disable/cache/linux/google-cloud-sdk/bin:$PATH\n../../../modules/core_project_factory/scripts/modify-service-account.sh --project_id='pf-ci-test-minimal-adcd52-b866' \\\n--sa_id='996957836188-compute@developer.gserviceaccount.com' \\\n--credentials_path='' \\\n--impersonate-service-account='' \\\n--action='disable'\n\n"]
Step #2 - "converge": module.project-factory.module.project-factory.module.gcloud_disable.null_resource.run_script_create[0] (local-exec): Disabling service account 996957836188-compute@developer.gserviceaccount.com in project pf-ci-test-minimal-adcd52-b866
Step #2 - "converge": module.project-factory.module.project-factory.module.gcloud_disable.null_resource.run_script_create[0] (local-exec): Disabled service account [996957836188-compute@developer.gserviceaccount.com].
Step #2 - "converge": module.project-factory.module.project-factory.module.gcloud_disable.null_resource.run_script_create[0]: Creation complete after 2s [id=8761042379654110551]
Step #2 - "converge":
Step #2 - "converge": Apply complete! Resources: 11 added, 0 changed, 0 destroyed. |
|
This isn't ready to be merged yet. Needs terraform-google-modules/terraform-google-gcloud#9 to be merged and released first. And then the |
|
One big problem i see with this is the https://github.com/terraform-google-modules/terraform-google-gcloud/blob/master/main.tf#L42 This makes it so terraform will never converge. And anyone that'll now use |
taylorludwig
changed the title
taylorludwig
changed the title
This is ready to go. It's pointing at |
morgante
approved these changes
Dec 27, 2019
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.
Fixes #342
Fixes #336
on_failure = "continue"from precondition and modify-service-account.sh stepsgcloud_executable_pathvar for specifying a different path forgclouduse_bundled_gcloud_binary(defaultfalse) var. When true uses gcloud fromgoogle-terraform-gcloudmodule rather than rely on it being pre-installed.