Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat!: Update Dockerfile to install terraform-validator from gcloud #156

Merged
merged 6 commits into from
Jun 8, 2022
Merged

feat!: Update Dockerfile to install terraform-validator from gcloud #156

merged 6 commits into from
Jun 8, 2022
+17 −26

Conversation

iyabchen
Copy link
Contributor

@iyabchen iyabchen commented Jun 3, 2022

@iyabchen
Copy link
Contributor Author

iyabchen commented Jun 3, 2022

@bharathkkb could you be the reviewer?

@daniel-cit daniel-cit mentioned this pull request Jun 5, 2022
Merged
bharathkkb
bharathkkb reviewed Jun 7, 2022
View reviewed changes
Copy link
Member

@bharathkkb bharathkkb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR @iyabchen
A few places we also need to update

terraform-google-bootstrap/modules/cloudbuild/cloudbuild_builder/Dockerfile

Line 20 in e1d3952

ARG TERRAFORM_VALIDATOR_RELEASE=v0.6.0

terraform-google-bootstrap/modules/cloudbuild/cloudbuild_builder/Dockerfile

Line 24 in e1d3952

ENV ENV_TERRAFORM_VALIDATOR_RELEASE=$TERRAFORM_VALIDATOR_RELEASE

terraform-google-bootstrap/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml

Line 32 in e1d3952

_TERRAFORM_VALIDATOR_RELEASE: 'v0.6.0'

terraform-google-bootstrap/modules/cloudbuild/main.tf

Line 197 in e1d3952

gcloud ${local.impersonate_service_account} builds submit ${path.module}/cloudbuild_builder/ --project ${module.cloudbuild_project.project_id} --config=${path.module}/cloudbuild_builder/cloudbuild.yaml --substitutions=_TERRAFORM_VERSION=${var.terraform_version},_TERRAFORM_VERSION_SHA256SUM=${var.terraform_version_sha256sum},_TERRAFORM_VALIDATOR_RELEASE=${var.terraform_validator_release},_REGION=${google_artifact_registry_repository.tf-image-repo.location},_REPOSITORY=${local.gar_name}

terraform-google-bootstrap/modules/cloudbuild/variables.tf

Lines 146 to 155 in e1d3952

variable "terraform_validator_release" {
description = "Default terraform-validator release."
type = string
default = "v0.6.0"
validation {
condition = try(tonumber(trimprefix(replace(var.terraform_validator_release, ".", ""), "v")), 0) >= 60
error_message = "Terraform-validator release must be >= v0.6.0."
}
}

modules/cloudbuild/cloudbuild_builder/Dockerfile Outdated Show resolved Hide resolved
@bharathkkb bharathkkb changed the title Update Dockerfile to install terraform-validator from gcloud feat!: Update Dockerfile to install terraform-validator from gcloud Jun 7, 2022
bharathkkb
bharathkkb previously approved these changes Jun 7, 2022
View reviewed changes
Copy link
Member

@bharathkkb bharathkkb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also add an upgrade guide to inform users of this switch and linking to gcloud vet docs so they can make appropriate changes in their CI.
https://github.com/terraform-google-modules/terraform-google-bootstrap/tree/master/docs

bharathkkb
bharathkkb reviewed Jun 8, 2022
View reviewed changes
docs/upgrading_to_v5.0.md Outdated
@@ -2,9 +2,9 @@

The v5.0 release of *bootstrap* is a backwards incompatible release.

## Terraform Validator < `v0.6.0` no longer supported
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should be kept as is since its for an old release. Next release will be v6.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted

modules/cloudbuild/cloudbuild_builder/Dockerfile Outdated
Comment on lines 25 to 27
/builder/google-cloud-sdk/bin/gcloud -q components install alpha beta && \
/builder/google-cloud-sdk/bin/gcloud components update && \
/builder/google-cloud-sdk/bin/gcloud components install terraform-tools && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these automatically installed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It comes with the base image.

modules/cloudbuild/cloudbuild_builder/Dockerfile
@@ -12,7 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/cloud-builders/gcloud-slim
ARG GCLOUD_VERSION=slim
FROM google/cloud-sdk:${GCLOUD_VERSION}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should allow overriding this via TF like how we do for TERRAFORM_VERSION

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added variables into the tf modules

@comment-bot-dev
Copy link

@iyabchen
Thanks for the PR! 🚀
✅ Lint checks have passed.

@bharathkkb bharathkkb merged commit a300b9c into terraform-google-modules:master Jun 8, 2022
@release-please release-please bot mentioned this pull request Jun 8, 2022
Merged
@bharathkkb bharathkkb mentioned this pull request Jul 6, 2022
Closed
@release-please release-please bot mentioned this pull request Aug 11, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bharathkkb bharathkkb bharathkkb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iyabchen @comment-bot-dev @bharathkkb