From 3a298fc2c18022c6d7ff59c4b8488f04d5cbe3a4 Mon Sep 17 00:00:00 2001 From: dkuji Date: Sun, 29 Oct 2023 00:25:49 +0900 Subject: [PATCH 01/46] feat: Enable multiple display name --- README.md | 2 ++ examples/multiple_service_accounts/main.tf | 2 +- main.tf | 2 +- outputs.tf | 5 +++++ test/integration/multiple_service_accounts/controls/gcp.rb | 5 +++++ test/integration/multiple_service_accounts/inspec.yml | 3 +++ variables.tf | 6 ++++++ 7 files changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 19d096d..87570b3 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ Functional examples are included in the | description | Default description of the created service accounts (defaults to no description) | `string` | `""` | no | | descriptions | List of descriptions for the created service accounts (elements default to the value of `description`) | `list(string)` | `[]` | no | | display\_name | Display names of the created service accounts (defaults to 'Terraform-managed service account') | `string` | `"Terraform-managed service account"` | no | +| display\_names | List of display\_names for the created service accounts (elements default to the value of `display_name`) | `list(string)` | `[]` | no | | generate\_keys | Generate keys for service accounts. | `bool` | `false` | no | | grant\_billing\_role | Grant billing user role. | `bool` | `false` | no | | grant\_xpn\_roles | Grant roles for shared VPC management. | `bool` | `true` | no | @@ -60,6 +61,7 @@ Functional examples are included in the | Name | Description | |------|-------------| +| display\_names | display names variable. | | email | Service account email (for single use). | | emails | Service account emails by name. | | emails\_list | Service account emails as list. | diff --git a/examples/multiple_service_accounts/main.tf b/examples/multiple_service_accounts/main.tf index b4fd667..6259fd7 100644 --- a/examples/multiple_service_accounts/main.tf +++ b/examples/multiple_service_accounts/main.tf @@ -20,7 +20,7 @@ module "service_accounts" { prefix = "" names = ["test-first", "test-second"] generate_keys = true - display_name = "Test Service Accounts" + display_names = ["Test Service Accounts first", "Test Service Accounts second"] description = "Test Service Accounts description" project_roles = [ diff --git a/main.tf b/main.tf index 61376fd..6cb46a7 100644 --- a/main.tf +++ b/main.tf @@ -37,7 +37,7 @@ locals { resource "google_service_account" "service_accounts" { for_each = local.names account_id = "${local.prefix}${lower(each.value)}" - display_name = var.display_name + display_name = index(var.names, each.value) >= length(var.display_names) ? var.display_name : element(var.display_names, index(var.names, each.value)) description = index(var.names, each.value) >= length(var.descriptions) ? var.description : element(var.descriptions, index(var.names, each.value)) project = var.project_id } diff --git a/outputs.tf b/outputs.tf index 35e2506..d66d913 100644 --- a/outputs.tf +++ b/outputs.tf @@ -70,3 +70,8 @@ output "keys" { sensitive = true value = { for k, v in local.names : k => var.generate_keys ? base64decode(google_service_account_key.keys[v].private_key) : "" } } + +output "display_names" { + description = "display names variable." + value = var.display_names +} diff --git a/test/integration/multiple_service_accounts/controls/gcp.rb b/test/integration/multiple_service_accounts/controls/gcp.rb index 4272287..6bd289e 100644 --- a/test/integration/multiple_service_accounts/controls/gcp.rb +++ b/test/integration/multiple_service_accounts/controls/gcp.rb @@ -30,4 +30,9 @@ end end + attribute('display_names').each do |display_name| + describe google_service_accounts(project: "#{attribute('project_id')}") do + its('service_account_display_names'){ should include display_name } + end + end end diff --git a/test/integration/multiple_service_accounts/inspec.yml b/test/integration/multiple_service_accounts/inspec.yml index dfa7304..1b71492 100644 --- a/test/integration/multiple_service_accounts/inspec.yml +++ b/test/integration/multiple_service_accounts/inspec.yml @@ -30,3 +30,6 @@ attributes: - name: iam_emails required: true type: hash + - name: display_names + required: true + type: array diff --git a/variables.tf b/variables.tf index 484d229..5c102ca 100644 --- a/variables.tf +++ b/variables.tf @@ -73,6 +73,12 @@ variable "display_name" { default = "Terraform-managed service account" } +variable "display_names" { + type = list(string) + description = "List of display_names for the created service accounts (elements default to the value of `display_name`)" + default = [] +} + variable "description" { type = string description = "Default description of the created service accounts (defaults to no description)" From c6522bcbc733939afb3ea955845278a6ab6c4b26 Mon Sep 17 00:00:00 2001 From: dkuji Date: Thu, 30 Nov 2023 22:39:45 +0900 Subject: [PATCH 02/46] Delete display_names in outputs.tf --- outputs.tf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/outputs.tf b/outputs.tf index d66d913..35e2506 100644 --- a/outputs.tf +++ b/outputs.tf @@ -70,8 +70,3 @@ output "keys" { sensitive = true value = { for k, v in local.names : k => var.generate_keys ? base64decode(google_service_account_key.keys[v].private_key) : "" } } - -output "display_names" { - description = "display names variable." - value = var.display_names -} From c4d7cfc32bee33caa3ab830d70428221630ab430 Mon Sep 17 00:00:00 2001 From: dkuji Date: Mon, 5 May 2025 23:16:26 +0900 Subject: [PATCH 03/46] fix readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ceac3dc..bb39e5b 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,6 @@ Functional examples are included in the | Name | Description | |------|-------------| -| display\_names | display names variable. | | email | Service account email (for single use). | | emails | Service account emails by name. | | emails\_list | Service account emails as list. | From 527ce42b68d0f052ffa05cc83efbe34450ce5f0c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 21:52:42 +0000 Subject: [PATCH 04/46] chore(deps): Update go modules and/or dev-tools (#120) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Makefile | 2 +- build/int.cloudbuild.yaml | 2 +- build/lint.cloudbuild.yaml | 2 +- test/integration/go.mod | 23 +++++++++++++---------- test/integration/go.sum | 20 ++++++++++++++++++++ 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 90858ac..b2a5027 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # Make will use bash instead of sh SHELL := /usr/bin/env bash -DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.20 +DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools REGISTRY_URL := gcr.io/cloud-foundation-cicd diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index b594298..8c4fa77 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -61,4 +61,4 @@ tags: - 'integration' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.20' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index ea18a2d..0bc6bcf 100644 --- a/build/lint.cloudbuild.yaml +++ b/build/lint.cloudbuild.yaml @@ -22,4 +22,4 @@ tags: - 'lint' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.20' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22' diff --git a/test/integration/go.mod b/test/integration/go.mod index fea5d6b..da66df2 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -1,9 +1,11 @@ module github.com/terraform-google-modules/terraform-google-service-accounts/test/integration -go 1.21 +go 1.22 + +toolchain go1.22.5 require ( - github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.14.1 + github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 github.com/stretchr/testify v1.9.0 ) @@ -31,17 +33,17 @@ require ( github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect - github.com/gruntwork-io/terratest v0.46.14 // indirect + github.com/gruntwork-io/terratest v0.47.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.4 // indirect + github.com/hashicorp/go-getter v1.7.5 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect - github.com/hashicorp/hcl/v2 v2.18.0 // indirect - github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 // indirect - github.com/hashicorp/terraform-json v0.21.0 // indirect + github.com/hashicorp/hcl/v2 v2.20.1 // indirect + github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 // indirect + github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/jinzhu/copier v0.4.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -58,15 +60,16 @@ require ( github.com/tidwall/sjson v1.2.5 // indirect github.com/tmccombs/hcl2json v0.6.0 // indirect github.com/ulikunitz/xz v0.5.11 // indirect - github.com/zclconf/go-cty v1.14.1 // indirect + github.com/zclconf/go-cty v1.14.4 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.21.0 // indirect - golang.org/x/mod v0.17.0 // indirect + golang.org/x/mod v0.19.0 // indirect golang.org/x/net v0.23.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sync v0.4.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.13.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.8 // indirect @@ -77,6 +80,6 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - sigs.k8s.io/kustomize/kyaml v0.17.0 // indirect + sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/test/integration/go.sum b/test/integration/go.sum index 986740e..1969dc3 100644 --- a/test/integration/go.sum +++ b/test/integration/go.sum @@ -189,6 +189,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.14.1 h1:xfCNVLZQAclUxmhICDwaOUJUw4OioNc1wIEfjtSgfCg= github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.14.1/go.mod h1:AEQP8/V/hIp+SllHtmBV7ftuoQQ82eC032UdsnL3tnY= +github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 h1:IfsF5yta+pslEAWF1QYFSP/3obWsjLQzFyEKJYAhzos= +github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1/go.mod h1:Bop47HzdH60K1rPgNRNqBHrBWhhmqCBG9Y4Y5PEn9fE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= @@ -357,6 +359,8 @@ github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gruntwork-io/terratest v0.46.14 h1:nVT2JpOPLr7KbwOSNDP0GJffljH+Yu5833cwLorxRjs= github.com/gruntwork-io/terratest v0.46.14/go.mod h1:L/IHbj195wnjfIFpZYWUhjwA3jm4O6ehO//xz7NxN8o= +github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c= +github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -364,6 +368,8 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0= github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4= +github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= @@ -376,10 +382,16 @@ github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+Db github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8= github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc= +github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4= github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 h1:nZ5gGjbe5o7XUu1d7j+Y5Ztcxlp+yaumTKH9i0D3wlg= github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72/go.mod h1:l8HcFPm9cQh6Q0KSWoYPiePqMvRFenybP1CH2MjKdlg= +github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 h1:ApSEBSu6EhcJWCdwSMd1VbQUeJDtB1jAOHfIxjZyMTc= +github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI= github.com/hashicorp/terraform-json v0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U= github.com/hashicorp/terraform-json v0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk= +github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= +github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= @@ -467,6 +479,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= +github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -523,6 +537,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -754,6 +770,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1014,5 +1032,7 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/kyaml v0.17.0 h1:G2bWs03V9Ur2PinHLzTUJ8Ded+30SzXZKiO92SRDs3c= sigs.k8s.io/kustomize/kyaml v0.17.0/go.mod h1:6lxkYF1Cv9Ic8g/N7I86cvxNc5iinUo/P2vKsHNmpyE= +sigs.k8s.io/kustomize/kyaml v0.17.2 h1:+AzvoJUY0kq4QAhH/ydPHHMRLijtUKiyVyh7fOSshr0= +sigs.k8s.io/kustomize/kyaml v0.17.2/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= From 7821bda918a1d1067ebfdd835825ce604795afbc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:38:49 -0700 Subject: [PATCH 05/46] fix(deps): update key-distrubutor to GO v1.20 (#124) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Peabody --- modules/key-distributor/files/function/go.mod | 44 ++++++++++++------- modules/key-distributor/main.tf | 2 +- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/modules/key-distributor/files/function/go.mod b/modules/key-distributor/files/function/go.mod index 481d0c9..7a9fab1 100644 --- a/modules/key-distributor/files/function/go.mod +++ b/modules/key-distributor/files/function/go.mod @@ -1,27 +1,37 @@ module github.com/terraform-google-modules/terraform-google-service-accounts/modules/key-distributor/files/function -go 1.18 +go 1.20 require ( - golang.org/x/crypto v0.21.0 - google.golang.org/api v0.114.0 + golang.org/x/crypto v0.25.0 + google.golang.org/api v0.189.0 ) require ( - cloud.google.com/go/compute v1.19.1 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/auth v0.7.2 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.1 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.5 // indirect + github.com/stretchr/testify v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.56.3 // indirect - google.golang.org/protobuf v1.33.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect + google.golang.org/grpc v1.64.1 // indirect + google.golang.org/protobuf v1.34.2 // indirect ) diff --git a/modules/key-distributor/main.tf b/modules/key-distributor/main.tf index b885545..2de1047 100644 --- a/modules/key-distributor/main.tf +++ b/modules/key-distributor/main.tf @@ -77,7 +77,7 @@ resource "google_cloudfunctions_function" "function" { region = var.region name = var.function_name description = "Generates and encrypts a new Service Account key given a GPG public key" - runtime = "go118" + runtime = "go120" trigger_http = true service_account_email = google_service_account.distributor.email From 0da08251a13d5b75bd2cb0cf4d70606208da78c9 Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Tue, 6 Aug 2024 18:20:16 +0200 Subject: [PATCH 06/46] fix: Fix output "id" in "simple-sa" module (#125) --- modules/simple-sa/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/simple-sa/outputs.tf b/modules/simple-sa/outputs.tf index 4c391bd..dfbcf8b 100644 --- a/modules/simple-sa/outputs.tf +++ b/modules/simple-sa/outputs.tf @@ -26,7 +26,7 @@ output "iam_email" { output "id" { description = "Service account id in the format 'projects/{{project}}/serviceAccounts/{{email}}'" - value = google_service_account.sa.account_id + value = google_service_account.sa.id } output "env_vars" { From b9bbd8a071dd9d4483d2367745ce5c68ac7d7dd0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 18:19:44 -0500 Subject: [PATCH 07/46] chore(master): release 4.3.0 (#119) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 16 ++++++++++++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/README.md | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 8 files changed, 23 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab35056..68c42eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,22 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.3.0](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.2.3...v4.3.0) (2024-08-06) + + +### Features + +* Add iam_email and env_vars output to simple-sa submodule ([#122](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/122)) ([ae592d2](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/ae592d233a85ce04b9cacc56d04862231cdebc43)) +* add simple SA module for managing SA and project IAM ([#118](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/118)) ([ee1516b](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/ee1516b78c7ec0c0671c1cc0a5f4cdad8c1de6a4)) + + +### Bug Fixes + +* **deps:** bump golang.org/x/net from 0.17.0 to 0.23.0 in /modules/key-distributor/files/function ([#115](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/115)) ([5550304](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/55503040ab6a03375ef84c576f624c0eae9e9d6e)) +* **deps:** update key-distrubutor to GO v1.20 ([#124](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/124)) ([cbaa4b1](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/cbaa4b1a81a3fe5f2bd885879307f6d945131fd3)) +* Fix output "id" in "simple-sa" module ([#125](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/125)) ([3df2ae8](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/3df2ae83d69f3d1ffb87c7ff227c417076b8587f)) +* Update the format of "id" output in the "simple-sa" module ([#123](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/123)) ([4e586a7](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/4e586a7a44151078329972b38d553748ee000983)) + ## [4.2.3](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.2.2...v4.2.3) (2024-04-12) diff --git a/metadata.yaml b/metadata.yaml index 66897ec..0101625 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -23,7 +23,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts sourceType: git - version: 4.2.3 + version: 4.3.0 actuationTool: type: Terraform version: '>= 0.13' diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index 2efbe4f..24f5bd2 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -23,7 +23,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts sourceType: git - version: 4.2.3 + version: 4.3.0 actuationTool: type: Terraform version: '>= 0.13' diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index b7c9465..0332cce 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.2.3" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.3.0" } } diff --git a/modules/simple-sa/README.md b/modules/simple-sa/README.md index 0c417d5..acf509e 100644 --- a/modules/simple-sa/README.md +++ b/modules/simple-sa/README.md @@ -9,7 +9,7 @@ Basic usage of this submodule is as follows: ```hcl module "sa" { source = "terraform-google-modules/service-accounts/google//modules/simple-sa" - version = "~> 4.0" + version = "~> 4.3" project_id = "" name = "sa-name" diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index c0d71e1..448889a 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.2.3 + version: 4.3.0 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index 2adb27a..d86c509 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.2.3" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.3.0" } } diff --git a/versions.tf b/versions.tf index 69efef0..f3d9e38 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.2.3" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.3.0" } } From 15625973b5c4a83be6bac577c1a1747f3c7cc9a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 13:29:00 -0700 Subject: [PATCH 08/46] chore(deps): Update go modules (#126) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Peabody --- test/integration/go.mod | 2 +- test/integration/go.sum | 24 ++---------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index da66df2..8e295d9 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -2,7 +2,7 @@ module github.com/terraform-google-modules/terraform-google-service-accounts/tes go 1.22 -toolchain go1.22.5 +toolchain go1.22.6 require ( github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 diff --git a/test/integration/go.sum b/test/integration/go.sum index 1969dc3..10713f4 100644 --- a/test/integration/go.sum +++ b/test/integration/go.sum @@ -187,8 +187,6 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.14.1 h1:xfCNVLZQAclUxmhICDwaOUJUw4OioNc1wIEfjtSgfCg= -github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.14.1/go.mod h1:AEQP8/V/hIp+SllHtmBV7ftuoQQ82eC032UdsnL3tnY= github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1 h1:IfsF5yta+pslEAWF1QYFSP/3obWsjLQzFyEKJYAhzos= github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.1/go.mod h1:Bop47HzdH60K1rPgNRNqBHrBWhhmqCBG9Y4Y5PEn9fE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -357,8 +355,6 @@ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56 github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/gruntwork-io/terratest v0.46.14 h1:nVT2JpOPLr7KbwOSNDP0GJffljH+Yu5833cwLorxRjs= -github.com/gruntwork-io/terratest v0.46.14/go.mod h1:L/IHbj195wnjfIFpZYWUhjwA3jm4O6ehO//xz7NxN8o= github.com/gruntwork-io/terratest v0.47.0 h1:xIy1pT7NbGVlMLDZEHl3+3iSnvffh8tN2pL6idn448c= github.com/gruntwork-io/terratest v0.47.0/go.mod h1:oywHw1cFKXSYvKPm27U7quZVzDUlA22H2xUrKCe26xM= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -366,8 +362,6 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-getter v1.7.4 h1:3yQjWuxICvSpYwqSayAdKRFcvBl1y/vogCxczWSmix0= -github.com/hashicorp/go-getter v1.7.4/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-getter v1.7.5 h1:dT58k9hQ/vbxNMwoI5+xFYAJuv6152UNvdHokfI5wE4= github.com/hashicorp/go-getter v1.7.5/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= @@ -380,16 +374,10 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f h1:UdxlrJz4JOnY8W+DbLISwf2B8WXEolNRA8BGCwI9jws= github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= -github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHLl8= -github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/hashicorp/hcl/v2 v2.20.1 h1:M6hgdyz7HYt1UN9e61j+qKJBqR3orTWbI1HKBJEdxtc= github.com/hashicorp/hcl/v2 v2.20.1/go.mod h1:TZDqQ4kNKCbh1iJp99FdPiUaVDDUPivbqxZulxDYqL4= -github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72 h1:nZ5gGjbe5o7XUu1d7j+Y5Ztcxlp+yaumTKH9i0D3wlg= -github.com/hashicorp/terraform-config-inspect v0.0.0-20231204233900-a34142ec2a72/go.mod h1:l8HcFPm9cQh6Q0KSWoYPiePqMvRFenybP1CH2MjKdlg= github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553 h1:ApSEBSu6EhcJWCdwSMd1VbQUeJDtB1jAOHfIxjZyMTc= github.com/hashicorp/terraform-config-inspect v0.0.0-20240701073647-9fc3669f7553/go.mod h1:Gz/z9Hbn+4KSp8A2FBtNszfLSdT2Tn/uAKGuVqqWmDI= -github.com/hashicorp/terraform-json v0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U= -github.com/hashicorp/terraform-json v0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk= github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -416,8 +404,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -441,8 +427,6 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= -github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= -github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -477,10 +461,10 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= -github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY34Wul7O/MSKey3txpPYyCqVO5ZyceuQJEI= +github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -535,8 +519,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1030,8 +1012,6 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/kustomize/kyaml v0.17.0 h1:G2bWs03V9Ur2PinHLzTUJ8Ded+30SzXZKiO92SRDs3c= -sigs.k8s.io/kustomize/kyaml v0.17.0/go.mod h1:6lxkYF1Cv9Ic8g/N7I86cvxNc5iinUo/P2vKsHNmpyE= sigs.k8s.io/kustomize/kyaml v0.17.2 h1:+AzvoJUY0kq4QAhH/ydPHHMRLijtUKiyVyh7fOSshr0= sigs.k8s.io/kustomize/kyaml v0.17.2/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= From a9d2c993849efaf2bf225b2f123ad2c1050e98f5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:40:17 -0700 Subject: [PATCH 09/46] chore(deps): Update Terraform terraform-google-modules/project-factory/google to v16 (#128) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/setup/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/setup/main.tf b/test/setup/main.tf index 66a1c4f..1947873 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -16,7 +16,7 @@ module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 15.0" + version = "~> 16.0" name = "ci-service-accounts" random_project_id = "true" From b79553caa767330857bc9607f820bbf26beb9a3e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:45:45 -0500 Subject: [PATCH 10/46] feat(deps): Update Terraform google to v6 (#129) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index 0332cce..f9ed6e9 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 6" + version = ">= 3.53, < 7" } archive = { source = "hashicorp/archive" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index d86c509..dc8dda1 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -20,7 +20,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 3.53, < 6" + version = ">= 3.53, < 7" } } diff --git a/versions.tf b/versions.tf index f3d9e38..c13318b 100644 --- a/versions.tf +++ b/versions.tf @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = ">= 3.53, < 6" + version = ">= 3.53, < 7" } } From 6249aa473caa54790e03905a1950d8c019866816 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 07:20:46 -0700 Subject: [PATCH 11/46] chore(master): release 4.4.0 (#130) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/README.md | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68c42eb..9cb381e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.4.0](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.3.0...v4.4.0) (2024-08-29) + + +### Features + +* **deps:** Update Terraform google to v6 ([#129](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/129)) ([5fb0d98](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/5fb0d980c097f9a26f555b24e8e70848ea7a0e3e)) + ## [4.3.0](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.2.3...v4.3.0) (2024-08-06) diff --git a/metadata.yaml b/metadata.yaml index 0101625..3909acc 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -23,7 +23,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts sourceType: git - version: 4.3.0 + version: 4.4.0 actuationTool: type: Terraform version: '>= 0.13' diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index 24f5bd2..34830ff 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -23,7 +23,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts sourceType: git - version: 4.3.0 + version: 4.4.0 actuationTool: type: Terraform version: '>= 0.13' diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index f9ed6e9..b9b7b43 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.3.0" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.0" } } diff --git a/modules/simple-sa/README.md b/modules/simple-sa/README.md index acf509e..ed785d6 100644 --- a/modules/simple-sa/README.md +++ b/modules/simple-sa/README.md @@ -9,7 +9,7 @@ Basic usage of this submodule is as follows: ```hcl module "sa" { source = "terraform-google-modules/service-accounts/google//modules/simple-sa" - version = "~> 4.3" + version = "~> 4.4" project_id = "" name = "sa-name" diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 448889a..18a8b1f 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.3.0 + version: 4.4.0 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index dc8dda1..a571456 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.3.0" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.0" } } diff --git a/versions.tf b/versions.tf index c13318b..cff9558 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.3.0" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.0" } } From ca8dcb1e585a44cd9477637ea234615139832b84 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 08:29:00 -0700 Subject: [PATCH 12/46] chore(deps): Update Terraform terraform-google-modules/project-factory/google to v17 (#132) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/setup/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/setup/main.tf b/test/setup/main.tf index 1947873..95a3276 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -16,7 +16,7 @@ module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 16.0" + version = "~> 17.0" name = "ci-service-accounts" random_project_id = "true" From 1e70b52bcd4a85d66d5a629ec018540ea5351f02 Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Wed, 9 Oct 2024 21:28:23 -0500 Subject: [PATCH 13/46] chore: update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index c043343..dca40c6 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,7 +1,7 @@ # NOTE: This file is automatically generated from values at: # https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf -* @terraform-google-modules/cft-admins +* @terraform-google-modules/cft-admins @q2w # NOTE: GitHub CODEOWNERS locations: # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-and-branch-protection From 05238736b9e83ba50fbffb6bf9cb7b992a4f5625 Mon Sep 17 00:00:00 2001 From: abhishek kumar tiwari Date: Tue, 22 Oct 2024 07:17:51 +0000 Subject: [PATCH 14/46] chore: Add new output account_details, output type and metadata.display.yaml (#133) --- modules/simple-sa/README.md | 1 + modules/simple-sa/metadata.display.yaml | 45 +++++++++++++++++++++++++ modules/simple-sa/metadata.yaml | 15 ++++++++- modules/simple-sa/outputs.tf | 8 +++++ 4 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 modules/simple-sa/metadata.display.yaml diff --git a/modules/simple-sa/README.md b/modules/simple-sa/README.md index ed785d6..2d8033c 100644 --- a/modules/simple-sa/README.md +++ b/modules/simple-sa/README.md @@ -35,6 +35,7 @@ module "sa" { | Name | Description | |------|-------------| +| account\_details | Service account id and email | | email | Service account email | | env\_vars | Exported environment variables | | iam\_email | IAM format service account email | diff --git a/modules/simple-sa/metadata.display.yaml b/modules/simple-sa/metadata.display.yaml new file mode 100644 index 0000000..236eca6 --- /dev/null +++ b/modules/simple-sa/metadata.display.yaml @@ -0,0 +1,45 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: blueprints.cloud.google.com/v1alpha1 +kind: BlueprintMetadata +metadata: + name: terraform-google-service-accounts-display + annotations: + config.kubernetes.io/local-config: "true" +spec: + info: + title: Terraform Simple Service Account module + source: + repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git + sourceType: git + dir: /modules/simple-sa + ui: + input: + variables: + description: + name: description + title: Description + display_name: + name: display_name + title: Display Name + name: + name: name + title: Name + project_id: + name: project_id + title: Project Id + project_roles: + name: project_roles + title: Project Roles diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 18a8b1f..fed84fe 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -63,14 +63,27 @@ spec: varType: list(string) required: true outputs: + - name: account_details + description: Service account id and email + type: + - object + - email: string + id: string - name: email description: Service account email + type: string - name: env_vars description: Exported environment variables + type: + - object + - SERVICE_ACCOUNT_EMAIL: string + SERVICE_ACCOUNT_IAM_EMAIL: string - name: iam_email description: IAM format service account email + type: string - name: id - description: Service account id and email + description: Service account id in the format 'projects/{{project}}/serviceAccounts/{{email}}' + type: string requirements: roles: - level: Project diff --git a/modules/simple-sa/outputs.tf b/modules/simple-sa/outputs.tf index dfbcf8b..d11070e 100644 --- a/modules/simple-sa/outputs.tf +++ b/modules/simple-sa/outputs.tf @@ -29,6 +29,14 @@ output "id" { value = google_service_account.sa.id } +output "account_details" { + description = "Service account id and email" + value = { + "id" : google_service_account.sa.account_id, + "email" : google_service_account.sa.email + } +} + output "env_vars" { description = "Exported environment variables" value = { "SERVICE_ACCOUNT_EMAIL" : google_service_account.sa.email, From f1d98513e7b84fe7b24b94af589940449d4b7eaa Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:11:28 +0000 Subject: [PATCH 15/46] chore(master): release 4.4.1 (#135) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cb381e..0dbc6ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.4.1](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.0...v4.4.1) (2024-10-25) + + +### Bug Fixes + +* Add new output account_details, output type and metadata.display.yaml ([#133](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/133)) ([2a5adbf](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/2a5adbfea6e9774a2d702f28857f4c907daa31c9)) + ## [4.4.0](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.3.0...v4.4.0) (2024-08-29) diff --git a/metadata.yaml b/metadata.yaml index 3909acc..48fc7c6 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -23,7 +23,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts sourceType: git - version: 4.4.0 + version: 4.4.1 actuationTool: type: Terraform version: '>= 0.13' diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index 34830ff..eb91868 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -23,7 +23,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts sourceType: git - version: 4.4.0 + version: 4.4.1 actuationTool: type: Terraform version: '>= 0.13' diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index b9b7b43..13c8828 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.0" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.1" } } diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index fed84fe..4ff5729 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.4.0 + version: 4.4.1 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index a571456..9da9bd8 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.0" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.1" } } diff --git a/versions.tf b/versions.tf index cff9558..4cf1a25 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.0" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.1" } } From 7a66bf36fc476f8647a9114734e1f9a035afc16b Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Thu, 31 Oct 2024 10:20:28 -0700 Subject: [PATCH 16/46] chore: update .github/workflows/lint.yaml --- .github/workflows/lint.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d355114..ef3d95b 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -44,5 +44,11 @@ jobs: REGISTRY=$(grep "REGISTRY_URL := " $MAKEFILE | cut -d\ -f3) echo dev-tools=${REGISTRY}/${IMAGE}:${VERSION} >> "$GITHUB_OUTPUT" fi - - run: docker run --rm -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} module-swapper - - run: docker run --rm -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh + - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} module-swapper + env: + ENABLE_BPMETADATA: 1 + + - run: docker run --rm -e ENABLE_BPMETADATA -v ${{ github.workspace }}:/workspace ${{ steps.variables.outputs.dev-tools }} /usr/local/bin/test_lint.sh + env: + ENABLE_BPMETADATA: 1 + From a470fbe20651cdab6b9574af4db5f7dc37ba313e Mon Sep 17 00:00:00 2001 From: abhishek kumar tiwari Date: Wed, 27 Nov 2024 12:49:29 +0000 Subject: [PATCH 17/46] chore: update metadata to reflect original variable's order (#137) --- metadata.display.yaml | 65 +++++ metadata.yaml | 235 +++++++++--------- modules/key-distributor/metadata.display.yaml | 54 ++++ modules/key-distributor/metadata.yaml | 163 ++++++------ modules/simple-sa/metadata.display.yaml | 2 + modules/simple-sa/metadata.yaml | 23 +- 6 files changed, 338 insertions(+), 204 deletions(-) create mode 100644 metadata.display.yaml create mode 100644 modules/key-distributor/metadata.display.yaml diff --git a/metadata.display.yaml b/metadata.display.yaml new file mode 100644 index 0000000..0fd53fd --- /dev/null +++ b/metadata.display.yaml @@ -0,0 +1,65 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: blueprints.cloud.google.com/v1alpha1 +kind: BlueprintMetadata +metadata: + name: terraform-google-service-accounts-display + annotations: + config.kubernetes.io/local-config: "true" +spec: + info: + title: Terraform Service Accounts Module + source: + repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git + sourceType: git + ui: + input: + variables: + billing_account_id: + name: billing_account_id + title: Billing Account Id + description: + name: description + title: Description + descriptions: + name: descriptions + title: Descriptions + display_name: + name: display_name + title: Display Name + generate_keys: + name: generate_keys + title: Generate Keys + grant_billing_role: + name: grant_billing_role + title: Grant Billing Role + grant_xpn_roles: + name: grant_xpn_roles + title: Grant Xpn Roles + names: + name: names + title: Names + org_id: + name: org_id + title: Org Id + prefix: + name: prefix + title: Prefix + project_id: + name: project_id + title: Project Id + project_roles: + name: project_roles + title: Project Roles diff --git a/metadata.yaml b/metadata.yaml index 48fc7c6..90493f9 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,120 +19,121 @@ metadata: annotations: config.kubernetes.io/local-config: "true" spec: - title: Terraform Service Accounts Module - source: - repo: https://github.com/terraform-google-modules/terraform-google-service-accounts - sourceType: git - version: 4.4.1 - actuationTool: - type: Terraform - version: '>= 0.13' - subBlueprints: - - name: key-distributor - location: modules/key-distributor - examples: - - name: key_distributor - location: examples/key_distributor - - name: multiple_service_accounts - location: examples/multiple_service_accounts - - name: single_service_account - location: examples/single_service_account - variables: - - name: billing_account_id - description: If assigning billing role, specificy a billing account (default is to assign at the organizational level). - type: string - default: "" - required: false - - name: description - description: Default description of the created service accounts (defaults to no description) - type: string - default: "" - required: false - - name: descriptions - description: List of descriptions for the created service accounts (elements default to the value of `description`) - type: list(string) - default: [] - required: false - - name: display_name - description: Display names of the created service accounts (defaults to 'Terraform-managed service account') - type: string - default: Terraform-managed service account - required: false - - name: generate_keys - description: Generate keys for service accounts. - type: bool - default: false - required: false - - name: grant_billing_role - description: Grant billing user role. - type: bool - default: false - required: false - - name: grant_xpn_roles - description: Grant roles for shared VPC management. - type: bool - default: true - required: false - - name: names - description: Names of the service accounts to create. - type: list(string) - default: [] - required: false - - name: org_id - description: Id of the organization for org-level roles. - type: string - default: "" - required: false - - name: prefix - description: Prefix applied to service account names. - type: string - default: "" - required: false - - name: project_id - description: Project id where service account will be created. - type: string - required: true - - name: project_roles - description: Common roles to apply to all service accounts, project=>role as elements. - type: list(string) - default: [] - required: false - outputs: - - name: email - description: Service account email (for single use). - - name: emails - description: Service account emails by name. - - name: emails_list - description: Service account emails as list. - - name: iam_email - description: IAM-format service account email (for single use). - - name: iam_emails - description: IAM-format service account emails by name. - - name: iam_emails_list - description: IAM-format service account emails as list. - - name: key - description: Service account key (for single use). - - name: keys - description: Map of service account keys. - - name: service_account - description: Service account resource (for single use). - - name: service_accounts - description: Service account resources as list. - - name: service_accounts_map - description: Service account resources by name. - roles: - - level: Project + info: + title: Terraform Service Accounts Module + source: + repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git + sourceType: git + version: 4.4.0 + actuationTool: + flavor: Terraform + version: ">= 0.13" + description: {} + content: + subBlueprints: + - name: key-distributor + location: modules/key-distributor + - name: simple-sa + location: modules/simple-sa + examples: + - name: key_distributor + location: examples/key_distributor + - name: multiple_service_accounts + location: examples/multiple_service_accounts + - name: simple_sa + location: examples/simple_sa + - name: single_service_account + location: examples/single_service_account + interfaces: + variables: + - name: project_id + description: Project id where service account will be created. + varType: string + required: true + - name: prefix + description: Prefix applied to service account names. + varType: string + defaultValue: "" + - name: names + description: Names of the service accounts to create. + varType: list(string) + defaultValue: [] + - name: project_roles + description: Common roles to apply to all service accounts, project=>role as elements. + varType: list(string) + defaultValue: [] + - name: grant_billing_role + description: Grant billing user role. + varType: bool + defaultValue: false + - name: billing_account_id + description: If assigning billing role, specificy a billing account (default is to assign at the organizational level). + varType: string + defaultValue: "" + - name: grant_xpn_roles + description: Grant roles for shared VPC management. + varType: bool + defaultValue: true + - name: org_id + description: Id of the organization for org-level roles. + varType: string + defaultValue: "" + - name: generate_keys + description: Generate keys for service accounts. + varType: bool + defaultValue: false + - name: display_name + description: Display names of the created service accounts (defaults to 'Terraform-managed service account') + varType: string + defaultValue: Terraform-managed service account + - name: description + description: Default description of the created service accounts (defaults to no description) + varType: string + defaultValue: "" + - name: descriptions + description: List of descriptions for the created service accounts (elements default to the value of `description`) + varType: list(string) + defaultValue: [] + outputs: + - name: email + description: Service account email (for single use). + - name: emails + description: Service account emails by name. + - name: emails_list + description: Service account emails as list. + - name: iam_email + description: IAM-format service account email (for single use). + - name: iam_emails + description: IAM-format service account emails by name. + - name: iam_emails_list + description: IAM-format service account emails as list. + - name: key + description: Service account key (for single use). + - name: keys + description: Map of service account keys. + - name: service_account + description: Service account resource (for single use). + - name: service_accounts + description: Service account resources as list. + - name: service_accounts_map + description: Service account resources by name. + requirements: roles: - - roles/resourcemanager.projectIamAdmin - - roles/iam.serviceAccountAdmin - - roles/iam.serviceAccountUser - - roles/iam.serviceAccountKeyAdmin - - roles/storage.admin - - roles/cloudfunctions.admin - - roles/serviceusage.serviceUsageAdmin - services: - - cloudresourcemanager.googleapis.com - - iam.googleapis.com - - serviceusage.googleapis.com - - cloudfunctions.googleapis.com - - cloudbuild.googleapis.com + - level: Project + roles: + - roles/resourcemanager.projectIamAdmin + - roles/iam.serviceAccountAdmin + - roles/iam.serviceAccountUser + - roles/iam.serviceAccountKeyAdmin + - roles/storage.admin + - roles/cloudfunctions.admin + - roles/serviceusage.serviceUsageAdmin + services: + - cloudresourcemanager.googleapis.com + - iam.googleapis.com + - serviceusage.googleapis.com + - cloudfunctions.googleapis.com + - cloudbuild.googleapis.com + providerVersions: + - source: hashicorp/google + version: ">= 3.53, < 7" diff --git a/modules/key-distributor/metadata.display.yaml b/modules/key-distributor/metadata.display.yaml new file mode 100644 index 0000000..bd1b4c9 --- /dev/null +++ b/modules/key-distributor/metadata.display.yaml @@ -0,0 +1,54 @@ +# Copyright 2024 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: blueprints.cloud.google.com/v1alpha1 +kind: BlueprintMetadata +metadata: + name: terraform-google-service-accounts-display + annotations: + config.kubernetes.io/local-config: "true" +spec: + info: + title: Service Account Key Distributor + source: + repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git + sourceType: git + dir: /modules/key-distributor + ui: + input: + variables: + folder_ids: + name: folder_ids + title: Folder Ids + function_members: + name: function_members + title: Function Members + function_name: + name: function_name + title: Function Name + org_id: + name: org_id + title: Org Id + project_id: + name: project_id + title: Project Id + project_ids: + name: project_ids + title: Project Ids + public_key_file: + name: public_key_file + title: Public Key File + region: + name: region + title: Region diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index eb91868..cad5852 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,80 +19,89 @@ metadata: annotations: config.kubernetes.io/local-config: "true" spec: - title: Service Account Key Distributor - source: - repo: https://github.com/terraform-google-modules/terraform-google-service-accounts - sourceType: git - version: 4.4.1 - actuationTool: - type: Terraform - version: '>= 0.13' - examples: - - name: key_distributor - location: examples/key_distributor - - name: multiple_service_accounts - location: examples/multiple_service_accounts - - name: single_service_account - location: examples/single_service_account - variables: - - name: folder_ids - description: Folder IDs where the Cloud Function will have access to create Service Account keys. - type: list(any) - default: [] - required: false - - name: function_members - description: List of IAM members (users, groups, etc) with the invoker permission on the CLoud Function - type: list(string) - required: true - - name: function_name - description: Name of the Cloud Function - type: string - default: key-distributor - required: false - - name: org_id - description: Organization ID where the Cloud Function will have access to create Service Account keys. - type: string - default: "" - required: false - - name: project_id - description: Project Id for the Cloud Function. Also if folder_ids and project_ids are empty, the Cloud Function will be granted access to create keys in this project by default. - type: string - required: true - - name: project_ids - description: Project IDs where the Cloud Function will have access to create Service Account keys. - type: list(any) - default: [] - required: false - - name: public_key_file - description: Path of the ascii armored gpg public key. Create by running `gpg --export --armor > pubkey.asc` - type: string - default: pubkey.asc - required: false - - name: region - description: The region where the Cloud Function will run - type: string - default: us-central1 - required: false - outputs: - - name: function_name - description: The name for the Cloud Function. - - name: project_id - description: The project id for the Cloud Function. - - name: region - description: The region for the Cloud Function - roles: - - level: Project + info: + title: Service Account Key Distributor + source: + repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git + sourceType: git + dir: /modules/key-distributor + version: 4.4.0 + actuationTool: + flavor: Terraform + version: ">= 0.13" + description: {} + content: + examples: + - name: key_distributor + location: examples/key_distributor + - name: multiple_service_accounts + location: examples/multiple_service_accounts + - name: simple_sa + location: examples/simple_sa + - name: single_service_account + location: examples/single_service_account + interfaces: + variables: + - name: org_id + description: Organization ID where the Cloud Function will have access to create Service Account keys. + varType: string + defaultValue: "" + - name: folder_ids + description: Folder IDs where the Cloud Function will have access to create Service Account keys. + varType: list(any) + defaultValue: [] + - name: project_ids + description: Project IDs where the Cloud Function will have access to create Service Account keys. + varType: list(any) + defaultValue: [] + - name: project_id + description: Project Id for the Cloud Function. Also if folder_ids and project_ids are empty, the Cloud Function will be granted access to create keys in this project by default. + varType: string + required: true + - name: region + description: The region where the Cloud Function will run + varType: string + defaultValue: us-central1 + - name: function_name + description: Name of the Cloud Function + varType: string + defaultValue: key-distributor + - name: public_key_file + description: Path of the ascii armored gpg public key. Create by running `gpg --export --armor > pubkey.asc` + varType: string + defaultValue: pubkey.asc + - name: function_members + description: List of IAM members (users, groups, etc) with the invoker permission on the CLoud Function + varType: list(string) + required: true + outputs: + - name: function_name + description: The name for the Cloud Function. + - name: project_id + description: The project id for the Cloud Function. + - name: region + description: The region for the Cloud Function + requirements: roles: - - roles/resourcemanager.projectIamAdmin - - roles/iam.serviceAccountAdmin - - roles/iam.serviceAccountUser - - roles/iam.serviceAccountKeyAdmin - - roles/storage.admin - - roles/cloudfunctions.admin - - roles/serviceusage.serviceUsageAdmin - services: - - cloudresourcemanager.googleapis.com - - iam.googleapis.com - - serviceusage.googleapis.com - - cloudfunctions.googleapis.com - - cloudbuild.googleapis.com + - level: Project + roles: + - roles/resourcemanager.projectIamAdmin + - roles/iam.serviceAccountAdmin + - roles/iam.serviceAccountUser + - roles/iam.serviceAccountKeyAdmin + - roles/storage.admin + - roles/cloudfunctions.admin + - roles/serviceusage.serviceUsageAdmin + services: + - cloudresourcemanager.googleapis.com + - iam.googleapis.com + - serviceusage.googleapis.com + - cloudfunctions.googleapis.com + - cloudbuild.googleapis.com + providerVersions: + - source: hashicorp/archive + version: ">= 2.2" + - source: hashicorp/google + version: ">= 3.53, < 7" + - source: hashicorp/local + version: ">= 2.2" diff --git a/modules/simple-sa/metadata.display.yaml b/modules/simple-sa/metadata.display.yaml index 236eca6..5f1ce83 100644 --- a/modules/simple-sa/metadata.display.yaml +++ b/modules/simple-sa/metadata.display.yaml @@ -31,9 +31,11 @@ spec: description: name: description title: Description + invisible: false display_name: name: display_name title: Display Name + invisible: false name: name: name title: Name diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 4ff5729..9490f6c 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -42,22 +42,22 @@ spec: location: examples/single_service_account interfaces: variables: - - name: description - description: Default description of the created service accounts (defaults to no description) - varType: string - defaultValue: "" - - name: display_name - description: Display name of the created service accounts (defaults to 'Terraform-managed service account') + - name: project_id + description: Project id where service account will be created varType: string - defaultValue: Terraform-managed service account + required: true - name: name description: Name of service account varType: string required: true - - name: project_id - description: Project id where service account will be created + - name: display_name + description: Display name of the created service accounts (defaults to 'Terraform-managed service account') varType: string - required: true + defaultValue: Terraform-managed service account + - name: description + description: Default description of the created service accounts (defaults to no description) + varType: string + defaultValue: "" - name: project_roles description: Roles to grant the SA in specified project varType: list(string) @@ -101,3 +101,6 @@ spec: - serviceusage.googleapis.com - cloudfunctions.googleapis.com - cloudbuild.googleapis.com + providerVersions: + - source: hashicorp/google + version: ">= 3.53, < 7" From 3c246351223e062f6eab291558ae47c9dc663e95 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:24:45 +0530 Subject: [PATCH 18/46] chore(master): release 4.4.2 (#138) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dbc6ff..27ca9ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.4.2](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.1...v4.4.2) (2024-11-27) + + +### Bug Fixes + +* update metadata to reflect original variable's order ([#137](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/137)) ([4d86b54](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/4d86b54fbca1b0a61fa94b797003a4a94fc3bd32)) + ## [4.4.1](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.0...v4.4.1) (2024-10-25) diff --git a/metadata.yaml b/metadata.yaml index 90493f9..0d1185b 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,7 +24,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git - version: 4.4.0 + version: 4.4.2 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index cad5852..e7887ea 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/key-distributor - version: 4.4.0 + version: 4.4.2 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index 13c8828..6db0aaa 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.1" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.2" } } diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 9490f6c..a472b48 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.4.1 + version: 4.4.2 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index 9da9bd8..51f425c 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.1" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.2" } } diff --git a/versions.tf b/versions.tf index 4cf1a25..5a5e496 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.1" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.2" } } From 4b5fda5b439d995275599a85e1e38ec319bd1c69 Mon Sep 17 00:00:00 2001 From: abhishek kumar tiwari Date: Tue, 10 Dec 2024 12:06:04 +0000 Subject: [PATCH 19/46] fix: update display metadata for simple-sa module (#141) --- modules/simple-sa/metadata.display.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/simple-sa/metadata.display.yaml b/modules/simple-sa/metadata.display.yaml index 5f1ce83..02a1e90 100644 --- a/modules/simple-sa/metadata.display.yaml +++ b/modules/simple-sa/metadata.display.yaml @@ -31,11 +31,11 @@ spec: description: name: description title: Description - invisible: false + level: 1 display_name: name: display_name title: Display Name - invisible: false + level: 1 name: name: name title: Name From ff16de7fc47478acadd259ac015970dff96afd6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 16:27:58 +0530 Subject: [PATCH 20/46] chore(deps): bump golang.org/x/crypto from 0.25.0 to 0.31.0 in /modules/key-distributor/files/function (#143) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- modules/key-distributor/files/function/go.mod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/key-distributor/files/function/go.mod b/modules/key-distributor/files/function/go.mod index 7a9fab1..09c2603 100644 --- a/modules/key-distributor/files/function/go.mod +++ b/modules/key-distributor/files/function/go.mod @@ -3,7 +3,7 @@ module github.com/terraform-google-modules/terraform-google-service-accounts/mod go 1.20 require ( - golang.org/x/crypto v0.25.0 + golang.org/x/crypto v0.31.0 google.golang.org/api v0.189.0 ) @@ -28,8 +28,8 @@ require ( go.opentelemetry.io/otel/trace v1.24.0 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect google.golang.org/grpc v1.64.1 // indirect From 692adc13b2304de734602b1383f88a1ba587eecb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 11:11:49 +0000 Subject: [PATCH 21/46] chore(master): release 4.4.3 (#142) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27ca9ce..1812c2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.4.3](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.2...v4.4.3) (2024-12-13) + + +### Bug Fixes + +* update display metadata for simple-sa module ([#141](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/141)) ([fa6c691](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/fa6c691008b41ae34b785607d28501615f4400e8)) + ## [4.4.2](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.1...v4.4.2) (2024-11-27) diff --git a/metadata.yaml b/metadata.yaml index 0d1185b..66de25f 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,7 +24,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git - version: 4.4.2 + version: 4.4.3 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index e7887ea..81b0a5d 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/key-distributor - version: 4.4.2 + version: 4.4.3 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index 6db0aaa..291f841 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.2" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.3" } } diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index a472b48..565c94e 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.4.2 + version: 4.4.3 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index 51f425c..2fbd92e 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.2" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.3" } } diff --git a/versions.tf b/versions.tf index 5a5e496..add9a81 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.2" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.3" } } From 44e728a7c42572824c96d02d98f60e241e8f4853 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:32:09 -0800 Subject: [PATCH 22/46] chore(deps): bump golang.org/x/crypto from 0.21.0 to 0.31.0 in /test/integration (#145) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/integration/go.mod | 12 ++++++------ test/integration/go.sum | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/integration/go.mod b/test/integration/go.mod index 8e295d9..4788f16 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -62,14 +62,14 @@ require ( github.com/ulikunitz/xz v0.5.11 // indirect github.com/zclconf/go-cty v1.14.4 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.21.0 // indirect + golang.org/x/crypto v0.31.0 // indirect golang.org/x/mod v0.19.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sync v0.4.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.13.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.138.0 // indirect google.golang.org/appengine v1.6.8 // indirect diff --git a/test/integration/go.sum b/test/integration/go.sum index 10713f4..bba5058 100644 --- a/test/integration/go.sum +++ b/test/integration/go.sum @@ -481,8 +481,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -568,8 +568,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -611,8 +611,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -677,13 +677,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -695,8 +695,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -752,8 +752,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From e7704863d8790267054abbd42f75bd8ca68e473f Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 14:58:54 -0800 Subject: [PATCH 23/46] chore: update .github/conventional-commit-lint.yaml From 3a2bdc5feb46e3d396880ae971d95b1b2bd39f7e Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 15:00:45 -0800 Subject: [PATCH 24/46] chore: update .github/renovate.json From a660f41c46c86ca89d74c172183b818b3dbacefb Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 15:00:46 -0800 Subject: [PATCH 25/46] chore: update .github/workflows/stale.yml From 2372511cbcbb60b38849f03b6cc6ab2f6a36e09e Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 15:01:37 -0800 Subject: [PATCH 26/46] chore: update .github/trusted-contribution.yml From 3ca58b75de1f3f41ee6604f669bca246e7b299da Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 15:08:18 -0800 Subject: [PATCH 27/46] chore: update CODEOWNERS From affe18ba5226f8b15bf382fff84da225d260704a Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 15:10:18 -0800 Subject: [PATCH 28/46] chore: update .github/workflows/lint.yaml --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index ef3d95b..638dd91 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -21,7 +21,7 @@ on: workflow_dispatch: pull_request: branches: - - master + - main concurrency: group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}' From 5833163c06905b53c50a66120bd9fa90ba6dffd4 Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 17:10:49 -0800 Subject: [PATCH 29/46] chore: update .github/trusted-contribution.yml --- .github/trusted-contribution.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index a3b4ff2..ae57820 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2023-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github annotations: - type: comment From 13bddb13671b6061b76592fba82f14f741ab8c67 Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 17:14:18 -0800 Subject: [PATCH 30/46] chore: update .github/workflows/lint.yaml --- .github/workflows/lint.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 638dd91..b24662a 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2023-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from values at: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf name: 'lint' From bea2be84aaa2ed63ee9ab647ae1e4b28ca664b05 Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 17:15:48 -0800 Subject: [PATCH 31/46] chore: update .github/workflows/stale.yml --- .github/workflows/stale.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 34a5677..d04506e 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Google LLC +# Copyright 2022-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github name: "Close stale issues" on: From 280ea1afd003088c3409651807a31fb2d9ac2714 Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 17:18:31 -0800 Subject: [PATCH 32/46] chore: update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index dca40c6..8e1a152 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,5 +1,5 @@ # NOTE: This file is automatically generated from values at: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf * @terraform-google-modules/cft-admins @q2w From 3447f5df6f50fd81a23e521a9737b3d620b681c7 Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Fri, 3 Jan 2025 17:19:41 -0800 Subject: [PATCH 33/46] chore: update .github/conventional-commit-lint.yaml --- .github/conventional-commit-lint.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/conventional-commit-lint.yaml b/.github/conventional-commit-lint.yaml index ee8e163..b1d8d8b 100644 --- a/.github/conventional-commit-lint.yaml +++ b/.github/conventional-commit-lint.yaml @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Google LLC +# Copyright 2022-2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. # NOTE: This file is automatically generated from: -# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/github +# https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/github enabled: true always_check_pr_title: true From 4360e041a8fff57665fe8357f21e6a3b1d35dc7d Mon Sep 17 00:00:00 2001 From: abhishek kumar tiwari Date: Tue, 21 Jan 2025 16:23:03 +0000 Subject: [PATCH 34/46] chore: add connection metadata for adding project_roles automatically (#147) --- modules/simple-sa/metadata.yaml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 565c94e..3d00dea 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -62,6 +62,37 @@ spec: description: Roles to grant the SA in specified project varType: list(string) required: true + connections: + - source: + source: github.com/GoogleCloudPlatform/terraform-google-secret-manager//modules/simple-secret + version: ">= 0.5.1" + spec: + outputExpr: "[\"roles/secretmanager.secretAccessor\"]" + - source: + source: github.com/terraform-google-modules/terraform-google-sql-db//modules/postgresql + version: ">= 23.0" + spec: + outputExpr: "[\"roles/cloudsql.instanceUser\", \"roles/cloudsql.client\"]" + - source: + source: github.com/terraform-google-modules/terraform-google-sql-db//modules/mysql + version: ">= 23.0" + spec: + outputExpr: "[\"roles/cloudsql.instanceUser\", \"roles/cloudsql.client\"]" + - source: + source: github.com/terraform-google-modules/terraform-google-memorystore + version: ">= 12.0" + spec: + outputExpr: "[\"roles/redis.editor\"]" + - source: + source: github.com/GoogleCloudPlatform/terraform-google-cloud-run//modules/v2 + version: ">= 0.13" + spec: + outputExpr: "[\"roles/run.invoker\"]" + - source: + source: github.com/terraform-google-modules/terraform-google-project-factory//modules/project_services + version: ">= 17.1.0" + spec: + outputExpr: "[\"roles/aiplatform.user\"]" outputs: - name: account_details description: Service account id and email From f30e4003762e6498f797c1399e543ffd0b488e3b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:53:02 +0000 Subject: [PATCH 35/46] chore(main): release 4.4.4 (#148) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1812c2b..099e262 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.4.4](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.3...v4.4.4) (2025-01-22) + + +### Bug Fixes + +* add connection metadata for adding project_roles automatically ([#147](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/147)) ([854ba80](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/854ba805a3bfad150c163335b5ea3b430224f132)) + ## [4.4.3](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.2...v4.4.3) (2024-12-13) diff --git a/metadata.yaml b/metadata.yaml index 66de25f..2c2d940 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,7 +24,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git - version: 4.4.3 + version: 4.4.4 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index 81b0a5d..8dddc1b 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/key-distributor - version: 4.4.3 + version: 4.4.4 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index 291f841..90b084c 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.3" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.4" } } diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 3d00dea..7fa1744 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.4.3 + version: 4.4.4 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index 2fbd92e..516492e 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.3" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.4" } } diff --git a/versions.tf b/versions.tf index add9a81..fbeeffc 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.3" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.4" } } From d7da93db9a7ac618ca560822ce38c8684b4f468a Mon Sep 17 00:00:00 2001 From: abhishek kumar tiwari Date: Fri, 24 Jan 2025 05:48:21 +0000 Subject: [PATCH 36/46] feat: support simple sa creation without any project level roles (#149) --- metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/simple-sa/README.md | 2 +- modules/simple-sa/metadata.yaml | 4 ++-- modules/simple-sa/variables.tf | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/metadata.yaml b/metadata.yaml index 2c2d940..512abdf 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index 8dddc1b..37d3f67 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/simple-sa/README.md b/modules/simple-sa/README.md index 2d8033c..bc63630 100644 --- a/modules/simple-sa/README.md +++ b/modules/simple-sa/README.md @@ -29,7 +29,7 @@ module "sa" { | display\_name | Display name of the created service accounts (defaults to 'Terraform-managed service account') | `string` | `"Terraform-managed service account"` | no | | name | Name of service account | `string` | n/a | yes | | project\_id | Project id where service account will be created | `string` | n/a | yes | -| project\_roles | Roles to grant the SA in specified project | `list(string)` | n/a | yes | +| project\_roles | Roles to grant the SA in specified project | `list(string)` | `[]` | no | ## Outputs diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 7fa1744..e751e8c 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Google LLC +# Copyright 2025 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ spec: - name: project_roles description: Roles to grant the SA in specified project varType: list(string) - required: true + defaultValue: [] connections: - source: source: github.com/GoogleCloudPlatform/terraform-google-secret-manager//modules/simple-secret diff --git a/modules/simple-sa/variables.tf b/modules/simple-sa/variables.tf index 1181b27..ae70bd3 100644 --- a/modules/simple-sa/variables.tf +++ b/modules/simple-sa/variables.tf @@ -39,4 +39,5 @@ variable "description" { variable "project_roles" { type = list(string) description = "Roles to grant the SA in specified project" + default = [] } From cee29fc98925d3317b623e6103f5759724b94ca8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:10:12 +0530 Subject: [PATCH 37/46] chore(main): release 4.5.0 (#150) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/README.md | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 099e262..cd08471 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.5.0](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.4...v4.5.0) (2025-01-24) + + +### Features + +* support simple sa creation without any project level roles ([#149](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/149)) ([ba869e7](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/ba869e729901148950008f6946c61e391060505c)) + ## [4.4.4](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.3...v4.4.4) (2025-01-22) diff --git a/metadata.yaml b/metadata.yaml index 512abdf..69e6a6f 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,7 +24,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git - version: 4.4.4 + version: 4.5.0 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index 37d3f67..932930d 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/key-distributor - version: 4.4.4 + version: 4.5.0 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index 90b084c..564e899 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.4.4" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.5.0" } } diff --git a/modules/simple-sa/README.md b/modules/simple-sa/README.md index bc63630..c37ffb8 100644 --- a/modules/simple-sa/README.md +++ b/modules/simple-sa/README.md @@ -9,7 +9,7 @@ Basic usage of this submodule is as follows: ```hcl module "sa" { source = "terraform-google-modules/service-accounts/google//modules/simple-sa" - version = "~> 4.4" + version = "~> 4.5" project_id = "" name = "sa-name" diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index e751e8c..552b30c 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.4.4 + version: 4.5.0 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index 516492e..c48b33f 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.4.4" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.5.0" } } diff --git a/versions.tf b/versions.tf index fbeeffc..cd3118c 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.4.4" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.5.0" } } From 050d567e298094265c3fcd58b14a86b2f07b2036 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 10:23:23 -0800 Subject: [PATCH 38/46] chore(deps): Update Terraform terraform-google-modules/project-factory/google to v18 (#146) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/setup/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/setup/main.tf b/test/setup/main.tf index 95a3276..478c0ab 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -16,7 +16,7 @@ module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 17.0" + version = "~> 18.0" name = "ci-service-accounts" random_project_id = "true" From ddce83ddfb7e61e24088d0bad27c092136f9d7b4 Mon Sep 17 00:00:00 2001 From: KT Date: Thu, 6 Mar 2025 07:06:58 -0500 Subject: [PATCH 39/46] chore: add pubsub connection metadata (#152) --- modules/simple-sa/metadata.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 552b30c..6c44f0b 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -93,6 +93,11 @@ spec: version: ">= 17.1.0" spec: outputExpr: "[\"roles/aiplatform.user\"]" + - source: + source: github.com/terraform-google-modules/terraform-google-pubsub + version: ">= 7.0.0" + spec: + outputExpr: "[\"roles/pubsub.editor\"]" outputs: - name: account_details description: Service account id and email From b5a8bf0caf78434bdb9ddbb7cba4039df7c6c371 Mon Sep 17 00:00:00 2001 From: CFT Bot Date: Thu, 13 Mar 2025 23:14:43 -0500 Subject: [PATCH 40/46] chore: update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 8e1a152..6bf3d6c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,7 +1,7 @@ # NOTE: This file is automatically generated from values at: # https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/main/infra/terraform/test-org/org/locals.tf -* @terraform-google-modules/cft-admins @q2w +* @terraform-google-modules/cft-admins @ayushmjain @q2w # NOTE: GitHub CODEOWNERS locations: # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-and-branch-protection From 1926a16d4b3ace6530ef8861012c7ede0bc17f28 Mon Sep 17 00:00:00 2001 From: abhishek kumar tiwari Date: Tue, 18 Mar 2025 17:44:42 +0000 Subject: [PATCH 41/46] fix: udpate metadata to add role when connecting to bigquery (#154) --- modules/simple-sa/metadata.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 6c44f0b..7829c4c 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -98,6 +98,11 @@ spec: version: ">= 7.0.0" spec: outputExpr: "[\"roles/pubsub.editor\"]" + - source: + source: github.com/terraform-google-modules/terraform-google-bigquery + version: ">= 10.0" + spec: + outputExpr: "[\"roles/bigquery.dataEditor\"]" outputs: - name: account_details description: Service account id and email From 56d6456df3196932ec7a0c91b6e67c2970515d97 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 18 Mar 2025 23:42:25 +0530 Subject: [PATCH 42/46] chore(main): release 4.5.1 (#155) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd08471..b585673 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.5.1](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.5.0...v4.5.1) (2025-03-18) + + +### Bug Fixes + +* udpate metadata to add role when connecting to bigquery ([#154](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/154)) ([2d7d5f6](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/2d7d5f632821f9cc2f059c127ed8e6354c5dad05)) + ## [4.5.0](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.4.4...v4.5.0) (2025-01-24) diff --git a/metadata.yaml b/metadata.yaml index 69e6a6f..2360d65 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,7 +24,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git - version: 4.5.0 + version: 4.5.1 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index 932930d..e0e2a62 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/key-distributor - version: 4.5.0 + version: 4.5.1 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index 564e899..b870720 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.5.0" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.5.1" } } diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 7829c4c..2ae7b8b 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.5.0 + version: 4.5.1 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index c48b33f..36fe8a5 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.5.0" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.5.1" } } diff --git a/versions.tf b/versions.tf index cd3118c..87069f6 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.5.0" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.5.1" } } From 9f0206fda677a1883654a67f824151a411367ca0 Mon Sep 17 00:00:00 2001 From: amrkk123 Date: Wed, 26 Mar 2025 18:16:54 +0000 Subject: [PATCH 43/46] fix: Add dataflow connection in service account for dataflow developer role (#156) --- modules/simple-sa/metadata.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 2ae7b8b..e25409c 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -103,6 +103,11 @@ spec: version: ">= 10.0" spec: outputExpr: "[\"roles/bigquery.dataEditor\"]" + - source: + source: github.com/terraform-google-modules/terraform-google-dataflow//modules/flex + version: ">= 3.0.1" + spec: + outputExpr: "[\"roles/dataflow.worker\",\"roles/dataflow.developer\", "\"roles/storage.objectAdmin\""]" outputs: - name: account_details description: Service account id and email From 0cdb9ebb0ead416fda35a7c74635aa4fb59a2bf4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 27 Mar 2025 10:28:25 +0530 Subject: [PATCH 44/46] chore(main): release 4.5.2 (#157) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b585673..7cf322c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.5.2](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.5.1...v4.5.2) (2025-03-26) + + +### Bug Fixes + +* Add dataflow connection in service account for dataflow developer role ([#156](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/156)) ([ccc88bc](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/ccc88bc8ae359b18fee8623cd60d8de1683c3efa)) + ## [4.5.1](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.5.0...v4.5.1) (2025-03-18) diff --git a/metadata.yaml b/metadata.yaml index 2360d65..db67052 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,7 +24,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git - version: 4.5.1 + version: 4.5.2 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index e0e2a62..7cb2f9a 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/key-distributor - version: 4.5.1 + version: 4.5.2 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index b870720..fa24a86 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.5.1" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.5.2" } } diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index e25409c..0226acf 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.5.1 + version: 4.5.2 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index 36fe8a5..51033eb 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.5.1" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.5.2" } } diff --git a/versions.tf b/versions.tf index 87069f6..c79f6ff 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.5.1" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.5.2" } } From 8ae7c682b85f5601e98a9c71138d739fa63751fd Mon Sep 17 00:00:00 2001 From: amrkk123 Date: Thu, 27 Mar 2025 07:49:49 +0000 Subject: [PATCH 45/46] fix: Fix typo in objct admin role (#158) --- modules/simple-sa/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 0226acf..96a6d68 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -107,7 +107,7 @@ spec: source: github.com/terraform-google-modules/terraform-google-dataflow//modules/flex version: ">= 3.0.1" spec: - outputExpr: "[\"roles/dataflow.worker\",\"roles/dataflow.developer\", "\"roles/storage.objectAdmin\""]" + outputExpr: "[\"roles/dataflow.worker\",\"roles/dataflow.developer\", \"roles/storage.objectAdmin\"]" outputs: - name: account_details description: Service account id and email From e6291dbea36dbdd98d3e4df544e29c4521583a52 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 27 Mar 2025 08:03:49 +0000 Subject: [PATCH 46/46] chore(main): release 4.5.3 (#159) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ metadata.yaml | 2 +- modules/key-distributor/metadata.yaml | 2 +- modules/key-distributor/versions.tf | 2 +- modules/simple-sa/metadata.yaml | 2 +- modules/simple-sa/versions.tf | 2 +- versions.tf | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cf322c..78573d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.5.3](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.5.2...v4.5.3) (2025-03-27) + + +### Bug Fixes + +* Fix typo in objct admin role ([#158](https://github.com/terraform-google-modules/terraform-google-service-accounts/issues/158)) ([3e867ef](https://github.com/terraform-google-modules/terraform-google-service-accounts/commit/3e867ef7fcbc69ea9440e1897e1e52ad802f8c17)) + ## [4.5.2](https://github.com/terraform-google-modules/terraform-google-service-accounts/compare/v4.5.1...v4.5.2) (2025-03-26) diff --git a/metadata.yaml b/metadata.yaml index db67052..c28a16c 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,7 +24,7 @@ spec: source: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git - version: 4.5.2 + version: 4.5.3 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/metadata.yaml b/modules/key-distributor/metadata.yaml index 7cb2f9a..b4ae74c 100644 --- a/modules/key-distributor/metadata.yaml +++ b/modules/key-distributor/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/key-distributor - version: 4.5.2 + version: 4.5.3 actuationTool: flavor: Terraform version: ">= 0.13" diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf index fa24a86..d5ab23b 100644 --- a/modules/key-distributor/versions.tf +++ b/modules/key-distributor/versions.tf @@ -33,7 +33,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.5.2" + module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v4.5.3" } } diff --git a/modules/simple-sa/metadata.yaml b/modules/simple-sa/metadata.yaml index 96a6d68..7299bac 100644 --- a/modules/simple-sa/metadata.yaml +++ b/modules/simple-sa/metadata.yaml @@ -25,7 +25,7 @@ spec: repo: https://github.com/terraform-google-modules/terraform-google-service-accounts.git sourceType: git dir: /modules/simple-sa - version: 4.5.2 + version: 4.5.3 actuationTool: flavor: Terraform version: ">= 0.13.0" diff --git a/modules/simple-sa/versions.tf b/modules/simple-sa/versions.tf index 51033eb..ae4332c 100644 --- a/modules/simple-sa/versions.tf +++ b/modules/simple-sa/versions.tf @@ -25,6 +25,6 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.5.2" + module_name = "blueprints/terraform/terraform-google-service-accounts:simple-sa/v4.5.3" } } diff --git a/versions.tf b/versions.tf index c79f6ff..5510813 100644 --- a/versions.tf +++ b/versions.tf @@ -25,7 +25,7 @@ terraform { } provider_meta "google" { - module_name = "blueprints/terraform/terraform-google-service-accounts/v4.5.2" + module_name = "blueprints/terraform/terraform-google-service-accounts/v4.5.3" } }