diff --git a/infra/terraform/test-org/ci-project/.terraform.lock.hcl b/infra/terraform/test-org/ci-project/.terraform.lock.hcl index c9dad1b9f0b..32e14175887 100644 --- a/infra/terraform/test-org/ci-project/.terraform.lock.hcl +++ b/infra/terraform/test-org/ci-project/.terraform.lock.hcl @@ -2,63 +2,64 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/google" { - version = "5.20.0" - constraints = ">= 3.39.0, >= 3.53.0, >= 3.64.0, < 6.0.0" + version = "5.39.1" + constraints = ">= 3.53.0, >= 3.64.0, >= 5.26.0, < 6.0.0" hashes = [ - "h1:1A6/7vxNHz+9Htdkr0NF3cFFStT+kR3aC5Hh8y4fyVA=", - "zh:10197fce4ddf2be32717fb3a5992b45ee1a134f8c66207ba7a2d89339bcad17e", - "zh:428c22bc9ae637adaa3c99e7ec2f5df3828c1625cebfc0ef680e520abdaff820", - "zh:4474139669a13997abd3d8282dc00905a08c695895b1b3d09e5a87753be54a24", - "zh:4bcd7a09577303d71146899f70413a7376531c940015eb6bfa047df55778d2ef", - "zh:5c5083c8deae3093a63d9a7ff18844985e35f2108fca49a812be85f3ec8e7409", - "zh:72ab7bf2a7a1ae98bf1ed790cc3babcd6399db58aa2c9bcef005f9b709b8ad98", - "zh:95cf50e8aa4fe5495b983aca1478cd7909fafc92c0e1942b764343076f367e3f", - "zh:9efd8613897beee98c11befc1f8ebfea14b5a0e88b0fdd2f737a1a2acd5e2a2f", - "zh:b91ddced2f7916338e1f7d0fa003a15bb5700d8d4f389d906f2944334d67bbc2", - "zh:db0270eb90eda9ce98668afc517365d5876c81bb12f0375d6837d204231f6df5", + "h1:6AJPkCW3JqdpVO+HCb8g0mzZyZXPUEt/+3BTmCGnTTg=", + "zh:28763694f5f06a98a4745f0e37f8f8ae412e48a6cfd9b7339599abf89e7577c5", + "zh:469a415b398a08c8b479e32cb24b028791eac57bdab3c15d8b987290e55bfa55", + "zh:4a1f97c58f22379f7c98c7bfe94c923d58c41cb9801679e1a54f85c9848af48c", + "zh:4b2bc066b977cf57de895d1a68f47cc4df48cc7ce0054f8c3de06f6cd63f263d", + "zh:6436aa9a7721079f0784b3ccc0da953337f96500bd34a5ba927fe1833392c54a", + "zh:6b0833e932bc904dee2ca320d5efb785766fd4474c041128868232cc78a0e764", + "zh:8c2a47a571dce3b825fd90789d1af3699cdd615f06e5bf13258585d1560222b8", + "zh:ae5b4cdc76720165023870bc9899bb7de9aee8f4ead95dd368a6ebad95176fe4", + "zh:c30307a74d64f61fbd5a6b5e8658e4d11152ee1f54f43a02c0fe734e5f0f529a", + "zh:e892a200145641b8ae55ba0f69cf83454267b41e0f2d3b6932d4d917d8112911", + "zh:ecd95d22838181ae578eba90154a972661bcdc779f728d71957c059b56c7fd61", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:f58e490c192698ff8655081d467e57ee13558aa47f950f1d249318bf5cc93e5e", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "5.20.0" - constraints = ">= 3.39.0, >= 3.64.0, < 6.0.0" + version = "5.39.1" + constraints = ">= 3.64.0, >= 5.26.0, < 6.0.0" hashes = [ - "h1:VSz6LygMw9vekbL9jkhxImhjeiafFrOkVIpojyeWVOU=", - "zh:2792639ca660f373ce0c0d152f28d1d2e59b590c19d960eddea3c7b70be2e811", - "zh:5a29c775934d5fdf3960687222b0c1505741104ade9a94e42a11d6bef73c1656", - "zh:71fcdf323e7e5bf91d12450ad7f948eef3df935e1875764d5f3c6316b57faa1b", - "zh:89ca5d8cb4d17d7855b7ee7c347a3bb57d5c935c4cc6d18ac78098c9c1c6008a", - "zh:c2a1e2d093ade9a5a4d5170fa4d439c2542f7d01a114af2a5a92b071268d193e", - "zh:c4999b0bb00ce68bea7b203fdd6685c8133f7593d8ce7a9214cedac4844c22b0", - "zh:c912e8f6baa182780678b1caf44863e7d829942c0e9f4a3f04bd623e1bf5f430", - "zh:d553df714bc0d94b3bcdba37a3fca2eb099d7e494502a64a20b3d0f5213b979b", - "zh:d92266f87f3679b179a238b2a3df5309da6b9d86bdcb9311cce5f4b9537938fb", - "zh:e0daa80c3691c6b977c64d22a0c4f6e180d5d3dc888306f7057adb179baab761", + "h1:KOBwBBNtenF6bAgQlvIdtx4tfnrl2iXNRyAYAYfpqA4=", + "zh:07fcc7db2fdc302627f2cddd16fe6b2bf1e8a0fd24e41172afaee96dcb7894bd", + "zh:0f17e28afe3322b692cf912b09378333f59e51d3e62da27e8a337e86b34cb9e9", + "zh:252abaeb1dd9739f7b919d1ed3728c20f266c761125b6c33dc17fbbf08af77fb", + "zh:313c8db8dfb4b80d44aff470d6dcc2c7f5f6dbf4484717636e7fe42a401f5dff", + "zh:353ecd422983e3d993c7daa3fb0d7fd6663b663dfd95894734dc8f5261dba6bf", + "zh:486ffdfe5e834a03dd374813451fb6ec15392934b1adfadac0b9c2485f6f8e27", + "zh:847a88f8c392efd0c84e85d716d2ab7ec3a2d52c213c6b79db67aedd31b23a81", + "zh:9569b0d3029198d5dac39a7d714553d3456eb9db885393965f585b33ded60c7e", + "zh:b79475e63c78a24c70500c0e28e7526104b385fd5fa08f332d8bf0c94d6597de", + "zh:bf70c9fcd96d2abd1d3682cfd39075709745185b874a005465c6c067ce102dee", + "zh:d644a1043481d16a5788847b4204933f528bf65fb571546aec62f7da19d7e6b4", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fee824aeb0f16837d3aaeadbabdf9e40d162344415acba8c521e43cf76d0efa8", ] } provider "registry.terraform.io/integrations/github" { - version = "6.0.1" + version = "6.2.3" constraints = "~> 6.0" hashes = [ - "h1:0KIqqSJNVJeGVWmuQ/E+dMxXUyZqFcPBKx0TwCa0k58=", - "zh:02809196d73846c34f435633deb876391e036628254ec7733e991ef4be8937b8", - "zh:107974d5ee14c2116ecb175e9a98b80b49d1b16f0a9120f55fc59bb494510446", - "zh:1af00f406b490d28f105b9fec7151b467004676b829437d2f0e796409e8353fb", - "zh:1b9989d19e3b6a795e166952baaf3ade64b45d416933aa3ba14591effd15c0a0", - "zh:2b74693b5bf0d1be923acf9b34062f8a046473858bb7f22d05779f8752dd7bb2", - "zh:4845cb2a8eb59d3d3cfba8906d51681f312469fa9694ad6fd3e8f4c39396a385", - "zh:58fa1b8dbe09b553a5e92e108439c0be454181ba295afb65e9f004589619044c", - "zh:66136c381022fa6e1829d5de0ded42d75b1566b7bd431370fc716829f1bc4cb0", - "zh:680e93f5525541047b78bdac6a88779fe6656b503d60cedab6a31a134116be52", - "zh:6a9c7fb124aac014bd7f2248ae317316da52118ffdc9289850e86cea8d503717", - "zh:82250d7d4eba026a9438e7637931fc662a70a918efc346b83aebeb1fb031ee81", - "zh:858229daa25ef519c194441663b163fb03daa5f8e2376d77f523aa2c0ae1268f", - "zh:94eba25a9e491640428f5ee349f7fa00bc7d7e7928bc60ca2c5be82c51187441", - "zh:e6a75c879bb8c1f3a867a7320afb01e52bde5881459e568c0424a048ce2d4f4d", + "h1:nHTegsQYYUJZbaTnU1aMJBgnZUbR2zsfCl7DsL/kZjQ=", + "zh:05874671652a260b12d784cc46b0eea156f493a5f12e00368d1f6cb319156257", + "zh:0c7a3cae5a66e5c5efc3b25ba646a0d46bfe1fd3edba1f5a75f51aede85a9d1b", + "zh:174310010d08f13e36e53ff18e44a21dd040c89884ef190a192c6ce27926a912", + "zh:23d1d8731e518354ce6a83419f49101aece63882b0ca7c489f3c598cc6ea5d5e", + "zh:4e88953816daf11ab1681c32c7988d4e29476fc44f0959fe03173532cf5044de", + "zh:6fab07734ccf27f5afee4442abae2d33245eabf35519032ce1e2aad6961a640a", + "zh:7b2f324b918e161c892c29ee80d36c48ca8b891b8047e132fc701ca741e5ae72", + "zh:8ef4f0d691ade98082ef1f6b36e556468e5ab26e60021f0de0fb22e3acdfd990", + "zh:8f0f3e139faa8f2b9075bb9978dd683f4bab5ac91171bbb969addd04d7f0b90f", + "zh:97cb6d7fdf640237cc2f0ab830db8f878770968c59fd28298e9dddb8b9e6294d", + "zh:a17038d8747c6bb660e4c5981e8ffbbc33c66ba164868fd35d442e7f828a1e01", + "zh:aa9f4b7d947f7b11277b4e9ba7147f5594cf60a6589b7aac4344f73d1400d1c0", + "zh:c780b951e14d583ef6ffef9a934831b56ee157c50ed8e969c676a636810f7db1", + "zh:d8497bb2986fd76107b7208b33cc39281797164fdea09453e987b969a461befb", + "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25", ] } diff --git a/infra/terraform/test-org/ci-project/gar.tf b/infra/terraform/test-org/ci-project/gar.tf new file mode 100644 index 00000000000..91090bffe83 --- /dev/null +++ b/infra/terraform/test-org/ci-project/gar.tf @@ -0,0 +1,19 @@ +module "artifact_registry" { + source = "GoogleCloudPlatform/artifact-registry/google" + version = "~> 0.2" + + location = "us" + project_id = local.project_id + format = "DOCKER" + repository_id = "gcr.io" + + members = { + readers = [ + "allUsers", + ] + + writers = [ + "serviceAccount:${module.service_accounts.service_account.email}", + ] + } +} diff --git a/infra/terraform/test-org/ci-project/versions.tf b/infra/terraform/test-org/ci-project/versions.tf index 67d0458307c..16e4e21a7c2 100644 --- a/infra/terraform/test-org/ci-project/versions.tf +++ b/infra/terraform/test-org/ci-project/versions.tf @@ -22,10 +22,10 @@ terraform { version = "~> 6.0" } google = { - version = ">= 3.39, < 6" + version = ">= 5.26, < 6" } google-beta = { - version = ">= 3.39, < 6" + version = ">= 5.26, < 6" } } }