diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 58f62b7..2ff40ad 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -25,7 +25,7 @@ runs: # v3.0.0 ref. https://github.com/hashicorp/setup-terraform/releases/tag/v3.0.0 uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 with: - terraform_version: "1.8.4" + terraform_version: "1.9.1" - name: auth for Google Cloud if: ${{ inputs.auth_gcloud == 'true' }} diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 469d6fc..da58bfd 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,6 +1,4 @@ name-template: "v$RESOLVED_VERSION" -tag-template: "v$RESOLVED_VERSION" -change-template: "- $TITLE (#$NUMBER) @$AUTHOR" change-title-escapes: '\<*_&' exclude-labels: - "skip-changelog" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c2ac393..69ae19e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,17 +14,15 @@ jobs: runs-on: ubuntu-22.04 permissions: contents: write - pull-requests: write steps: - name: checkout project uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v6.0.0 ref. https://github.com/release-drafter/release-drafter/releases/tag/v6.0.0 - - name: generate release note and create version tag + - name: generate a release note and a version tag uses: release-drafter/release-drafter@3f0f87098bd6b5c5b9a36d49c41d998ea58f9348 with: tag: v${{ inputs.release_version }} - version: v${{ inputs.release_version }} publish: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/terraform/environments/test/tier1/.terraform.lock.hcl b/terraform/environments/test/tier1/.terraform.lock.hcl index 4c0fa78..f3f45ea 100644 --- a/terraform/environments/test/tier1/.terraform.lock.hcl +++ b/terraform/environments/test/tier1/.terraform.lock.hcl @@ -2,42 +2,42 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "5.31.1" - constraints = ">= 3.33.0, >= 3.43.0, >= 3.64.0, >= 3.83.0, >= 4.25.0, >= 4.64.0, 5.31.1, < 6.0.0" + version = "5.36.0" + constraints = ">= 3.33.0, >= 3.43.0, >= 3.64.0, >= 3.83.0, >= 4.25.0, >= 4.64.0, 5.36.0, < 6.0.0" hashes = [ - "h1:UFrLFTynjBac3F9t/dNtz51QR6m4ftiU4wsrGHeWEN4=", - "zh:0aecf5dc844addb478baea44a89c52792695ba7e507f562ff80c2482dd12e4b9", - "zh:128571c39799c509f1c7b3efca0689fdcaf29539567279b0f16b3199d98e2231", - "zh:13c6f1aefd70513ca32fd8b8d035d5af01bd55a31fe928c6a2dd4b8c5359324f", - "zh:36349bb7d363c5047d91b9e7a040ff6df317fd39e8fc8c6dfe1e97b7790c1399", - "zh:36e9208f8f65ba93c99406df3ed650fb232d328ed9606d75103229548dad4849", - "zh:466485a6df7e8ad305338a60bbf425480084d58eaec1d309bf44144f3e93930f", - "zh:734258e55368e7859e36df899b5cc76380c7cd228d1ec526e9e40c921b802529", - "zh:7e9784c8469793b0115a49f0456a689ca91d7017efa2f4fbc39004dbb2a12d24", - "zh:99055ae37d073b419e6fd87cf7ef4b00237e08643ddb4211eaa2a56643717514", - "zh:bcebc3c1f1398e3cddbc97d1c12aa41520151d5a3a4f0403e05324223dd9e131", - "zh:d8286b091cd1d630cbc303df1d7805ed0792c21c432d9162308df30619c8b703", + "h1:ZmehutpLnGCVqxWhEZo8xLbggHjD39xvwefw4TwMt9g=", + "zh:091f4e82ee4ba77cd37b67d9c24448a1317e8e103bd5f3191f7b4b26b314f2e6", + "zh:15aed0b4cc85ee275aa32740ecf745f4ff6da09ed7c705900d93f5d0e454fcd1", + "zh:403cc4daf32aa31fe89940aca6d1d320531103801d5c4678107f3c952d126875", + "zh:539c774fb97bc2dd6cd67f436ae062c2fc50d9181aa4f4ae626dc428dce1bb82", + "zh:5857cf533a5db0853f81f2662681e95556b0972cae0bd5cff02d24f2a0cb395e", + "zh:7e802ee04b9ea84f1667ac8e970dc559709628555e1350b4996f07b067da041d", + "zh:90a62593c84543f8d8f7848ae3b75d3190e6ad36cf38e2d5ca321771668c77e6", + "zh:9e2cf799c61dd4f534f84705db3ab00142d0a5b58ea147a6a67f5bd902f31eba", + "zh:b3470f63ef5621eab6501c7024ba74480def676cb58331755484ffcf1c64b3d8", + "zh:b6a640f7cbee78880e901512d193e6863339eb18f552903e7298ceb023543486", + "zh:cddaca8c950334a22849b6499c0dde289ac8e9767d29ee1504e70872201d8da8", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "5.31.1" - constraints = ">= 3.43.0, >= 3.64.0, >= 4.64.0, 5.31.1, < 6.0.0" + version = "5.36.0" + constraints = ">= 3.43.0, >= 3.64.0, >= 4.64.0, 5.36.0, < 6.0.0" hashes = [ - "h1:qiIxlVU9MoDhDmeiJ2p6fBqCGW0JRTjYhGxG+D8oLJg=", - "zh:0f8ac615b8d447bfb73ee9bc31febbb65b29150e42064a687ec84822127779d6", - "zh:3f5fcf40909dc910ec6dc1856040577ed1cb9db316d322b699237fe98fb60c7b", - "zh:5195fc71717a0baba183f87c55cba535a8ae771adcecb61206648831405ea825", - "zh:527ab8e55d486192c0ef663ff30677bfe12dcc94623df525b09391ac727e0880", - "zh:76f5d0ef35bdf82f847e6d69ebb2136704dd0101fabb22baa02a433bcede4987", - "zh:9e78054548ac34192d7afffc7c47aeaf53f87e9216c1db268830e832b596112b", - "zh:c22b3f20a874bad485e4506e4479bfe099e742fa1e1969705ed5bde0d38bd70e", - "zh:c7347805827a2783da428527f127bb3041317a3a8eac23a4d23971594b291437", - "zh:cd2ef897dee72da8fae435c9a64bb09cc73670a9f68d6a74b0594c20e894910c", - "zh:ecc18a6cf2353dd7f1600120ff1bcd2194a3acf7356474d62f96b067312d4090", + "h1:maXBTHowMriiivUMNHzHpD9lft3KZ8SuN3HEAgk1ax4=", + "zh:1516867331b7c1e53d28e929d4bcc77199e9ed2c733b1dd805a0445c7bd55708", + "zh:25750a11add3099e8773c512e7820a4c5e04a66b431626a47d37e992308387dc", + "zh:5085899f0d71fa03798da4285e6334464abf8ad8bc86017c795942aceeac1b34", + "zh:53f2b06d25948ba222a2d8cc4583bb14c588aa37e2eeca4b63eaa609665d9e72", + "zh:5a78890d4e88085b4f17b7d3266773ae1d95ac2376a945defb77125831fa3546", + "zh:5cdb4c91c65688a3a6341f543aaee5e4645003f9af152189bd324589f3449535", + "zh:6cfa032855dbb86325a7c832164346b83fda7ee41a6e679d1b06fb3d4eebd5d6", + "zh:9d4c34d545fcafa928d38c41b76d8638109924a176e9d8da74eca835874c0181", + "zh:a330ec2300476d553f553863f1d6183053ac669f6e9663f095cf3f712485b666", + "zh:d1fa47a22727931d16282a7b14c0476383820db5bc266632e5df5a2506562735", + "zh:e243237d3415452935b3e42dd90ab170feb4fc1511819e6a99f895c29e9a73c1", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fbed785359f24bfdac285caab1b21806c3fc83ffec637ec59fc963b8e03e1c75", ] } diff --git a/terraform/environments/test/tier2/.terraform.lock.hcl b/terraform/environments/test/tier2/.terraform.lock.hcl index fa7426f..870781f 100644 --- a/terraform/environments/test/tier2/.terraform.lock.hcl +++ b/terraform/environments/test/tier2/.terraform.lock.hcl @@ -2,42 +2,42 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "5.31.1" - constraints = ">= 5.7.0, 5.31.1, < 6.0.0" + version = "5.36.0" + constraints = ">= 5.7.0, 5.36.0, < 6.0.0" hashes = [ - "h1:UFrLFTynjBac3F9t/dNtz51QR6m4ftiU4wsrGHeWEN4=", - "zh:0aecf5dc844addb478baea44a89c52792695ba7e507f562ff80c2482dd12e4b9", - "zh:128571c39799c509f1c7b3efca0689fdcaf29539567279b0f16b3199d98e2231", - "zh:13c6f1aefd70513ca32fd8b8d035d5af01bd55a31fe928c6a2dd4b8c5359324f", - "zh:36349bb7d363c5047d91b9e7a040ff6df317fd39e8fc8c6dfe1e97b7790c1399", - "zh:36e9208f8f65ba93c99406df3ed650fb232d328ed9606d75103229548dad4849", - "zh:466485a6df7e8ad305338a60bbf425480084d58eaec1d309bf44144f3e93930f", - "zh:734258e55368e7859e36df899b5cc76380c7cd228d1ec526e9e40c921b802529", - "zh:7e9784c8469793b0115a49f0456a689ca91d7017efa2f4fbc39004dbb2a12d24", - "zh:99055ae37d073b419e6fd87cf7ef4b00237e08643ddb4211eaa2a56643717514", - "zh:bcebc3c1f1398e3cddbc97d1c12aa41520151d5a3a4f0403e05324223dd9e131", - "zh:d8286b091cd1d630cbc303df1d7805ed0792c21c432d9162308df30619c8b703", + "h1:ZmehutpLnGCVqxWhEZo8xLbggHjD39xvwefw4TwMt9g=", + "zh:091f4e82ee4ba77cd37b67d9c24448a1317e8e103bd5f3191f7b4b26b314f2e6", + "zh:15aed0b4cc85ee275aa32740ecf745f4ff6da09ed7c705900d93f5d0e454fcd1", + "zh:403cc4daf32aa31fe89940aca6d1d320531103801d5c4678107f3c952d126875", + "zh:539c774fb97bc2dd6cd67f436ae062c2fc50d9181aa4f4ae626dc428dce1bb82", + "zh:5857cf533a5db0853f81f2662681e95556b0972cae0bd5cff02d24f2a0cb395e", + "zh:7e802ee04b9ea84f1667ac8e970dc559709628555e1350b4996f07b067da041d", + "zh:90a62593c84543f8d8f7848ae3b75d3190e6ad36cf38e2d5ca321771668c77e6", + "zh:9e2cf799c61dd4f534f84705db3ab00142d0a5b58ea147a6a67f5bd902f31eba", + "zh:b3470f63ef5621eab6501c7024ba74480def676cb58331755484ffcf1c64b3d8", + "zh:b6a640f7cbee78880e901512d193e6863339eb18f552903e7298ceb023543486", + "zh:cddaca8c950334a22849b6499c0dde289ac8e9767d29ee1504e70872201d8da8", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "5.31.1" - constraints = ">= 5.7.0, 5.31.1, < 6.0.0" + version = "5.36.0" + constraints = ">= 5.7.0, 5.36.0, < 6.0.0" hashes = [ - "h1:qiIxlVU9MoDhDmeiJ2p6fBqCGW0JRTjYhGxG+D8oLJg=", - "zh:0f8ac615b8d447bfb73ee9bc31febbb65b29150e42064a687ec84822127779d6", - "zh:3f5fcf40909dc910ec6dc1856040577ed1cb9db316d322b699237fe98fb60c7b", - "zh:5195fc71717a0baba183f87c55cba535a8ae771adcecb61206648831405ea825", - "zh:527ab8e55d486192c0ef663ff30677bfe12dcc94623df525b09391ac727e0880", - "zh:76f5d0ef35bdf82f847e6d69ebb2136704dd0101fabb22baa02a433bcede4987", - "zh:9e78054548ac34192d7afffc7c47aeaf53f87e9216c1db268830e832b596112b", - "zh:c22b3f20a874bad485e4506e4479bfe099e742fa1e1969705ed5bde0d38bd70e", - "zh:c7347805827a2783da428527f127bb3041317a3a8eac23a4d23971594b291437", - "zh:cd2ef897dee72da8fae435c9a64bb09cc73670a9f68d6a74b0594c20e894910c", - "zh:ecc18a6cf2353dd7f1600120ff1bcd2194a3acf7356474d62f96b067312d4090", + "h1:maXBTHowMriiivUMNHzHpD9lft3KZ8SuN3HEAgk1ax4=", + "zh:1516867331b7c1e53d28e929d4bcc77199e9ed2c733b1dd805a0445c7bd55708", + "zh:25750a11add3099e8773c512e7820a4c5e04a66b431626a47d37e992308387dc", + "zh:5085899f0d71fa03798da4285e6334464abf8ad8bc86017c795942aceeac1b34", + "zh:53f2b06d25948ba222a2d8cc4583bb14c588aa37e2eeca4b63eaa609665d9e72", + "zh:5a78890d4e88085b4f17b7d3266773ae1d95ac2376a945defb77125831fa3546", + "zh:5cdb4c91c65688a3a6341f543aaee5e4645003f9af152189bd324589f3449535", + "zh:6cfa032855dbb86325a7c832164346b83fda7ee41a6e679d1b06fb3d4eebd5d6", + "zh:9d4c34d545fcafa928d38c41b76d8638109924a176e9d8da74eca835874c0181", + "zh:a330ec2300476d553f553863f1d6183053ac669f6e9663f095cf3f712485b666", + "zh:d1fa47a22727931d16282a7b14c0476383820db5bc266632e5df5a2506562735", + "zh:e243237d3415452935b3e42dd90ab170feb4fc1511819e6a99f895c29e9a73c1", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fbed785359f24bfdac285caab1b21806c3fc83ffec637ec59fc963b8e03e1c75", ] } diff --git a/terraform/globals.tf b/terraform/globals.tf index bef83b7..9cd1d3a 100644 --- a/terraform/globals.tf +++ b/terraform/globals.tf @@ -4,18 +4,18 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "5.31.1" + version = "5.36.0" } google-beta = { source = "hashicorp/google-beta" - version = "5.31.1" + version = "5.36.0" } random = { source = "hashicorp/random" version = "3.6.2" } } - required_version = "1.8.4" + required_version = "1.9.1" } provider "google" { diff --git a/terraform/modules/db/main.tf b/terraform/modules/db/main.tf index 071d24e..fcdf462 100644 --- a/terraform/modules/db/main.tf +++ b/terraform/modules/db/main.tf @@ -3,7 +3,7 @@ # - メンテナンス時間は火曜日 8:00—9:00(JST) module "sql_db" { source = "GoogleCloudPlatform/sql-db/google//modules/mysql" - version = "20.1.0" + version = "20.2.0" project_id = local.project_id region = var.region zone = var.zone