From 20ddc7731a9b5bd51de6b4de40df6ce7ece7b5fa Mon Sep 17 00:00:00 2001 From: Al Cutter Date: Wed, 18 Nov 2026 14:18:25 +0000 Subject: [PATCH] Update tf & remove obsolete triggers --- .../live/cloudbuild/dev/.terraform.lock.hcl | 80 ++++--- deployment/live/feeder/ci/.terraform.lock.hcl | 38 ++++ .../live/feeder/dev/.terraform.lock.hcl | 38 ++++ .../live/feeder/prod/.terraform.lock.hcl | 38 ++++ .../live/monitoring/ci/.terraform.lock.hcl | 28 ++- .../live/monitoring/dev/.terraform.lock.hcl | 28 ++- .../live/monitoring/prod/.terraform.lock.hcl | 28 ++- .../live/serving/ci/.terraform.lock.hcl | 106 +++++---- .../live/serving/dev/.terraform.lock.hcl | 106 +++++---- .../live/serving/prod/.terraform.lock.hcl | 106 +++++---- deployment/modules/cloudbuild/main.tf | 208 +----------------- deployment/modules/cloudbuild/outputs.tf | 24 -- deployment/modules/distributor/main.tf | 2 + 13 files changed, 340 insertions(+), 490 deletions(-) create mode 100644 deployment/live/feeder/ci/.terraform.lock.hcl create mode 100644 deployment/live/feeder/dev/.terraform.lock.hcl create mode 100644 deployment/live/feeder/prod/.terraform.lock.hcl diff --git a/deployment/live/cloudbuild/dev/.terraform.lock.hcl b/deployment/live/cloudbuild/dev/.terraform.lock.hcl index 9214bab..d081bb1 100644 --- a/deployment/live/cloudbuild/dev/.terraform.lock.hcl +++ b/deployment/live/cloudbuild/dev/.terraform.lock.hcl @@ -1,62 +1,56 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { +provider "registry.opentofu.org/hashicorp/google" { version = "6.0.1" constraints = ">= 3.20.0, 6.0.1" hashes = [ - "h1:PcFIs2OUrYBSzcNqMgRLtjfyQVDnlvOENt+/vCHOYuI=", - "zh:053bcc0e62396d10a4ef40e59dcdf7d4a1491839e0dfc945de7cef5d9106a566", - "zh:282624e6dd086dfe10281f6ad6def3b64279e69fbd667d1141c5f1565e42aecf", - "zh:633384cc00d1c6e84b6cb302a898a407c85806a818ca2c93989992b4f9e9af99", - "zh:7099aa1a79594c6e041659e36a48f0134a19bd8e1810dfddc21bbad6d3e36d54", - "zh:8259adb345c1563a64bdc58efd1cae2ff174b518ccb1f31f79c9c5825e7f762e", - "zh:ae2c3008fe93a3bc1318079c23b1da9b55a77ace45f18cf0fa3b2aefcf33e94a", - "zh:b7f17cb09b4636edf4aed68ab224885523bd33a0b50af2a2a2819d5a843d49e9", - "zh:bee71d0adb8b842b812e4fc76853bedec93c17a6cbf56bc502a2ecf0bcbdaf98", - "zh:c187e22fa33cfa90a093cd25e61a77fb88898cce3f79bef33392ddb7708724ca", - "zh:dd5923c79697be9429edb98156aa94e69b7258f8de42d8c910dde6814c1ef981", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fe789dc52fc029c18e92db0efb3b013d15679b81c1ab633fa69b3eacde9842ac", + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", ] } -provider "registry.terraform.io/hashicorp/google-beta" { +provider "registry.opentofu.org/hashicorp/google-beta" { version = "6.0.1" constraints = ">= 3.30.0, 6.0.1" hashes = [ - "h1:IVaeoGc60BB5WL3imL3EzlB7JZEUZHG4surnL9c7Kkw=", - "zh:13a5af5ff90d18616805864a21dbcf6905cbd45d951097e41d12e79262a807f3", - "zh:19caf3feddb66dc8da3ea4a9948dcf26198aec941b2878002cc015db0f358d34", - "zh:1c8c7bc62f611e8e38273196a369fd38e2b313ef4efdd84396e0cd232f6c3a04", - "zh:2370affed7da4f202a80cc711d345c7c574bfa7677d07aadbc8855a87f622a5c", - "zh:520cbe955fdbdd8d1b9fb3f9b40284079745b7700d734b473eb2dd7c98991e44", - "zh:6353004391399bb077690e70f8941beda9270b1087414443bf3912de34052b5c", - "zh:7b09cc7b6fbe12bb5bc8d5803ee742de8f26e70cbcf890ab1d8dabfd0ed56b9d", - "zh:84f203385625a1ba973ac104cdba31efc430f41e837bead70b20e593673828a0", - "zh:91426564ef6427580c1f798d779d9b6c68616e87b8ead2c80f17e322c5dd2cd8", - "zh:97fc1412ba3a87ee12f4c45353c62d1a68698fbe2f3ff22b7ef87a4fed6a167a", - "zh:d97e7d855f93e068fa4e27faef69f12b0ff7e8c61b9c7a480fc0860a81af0d6c", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:+U4Ypgt32fb3F3ZGn3JmZdcwa/XpMfQf9V6muKJl+fM=", + "zh:18c8612e2b17930bca27c06bbe67b71ecc0d79686884c9030f620a1b77741c66", + "zh:6eaf52fae5fd182566940fa2d9d29c5130a4c4fd1d36ed14b2a264aab64fc035", + "zh:711389ae2a3666a192c91437e95177169aa2907ca1755ceae6dfc1d6b973480c", + "zh:806ba760d207858c5b237f73e920047c6e2b13ebbedd44b1b43d391042fbc0e1", + "zh:821d7618391ca69d3c55391c472e8c0d90c36487c0792f7f96c0702a945ffcd7", + "zh:a23c79034483252771ada89dbf0b5ccbc55444ac92fe6670ccb576bcc0445fe1", + "zh:abc7dd406ea6229bc401f71dda293777b5fc1dab3d517386c897cd4a65002d1f", + "zh:c31aa3be4a611160b0cf42d721a426e17cb4aef9ec0920950ba9724e5fa46ea7", + "zh:c8f92ae41c83a4d496f8fea9f2e7f2370e1d84eeddeda22e51f2bcd6868d42d6", + "zh:fc08cbfd1972b12b7de0e1442da455e2a1f382dc2388b483c7f5ee2ec9de145f", ] } -provider "registry.terraform.io/hashicorp/random" { +provider "registry.opentofu.org/hashicorp/random" { version = "3.6.3" constraints = ">= 2.1.0" hashes = [ - "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=", - "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", - "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", - "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", - "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", - "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", - "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", - "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", - "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", - "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", - "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", + "h1:Ry0Lr0zaoicslZlcUR4rAySPpl/a7QupfMfuAxhW3fw=", + "zh:1bfd2e54b4eee8c761a40b6d99d45880b3a71abc18a9a7a5319204da9c8363b2", + "zh:21a15ac74adb8ba499aab989a4248321b51946e5431219b56fc827e565776714", + "zh:221acfac3f7a5bcd6cb49f79a1fca99da7679bde01017334bad1f951a12d85ba", + "zh:3026fcdc0c1258e32ab519df878579160b1050b141d6f7883b39438244e08954", + "zh:50d07a7066ea46873b289548000229556908c3be746059969ab0d694e053ee4c", + "zh:54280cdac041f2c2986a585f62e102bc59ef412cad5f4ebf7387c2b3a357f6c0", + "zh:632adf40f1f63b0c5707182853c10ae23124c00869ffff05f310aef2ed26fcf3", + "zh:b8c2876cce9a38501d14880a47e59a5182ee98732ad7e576e9a9ce686a46d8f5", + "zh:f27e6995e1e9fe3914a2654791fc8d67cdce44f17bf06e614ead7dfd2b13d3ae", + "zh:f423f2b7e5c814799ad7580b5c8ae23359d8d342264902f821c357ff2b3c6d3d", ] } diff --git a/deployment/live/feeder/ci/.terraform.lock.hcl b/deployment/live/feeder/ci/.terraform.lock.hcl new file mode 100644 index 0000000..7cbde62 --- /dev/null +++ b/deployment/live/feeder/ci/.terraform.lock.hcl @@ -0,0 +1,38 @@ +# This file is maintained automatically by "tofu init". +# Manual edits may be lost in future updates. + +provider "registry.opentofu.org/hashicorp/google" { + version = "6.0.1" + constraints = "6.0.1" + hashes = [ + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", + ] +} + +provider "registry.opentofu.org/hashicorp/google-beta" { + version = "6.0.1" + constraints = "6.0.1" + hashes = [ + "h1:+U4Ypgt32fb3F3ZGn3JmZdcwa/XpMfQf9V6muKJl+fM=", + "zh:18c8612e2b17930bca27c06bbe67b71ecc0d79686884c9030f620a1b77741c66", + "zh:6eaf52fae5fd182566940fa2d9d29c5130a4c4fd1d36ed14b2a264aab64fc035", + "zh:711389ae2a3666a192c91437e95177169aa2907ca1755ceae6dfc1d6b973480c", + "zh:806ba760d207858c5b237f73e920047c6e2b13ebbedd44b1b43d391042fbc0e1", + "zh:821d7618391ca69d3c55391c472e8c0d90c36487c0792f7f96c0702a945ffcd7", + "zh:a23c79034483252771ada89dbf0b5ccbc55444ac92fe6670ccb576bcc0445fe1", + "zh:abc7dd406ea6229bc401f71dda293777b5fc1dab3d517386c897cd4a65002d1f", + "zh:c31aa3be4a611160b0cf42d721a426e17cb4aef9ec0920950ba9724e5fa46ea7", + "zh:c8f92ae41c83a4d496f8fea9f2e7f2370e1d84eeddeda22e51f2bcd6868d42d6", + "zh:fc08cbfd1972b12b7de0e1442da455e2a1f382dc2388b483c7f5ee2ec9de145f", + ] +} diff --git a/deployment/live/feeder/dev/.terraform.lock.hcl b/deployment/live/feeder/dev/.terraform.lock.hcl new file mode 100644 index 0000000..7cbde62 --- /dev/null +++ b/deployment/live/feeder/dev/.terraform.lock.hcl @@ -0,0 +1,38 @@ +# This file is maintained automatically by "tofu init". +# Manual edits may be lost in future updates. + +provider "registry.opentofu.org/hashicorp/google" { + version = "6.0.1" + constraints = "6.0.1" + hashes = [ + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", + ] +} + +provider "registry.opentofu.org/hashicorp/google-beta" { + version = "6.0.1" + constraints = "6.0.1" + hashes = [ + "h1:+U4Ypgt32fb3F3ZGn3JmZdcwa/XpMfQf9V6muKJl+fM=", + "zh:18c8612e2b17930bca27c06bbe67b71ecc0d79686884c9030f620a1b77741c66", + "zh:6eaf52fae5fd182566940fa2d9d29c5130a4c4fd1d36ed14b2a264aab64fc035", + "zh:711389ae2a3666a192c91437e95177169aa2907ca1755ceae6dfc1d6b973480c", + "zh:806ba760d207858c5b237f73e920047c6e2b13ebbedd44b1b43d391042fbc0e1", + "zh:821d7618391ca69d3c55391c472e8c0d90c36487c0792f7f96c0702a945ffcd7", + "zh:a23c79034483252771ada89dbf0b5ccbc55444ac92fe6670ccb576bcc0445fe1", + "zh:abc7dd406ea6229bc401f71dda293777b5fc1dab3d517386c897cd4a65002d1f", + "zh:c31aa3be4a611160b0cf42d721a426e17cb4aef9ec0920950ba9724e5fa46ea7", + "zh:c8f92ae41c83a4d496f8fea9f2e7f2370e1d84eeddeda22e51f2bcd6868d42d6", + "zh:fc08cbfd1972b12b7de0e1442da455e2a1f382dc2388b483c7f5ee2ec9de145f", + ] +} diff --git a/deployment/live/feeder/prod/.terraform.lock.hcl b/deployment/live/feeder/prod/.terraform.lock.hcl new file mode 100644 index 0000000..7cbde62 --- /dev/null +++ b/deployment/live/feeder/prod/.terraform.lock.hcl @@ -0,0 +1,38 @@ +# This file is maintained automatically by "tofu init". +# Manual edits may be lost in future updates. + +provider "registry.opentofu.org/hashicorp/google" { + version = "6.0.1" + constraints = "6.0.1" + hashes = [ + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", + ] +} + +provider "registry.opentofu.org/hashicorp/google-beta" { + version = "6.0.1" + constraints = "6.0.1" + hashes = [ + "h1:+U4Ypgt32fb3F3ZGn3JmZdcwa/XpMfQf9V6muKJl+fM=", + "zh:18c8612e2b17930bca27c06bbe67b71ecc0d79686884c9030f620a1b77741c66", + "zh:6eaf52fae5fd182566940fa2d9d29c5130a4c4fd1d36ed14b2a264aab64fc035", + "zh:711389ae2a3666a192c91437e95177169aa2907ca1755ceae6dfc1d6b973480c", + "zh:806ba760d207858c5b237f73e920047c6e2b13ebbedd44b1b43d391042fbc0e1", + "zh:821d7618391ca69d3c55391c472e8c0d90c36487c0792f7f96c0702a945ffcd7", + "zh:a23c79034483252771ada89dbf0b5ccbc55444ac92fe6670ccb576bcc0445fe1", + "zh:abc7dd406ea6229bc401f71dda293777b5fc1dab3d517386c897cd4a65002d1f", + "zh:c31aa3be4a611160b0cf42d721a426e17cb4aef9ec0920950ba9724e5fa46ea7", + "zh:c8f92ae41c83a4d496f8fea9f2e7f2370e1d84eeddeda22e51f2bcd6868d42d6", + "zh:fc08cbfd1972b12b7de0e1442da455e2a1f382dc2388b483c7f5ee2ec9de145f", + ] +} diff --git a/deployment/live/monitoring/ci/.terraform.lock.hcl b/deployment/live/monitoring/ci/.terraform.lock.hcl index e9b2ca0..5561ee2 100644 --- a/deployment/live/monitoring/ci/.terraform.lock.hcl +++ b/deployment/live/monitoring/ci/.terraform.lock.hcl @@ -1,22 +1,20 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { +provider "registry.opentofu.org/hashicorp/google" { version = "6.0.1" constraints = "6.0.1" hashes = [ - "h1:PcFIs2OUrYBSzcNqMgRLtjfyQVDnlvOENt+/vCHOYuI=", - "zh:053bcc0e62396d10a4ef40e59dcdf7d4a1491839e0dfc945de7cef5d9106a566", - "zh:282624e6dd086dfe10281f6ad6def3b64279e69fbd667d1141c5f1565e42aecf", - "zh:633384cc00d1c6e84b6cb302a898a407c85806a818ca2c93989992b4f9e9af99", - "zh:7099aa1a79594c6e041659e36a48f0134a19bd8e1810dfddc21bbad6d3e36d54", - "zh:8259adb345c1563a64bdc58efd1cae2ff174b518ccb1f31f79c9c5825e7f762e", - "zh:ae2c3008fe93a3bc1318079c23b1da9b55a77ace45f18cf0fa3b2aefcf33e94a", - "zh:b7f17cb09b4636edf4aed68ab224885523bd33a0b50af2a2a2819d5a843d49e9", - "zh:bee71d0adb8b842b812e4fc76853bedec93c17a6cbf56bc502a2ecf0bcbdaf98", - "zh:c187e22fa33cfa90a093cd25e61a77fb88898cce3f79bef33392ddb7708724ca", - "zh:dd5923c79697be9429edb98156aa94e69b7258f8de42d8c910dde6814c1ef981", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fe789dc52fc029c18e92db0efb3b013d15679b81c1ab633fa69b3eacde9842ac", + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", ] } diff --git a/deployment/live/monitoring/dev/.terraform.lock.hcl b/deployment/live/monitoring/dev/.terraform.lock.hcl index e9b2ca0..5561ee2 100644 --- a/deployment/live/monitoring/dev/.terraform.lock.hcl +++ b/deployment/live/monitoring/dev/.terraform.lock.hcl @@ -1,22 +1,20 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { +provider "registry.opentofu.org/hashicorp/google" { version = "6.0.1" constraints = "6.0.1" hashes = [ - "h1:PcFIs2OUrYBSzcNqMgRLtjfyQVDnlvOENt+/vCHOYuI=", - "zh:053bcc0e62396d10a4ef40e59dcdf7d4a1491839e0dfc945de7cef5d9106a566", - "zh:282624e6dd086dfe10281f6ad6def3b64279e69fbd667d1141c5f1565e42aecf", - "zh:633384cc00d1c6e84b6cb302a898a407c85806a818ca2c93989992b4f9e9af99", - "zh:7099aa1a79594c6e041659e36a48f0134a19bd8e1810dfddc21bbad6d3e36d54", - "zh:8259adb345c1563a64bdc58efd1cae2ff174b518ccb1f31f79c9c5825e7f762e", - "zh:ae2c3008fe93a3bc1318079c23b1da9b55a77ace45f18cf0fa3b2aefcf33e94a", - "zh:b7f17cb09b4636edf4aed68ab224885523bd33a0b50af2a2a2819d5a843d49e9", - "zh:bee71d0adb8b842b812e4fc76853bedec93c17a6cbf56bc502a2ecf0bcbdaf98", - "zh:c187e22fa33cfa90a093cd25e61a77fb88898cce3f79bef33392ddb7708724ca", - "zh:dd5923c79697be9429edb98156aa94e69b7258f8de42d8c910dde6814c1ef981", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fe789dc52fc029c18e92db0efb3b013d15679b81c1ab633fa69b3eacde9842ac", + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", ] } diff --git a/deployment/live/monitoring/prod/.terraform.lock.hcl b/deployment/live/monitoring/prod/.terraform.lock.hcl index e9b2ca0..5561ee2 100644 --- a/deployment/live/monitoring/prod/.terraform.lock.hcl +++ b/deployment/live/monitoring/prod/.terraform.lock.hcl @@ -1,22 +1,20 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { +provider "registry.opentofu.org/hashicorp/google" { version = "6.0.1" constraints = "6.0.1" hashes = [ - "h1:PcFIs2OUrYBSzcNqMgRLtjfyQVDnlvOENt+/vCHOYuI=", - "zh:053bcc0e62396d10a4ef40e59dcdf7d4a1491839e0dfc945de7cef5d9106a566", - "zh:282624e6dd086dfe10281f6ad6def3b64279e69fbd667d1141c5f1565e42aecf", - "zh:633384cc00d1c6e84b6cb302a898a407c85806a818ca2c93989992b4f9e9af99", - "zh:7099aa1a79594c6e041659e36a48f0134a19bd8e1810dfddc21bbad6d3e36d54", - "zh:8259adb345c1563a64bdc58efd1cae2ff174b518ccb1f31f79c9c5825e7f762e", - "zh:ae2c3008fe93a3bc1318079c23b1da9b55a77ace45f18cf0fa3b2aefcf33e94a", - "zh:b7f17cb09b4636edf4aed68ab224885523bd33a0b50af2a2a2819d5a843d49e9", - "zh:bee71d0adb8b842b812e4fc76853bedec93c17a6cbf56bc502a2ecf0bcbdaf98", - "zh:c187e22fa33cfa90a093cd25e61a77fb88898cce3f79bef33392ddb7708724ca", - "zh:dd5923c79697be9429edb98156aa94e69b7258f8de42d8c910dde6814c1ef981", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fe789dc52fc029c18e92db0efb3b013d15679b81c1ab633fa69b3eacde9842ac", + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", ] } diff --git a/deployment/live/serving/ci/.terraform.lock.hcl b/deployment/live/serving/ci/.terraform.lock.hcl index 0ddbdde..44413f0 100644 --- a/deployment/live/serving/ci/.terraform.lock.hcl +++ b/deployment/live/serving/ci/.terraform.lock.hcl @@ -1,82 +1,74 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { +provider "registry.opentofu.org/hashicorp/google" { version = "6.0.1" constraints = ">= 3.33.0, >= 3.83.0, >= 4.25.0, >= 4.64.0, >= 5.7.0, >= 5.25.0, >= 5.38.0, 6.0.1, < 7.0.0" hashes = [ - "h1:PcFIs2OUrYBSzcNqMgRLtjfyQVDnlvOENt+/vCHOYuI=", - "zh:053bcc0e62396d10a4ef40e59dcdf7d4a1491839e0dfc945de7cef5d9106a566", - "zh:282624e6dd086dfe10281f6ad6def3b64279e69fbd667d1141c5f1565e42aecf", - "zh:633384cc00d1c6e84b6cb302a898a407c85806a818ca2c93989992b4f9e9af99", - "zh:7099aa1a79594c6e041659e36a48f0134a19bd8e1810dfddc21bbad6d3e36d54", - "zh:8259adb345c1563a64bdc58efd1cae2ff174b518ccb1f31f79c9c5825e7f762e", - "zh:ae2c3008fe93a3bc1318079c23b1da9b55a77ace45f18cf0fa3b2aefcf33e94a", - "zh:b7f17cb09b4636edf4aed68ab224885523bd33a0b50af2a2a2819d5a843d49e9", - "zh:bee71d0adb8b842b812e4fc76853bedec93c17a6cbf56bc502a2ecf0bcbdaf98", - "zh:c187e22fa33cfa90a093cd25e61a77fb88898cce3f79bef33392ddb7708724ca", - "zh:dd5923c79697be9429edb98156aa94e69b7258f8de42d8c910dde6814c1ef981", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fe789dc52fc029c18e92db0efb3b013d15679b81c1ab633fa69b3eacde9842ac", + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", ] } -provider "registry.terraform.io/hashicorp/google-beta" { +provider "registry.opentofu.org/hashicorp/google-beta" { version = "6.0.1" constraints = ">= 4.64.0, >= 5.25.0, >= 5.38.0, 6.0.1, < 7.0.0" hashes = [ - "h1:IVaeoGc60BB5WL3imL3EzlB7JZEUZHG4surnL9c7Kkw=", - "zh:13a5af5ff90d18616805864a21dbcf6905cbd45d951097e41d12e79262a807f3", - "zh:19caf3feddb66dc8da3ea4a9948dcf26198aec941b2878002cc015db0f358d34", - "zh:1c8c7bc62f611e8e38273196a369fd38e2b313ef4efdd84396e0cd232f6c3a04", - "zh:2370affed7da4f202a80cc711d345c7c574bfa7677d07aadbc8855a87f622a5c", - "zh:520cbe955fdbdd8d1b9fb3f9b40284079745b7700d734b473eb2dd7c98991e44", - "zh:6353004391399bb077690e70f8941beda9270b1087414443bf3912de34052b5c", - "zh:7b09cc7b6fbe12bb5bc8d5803ee742de8f26e70cbcf890ab1d8dabfd0ed56b9d", - "zh:84f203385625a1ba973ac104cdba31efc430f41e837bead70b20e593673828a0", - "zh:91426564ef6427580c1f798d779d9b6c68616e87b8ead2c80f17e322c5dd2cd8", - "zh:97fc1412ba3a87ee12f4c45353c62d1a68698fbe2f3ff22b7ef87a4fed6a167a", - "zh:d97e7d855f93e068fa4e27faef69f12b0ff7e8c61b9c7a480fc0860a81af0d6c", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:+U4Ypgt32fb3F3ZGn3JmZdcwa/XpMfQf9V6muKJl+fM=", + "zh:18c8612e2b17930bca27c06bbe67b71ecc0d79686884c9030f620a1b77741c66", + "zh:6eaf52fae5fd182566940fa2d9d29c5130a4c4fd1d36ed14b2a264aab64fc035", + "zh:711389ae2a3666a192c91437e95177169aa2907ca1755ceae6dfc1d6b973480c", + "zh:806ba760d207858c5b237f73e920047c6e2b13ebbedd44b1b43d391042fbc0e1", + "zh:821d7618391ca69d3c55391c472e8c0d90c36487c0792f7f96c0702a945ffcd7", + "zh:a23c79034483252771ada89dbf0b5ccbc55444ac92fe6670ccb576bcc0445fe1", + "zh:abc7dd406ea6229bc401f71dda293777b5fc1dab3d517386c897cd4a65002d1f", + "zh:c31aa3be4a611160b0cf42d721a426e17cb4aef9ec0920950ba9724e5fa46ea7", + "zh:c8f92ae41c83a4d496f8fea9f2e7f2370e1d84eeddeda22e51f2bcd6868d42d6", + "zh:fc08cbfd1972b12b7de0e1442da455e2a1f382dc2388b483c7f5ee2ec9de145f", ] } -provider "registry.terraform.io/hashicorp/null" { +provider "registry.opentofu.org/hashicorp/null" { version = "3.2.3" constraints = "~> 3.1" hashes = [ - "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=", - "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2", - "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d", - "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3", - "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f", - "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301", - "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670", - "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed", - "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65", - "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd", - "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5", + "h1:LF8arSzHfhbyQSFtTMTYEqCM34klzrbAQBJMHYCs9d8=", + "zh:1d57d25084effd3fdfd902eca00020b34b1fb020253b84d7dd471301606015ac", + "zh:65b7f9799b88464d9c2ec529713b7f52ea744275b61a8dc86cdedab1b2dcb933", + "zh:80d3e9c95b7b4ae7c54005cd127cae82e5c53d2b7023ef24c147337bac9dadd9", + "zh:841b60c07683e4bf456799ccd718896fdafdcc2c49252ae09967f2e74d8c8a03", + "zh:8fa1c592a9c78222e35713c6edb3f1f818a4c6f3524a30a209f0a7e919827b68", + "zh:bb795cc1429e09466840c09d39a28edf1db5070b1ec76822fc1173906a264572", + "zh:da1784818a89bea29dfe660632f0060a7a843e4e564d74435fbeca002b0f7d2a", + "zh:f409bf21b1cdaa6dac47cd79806f3d93f67e9507fe4dbf33b0165335f53bc2e1", + "zh:fbea7a1ff84b430ba9594698e93196d81d03e4036de3d1cafccb2a96d5b38581", + "zh:fbf0c84663a7e85881388d7d71ac862184f05fbf2d17ecf76bc5d3d7503ea260", ] } -provider "registry.terraform.io/hashicorp/random" { +provider "registry.opentofu.org/hashicorp/random" { version = "3.6.3" constraints = "~> 3.1" hashes = [ - "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=", - "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", - "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", - "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", - "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", - "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", - "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", - "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", - "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", - "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", - "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", + "h1:Ry0Lr0zaoicslZlcUR4rAySPpl/a7QupfMfuAxhW3fw=", + "zh:1bfd2e54b4eee8c761a40b6d99d45880b3a71abc18a9a7a5319204da9c8363b2", + "zh:21a15ac74adb8ba499aab989a4248321b51946e5431219b56fc827e565776714", + "zh:221acfac3f7a5bcd6cb49f79a1fca99da7679bde01017334bad1f951a12d85ba", + "zh:3026fcdc0c1258e32ab519df878579160b1050b141d6f7883b39438244e08954", + "zh:50d07a7066ea46873b289548000229556908c3be746059969ab0d694e053ee4c", + "zh:54280cdac041f2c2986a585f62e102bc59ef412cad5f4ebf7387c2b3a357f6c0", + "zh:632adf40f1f63b0c5707182853c10ae23124c00869ffff05f310aef2ed26fcf3", + "zh:b8c2876cce9a38501d14880a47e59a5182ee98732ad7e576e9a9ce686a46d8f5", + "zh:f27e6995e1e9fe3914a2654791fc8d67cdce44f17bf06e614ead7dfd2b13d3ae", + "zh:f423f2b7e5c814799ad7580b5c8ae23359d8d342264902f821c357ff2b3c6d3d", ] } diff --git a/deployment/live/serving/dev/.terraform.lock.hcl b/deployment/live/serving/dev/.terraform.lock.hcl index 0ddbdde..44413f0 100644 --- a/deployment/live/serving/dev/.terraform.lock.hcl +++ b/deployment/live/serving/dev/.terraform.lock.hcl @@ -1,82 +1,74 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { +provider "registry.opentofu.org/hashicorp/google" { version = "6.0.1" constraints = ">= 3.33.0, >= 3.83.0, >= 4.25.0, >= 4.64.0, >= 5.7.0, >= 5.25.0, >= 5.38.0, 6.0.1, < 7.0.0" hashes = [ - "h1:PcFIs2OUrYBSzcNqMgRLtjfyQVDnlvOENt+/vCHOYuI=", - "zh:053bcc0e62396d10a4ef40e59dcdf7d4a1491839e0dfc945de7cef5d9106a566", - "zh:282624e6dd086dfe10281f6ad6def3b64279e69fbd667d1141c5f1565e42aecf", - "zh:633384cc00d1c6e84b6cb302a898a407c85806a818ca2c93989992b4f9e9af99", - "zh:7099aa1a79594c6e041659e36a48f0134a19bd8e1810dfddc21bbad6d3e36d54", - "zh:8259adb345c1563a64bdc58efd1cae2ff174b518ccb1f31f79c9c5825e7f762e", - "zh:ae2c3008fe93a3bc1318079c23b1da9b55a77ace45f18cf0fa3b2aefcf33e94a", - "zh:b7f17cb09b4636edf4aed68ab224885523bd33a0b50af2a2a2819d5a843d49e9", - "zh:bee71d0adb8b842b812e4fc76853bedec93c17a6cbf56bc502a2ecf0bcbdaf98", - "zh:c187e22fa33cfa90a093cd25e61a77fb88898cce3f79bef33392ddb7708724ca", - "zh:dd5923c79697be9429edb98156aa94e69b7258f8de42d8c910dde6814c1ef981", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fe789dc52fc029c18e92db0efb3b013d15679b81c1ab633fa69b3eacde9842ac", + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", ] } -provider "registry.terraform.io/hashicorp/google-beta" { +provider "registry.opentofu.org/hashicorp/google-beta" { version = "6.0.1" constraints = ">= 4.64.0, >= 5.25.0, >= 5.38.0, 6.0.1, < 7.0.0" hashes = [ - "h1:IVaeoGc60BB5WL3imL3EzlB7JZEUZHG4surnL9c7Kkw=", - "zh:13a5af5ff90d18616805864a21dbcf6905cbd45d951097e41d12e79262a807f3", - "zh:19caf3feddb66dc8da3ea4a9948dcf26198aec941b2878002cc015db0f358d34", - "zh:1c8c7bc62f611e8e38273196a369fd38e2b313ef4efdd84396e0cd232f6c3a04", - "zh:2370affed7da4f202a80cc711d345c7c574bfa7677d07aadbc8855a87f622a5c", - "zh:520cbe955fdbdd8d1b9fb3f9b40284079745b7700d734b473eb2dd7c98991e44", - "zh:6353004391399bb077690e70f8941beda9270b1087414443bf3912de34052b5c", - "zh:7b09cc7b6fbe12bb5bc8d5803ee742de8f26e70cbcf890ab1d8dabfd0ed56b9d", - "zh:84f203385625a1ba973ac104cdba31efc430f41e837bead70b20e593673828a0", - "zh:91426564ef6427580c1f798d779d9b6c68616e87b8ead2c80f17e322c5dd2cd8", - "zh:97fc1412ba3a87ee12f4c45353c62d1a68698fbe2f3ff22b7ef87a4fed6a167a", - "zh:d97e7d855f93e068fa4e27faef69f12b0ff7e8c61b9c7a480fc0860a81af0d6c", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:+U4Ypgt32fb3F3ZGn3JmZdcwa/XpMfQf9V6muKJl+fM=", + "zh:18c8612e2b17930bca27c06bbe67b71ecc0d79686884c9030f620a1b77741c66", + "zh:6eaf52fae5fd182566940fa2d9d29c5130a4c4fd1d36ed14b2a264aab64fc035", + "zh:711389ae2a3666a192c91437e95177169aa2907ca1755ceae6dfc1d6b973480c", + "zh:806ba760d207858c5b237f73e920047c6e2b13ebbedd44b1b43d391042fbc0e1", + "zh:821d7618391ca69d3c55391c472e8c0d90c36487c0792f7f96c0702a945ffcd7", + "zh:a23c79034483252771ada89dbf0b5ccbc55444ac92fe6670ccb576bcc0445fe1", + "zh:abc7dd406ea6229bc401f71dda293777b5fc1dab3d517386c897cd4a65002d1f", + "zh:c31aa3be4a611160b0cf42d721a426e17cb4aef9ec0920950ba9724e5fa46ea7", + "zh:c8f92ae41c83a4d496f8fea9f2e7f2370e1d84eeddeda22e51f2bcd6868d42d6", + "zh:fc08cbfd1972b12b7de0e1442da455e2a1f382dc2388b483c7f5ee2ec9de145f", ] } -provider "registry.terraform.io/hashicorp/null" { +provider "registry.opentofu.org/hashicorp/null" { version = "3.2.3" constraints = "~> 3.1" hashes = [ - "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=", - "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2", - "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d", - "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3", - "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f", - "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301", - "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670", - "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed", - "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65", - "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd", - "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5", + "h1:LF8arSzHfhbyQSFtTMTYEqCM34klzrbAQBJMHYCs9d8=", + "zh:1d57d25084effd3fdfd902eca00020b34b1fb020253b84d7dd471301606015ac", + "zh:65b7f9799b88464d9c2ec529713b7f52ea744275b61a8dc86cdedab1b2dcb933", + "zh:80d3e9c95b7b4ae7c54005cd127cae82e5c53d2b7023ef24c147337bac9dadd9", + "zh:841b60c07683e4bf456799ccd718896fdafdcc2c49252ae09967f2e74d8c8a03", + "zh:8fa1c592a9c78222e35713c6edb3f1f818a4c6f3524a30a209f0a7e919827b68", + "zh:bb795cc1429e09466840c09d39a28edf1db5070b1ec76822fc1173906a264572", + "zh:da1784818a89bea29dfe660632f0060a7a843e4e564d74435fbeca002b0f7d2a", + "zh:f409bf21b1cdaa6dac47cd79806f3d93f67e9507fe4dbf33b0165335f53bc2e1", + "zh:fbea7a1ff84b430ba9594698e93196d81d03e4036de3d1cafccb2a96d5b38581", + "zh:fbf0c84663a7e85881388d7d71ac862184f05fbf2d17ecf76bc5d3d7503ea260", ] } -provider "registry.terraform.io/hashicorp/random" { +provider "registry.opentofu.org/hashicorp/random" { version = "3.6.3" constraints = "~> 3.1" hashes = [ - "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=", - "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", - "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", - "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", - "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", - "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", - "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", - "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", - "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", - "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", - "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", + "h1:Ry0Lr0zaoicslZlcUR4rAySPpl/a7QupfMfuAxhW3fw=", + "zh:1bfd2e54b4eee8c761a40b6d99d45880b3a71abc18a9a7a5319204da9c8363b2", + "zh:21a15ac74adb8ba499aab989a4248321b51946e5431219b56fc827e565776714", + "zh:221acfac3f7a5bcd6cb49f79a1fca99da7679bde01017334bad1f951a12d85ba", + "zh:3026fcdc0c1258e32ab519df878579160b1050b141d6f7883b39438244e08954", + "zh:50d07a7066ea46873b289548000229556908c3be746059969ab0d694e053ee4c", + "zh:54280cdac041f2c2986a585f62e102bc59ef412cad5f4ebf7387c2b3a357f6c0", + "zh:632adf40f1f63b0c5707182853c10ae23124c00869ffff05f310aef2ed26fcf3", + "zh:b8c2876cce9a38501d14880a47e59a5182ee98732ad7e576e9a9ce686a46d8f5", + "zh:f27e6995e1e9fe3914a2654791fc8d67cdce44f17bf06e614ead7dfd2b13d3ae", + "zh:f423f2b7e5c814799ad7580b5c8ae23359d8d342264902f821c357ff2b3c6d3d", ] } diff --git a/deployment/live/serving/prod/.terraform.lock.hcl b/deployment/live/serving/prod/.terraform.lock.hcl index 0ddbdde..44413f0 100644 --- a/deployment/live/serving/prod/.terraform.lock.hcl +++ b/deployment/live/serving/prod/.terraform.lock.hcl @@ -1,82 +1,74 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/google" { +provider "registry.opentofu.org/hashicorp/google" { version = "6.0.1" constraints = ">= 3.33.0, >= 3.83.0, >= 4.25.0, >= 4.64.0, >= 5.7.0, >= 5.25.0, >= 5.38.0, 6.0.1, < 7.0.0" hashes = [ - "h1:PcFIs2OUrYBSzcNqMgRLtjfyQVDnlvOENt+/vCHOYuI=", - "zh:053bcc0e62396d10a4ef40e59dcdf7d4a1491839e0dfc945de7cef5d9106a566", - "zh:282624e6dd086dfe10281f6ad6def3b64279e69fbd667d1141c5f1565e42aecf", - "zh:633384cc00d1c6e84b6cb302a898a407c85806a818ca2c93989992b4f9e9af99", - "zh:7099aa1a79594c6e041659e36a48f0134a19bd8e1810dfddc21bbad6d3e36d54", - "zh:8259adb345c1563a64bdc58efd1cae2ff174b518ccb1f31f79c9c5825e7f762e", - "zh:ae2c3008fe93a3bc1318079c23b1da9b55a77ace45f18cf0fa3b2aefcf33e94a", - "zh:b7f17cb09b4636edf4aed68ab224885523bd33a0b50af2a2a2819d5a843d49e9", - "zh:bee71d0adb8b842b812e4fc76853bedec93c17a6cbf56bc502a2ecf0bcbdaf98", - "zh:c187e22fa33cfa90a093cd25e61a77fb88898cce3f79bef33392ddb7708724ca", - "zh:dd5923c79697be9429edb98156aa94e69b7258f8de42d8c910dde6814c1ef981", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fe789dc52fc029c18e92db0efb3b013d15679b81c1ab633fa69b3eacde9842ac", + "h1:KHXuTNJYNLlXg5q35qOOkWfC+8MxgB+m7tLt0rO4cPQ=", + "zh:009e842f398806db167379d93dbffa8f96da5145a69eeb56f752a41f5107b75e", + "zh:11c0400b1cd2af6a8dfa6fe9cc9fede2b9e2d87f2b692b77349d90df731183bb", + "zh:387c8b2b074c11c259a924576cffc02f53013fb44c263a7d00aefd83f51b10e5", + "zh:6306b7b63752d02dec61512e777f22dba849bd41865f440e2c1002b80c2abe54", + "zh:90d8f8daa741d9806b484eb3d4d54e57a6141278e738966aa5c941fde9f8c9a6", + "zh:a6b536b3a636a691738730804bb9c6af4e21cc4e741e48fc468ef2e132967f57", + "zh:bda2d4a804e4f27a8cca61e068ad750963832b8f46ed0193d102cf72a891725f", + "zh:d078c52a7c59c6a0ead1ddcc32eb3d49ebc9a57c0ff140eb7569f8f74b4854e1", + "zh:d2f8f1741129ab213c1d603f9c10fa634724b7390289ca4062e5ece7a2833e63", + "zh:e7e042e557f7f9e268bb93018b7e93e1d283c6f725fd87a10a0a3179f1b2df28", ] } -provider "registry.terraform.io/hashicorp/google-beta" { +provider "registry.opentofu.org/hashicorp/google-beta" { version = "6.0.1" constraints = ">= 4.64.0, >= 5.25.0, >= 5.38.0, 6.0.1, < 7.0.0" hashes = [ - "h1:IVaeoGc60BB5WL3imL3EzlB7JZEUZHG4surnL9c7Kkw=", - "zh:13a5af5ff90d18616805864a21dbcf6905cbd45d951097e41d12e79262a807f3", - "zh:19caf3feddb66dc8da3ea4a9948dcf26198aec941b2878002cc015db0f358d34", - "zh:1c8c7bc62f611e8e38273196a369fd38e2b313ef4efdd84396e0cd232f6c3a04", - "zh:2370affed7da4f202a80cc711d345c7c574bfa7677d07aadbc8855a87f622a5c", - "zh:520cbe955fdbdd8d1b9fb3f9b40284079745b7700d734b473eb2dd7c98991e44", - "zh:6353004391399bb077690e70f8941beda9270b1087414443bf3912de34052b5c", - "zh:7b09cc7b6fbe12bb5bc8d5803ee742de8f26e70cbcf890ab1d8dabfd0ed56b9d", - "zh:84f203385625a1ba973ac104cdba31efc430f41e837bead70b20e593673828a0", - "zh:91426564ef6427580c1f798d779d9b6c68616e87b8ead2c80f17e322c5dd2cd8", - "zh:97fc1412ba3a87ee12f4c45353c62d1a68698fbe2f3ff22b7ef87a4fed6a167a", - "zh:d97e7d855f93e068fa4e27faef69f12b0ff7e8c61b9c7a480fc0860a81af0d6c", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "h1:+U4Ypgt32fb3F3ZGn3JmZdcwa/XpMfQf9V6muKJl+fM=", + "zh:18c8612e2b17930bca27c06bbe67b71ecc0d79686884c9030f620a1b77741c66", + "zh:6eaf52fae5fd182566940fa2d9d29c5130a4c4fd1d36ed14b2a264aab64fc035", + "zh:711389ae2a3666a192c91437e95177169aa2907ca1755ceae6dfc1d6b973480c", + "zh:806ba760d207858c5b237f73e920047c6e2b13ebbedd44b1b43d391042fbc0e1", + "zh:821d7618391ca69d3c55391c472e8c0d90c36487c0792f7f96c0702a945ffcd7", + "zh:a23c79034483252771ada89dbf0b5ccbc55444ac92fe6670ccb576bcc0445fe1", + "zh:abc7dd406ea6229bc401f71dda293777b5fc1dab3d517386c897cd4a65002d1f", + "zh:c31aa3be4a611160b0cf42d721a426e17cb4aef9ec0920950ba9724e5fa46ea7", + "zh:c8f92ae41c83a4d496f8fea9f2e7f2370e1d84eeddeda22e51f2bcd6868d42d6", + "zh:fc08cbfd1972b12b7de0e1442da455e2a1f382dc2388b483c7f5ee2ec9de145f", ] } -provider "registry.terraform.io/hashicorp/null" { +provider "registry.opentofu.org/hashicorp/null" { version = "3.2.3" constraints = "~> 3.1" hashes = [ - "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=", - "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2", - "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d", - "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3", - "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f", - "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301", - "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670", - "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed", - "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65", - "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd", - "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5", + "h1:LF8arSzHfhbyQSFtTMTYEqCM34klzrbAQBJMHYCs9d8=", + "zh:1d57d25084effd3fdfd902eca00020b34b1fb020253b84d7dd471301606015ac", + "zh:65b7f9799b88464d9c2ec529713b7f52ea744275b61a8dc86cdedab1b2dcb933", + "zh:80d3e9c95b7b4ae7c54005cd127cae82e5c53d2b7023ef24c147337bac9dadd9", + "zh:841b60c07683e4bf456799ccd718896fdafdcc2c49252ae09967f2e74d8c8a03", + "zh:8fa1c592a9c78222e35713c6edb3f1f818a4c6f3524a30a209f0a7e919827b68", + "zh:bb795cc1429e09466840c09d39a28edf1db5070b1ec76822fc1173906a264572", + "zh:da1784818a89bea29dfe660632f0060a7a843e4e564d74435fbeca002b0f7d2a", + "zh:f409bf21b1cdaa6dac47cd79806f3d93f67e9507fe4dbf33b0165335f53bc2e1", + "zh:fbea7a1ff84b430ba9594698e93196d81d03e4036de3d1cafccb2a96d5b38581", + "zh:fbf0c84663a7e85881388d7d71ac862184f05fbf2d17ecf76bc5d3d7503ea260", ] } -provider "registry.terraform.io/hashicorp/random" { +provider "registry.opentofu.org/hashicorp/random" { version = "3.6.3" constraints = "~> 3.1" hashes = [ - "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=", - "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", - "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", - "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", - "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", - "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", - "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", - "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", - "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", - "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", - "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", + "h1:Ry0Lr0zaoicslZlcUR4rAySPpl/a7QupfMfuAxhW3fw=", + "zh:1bfd2e54b4eee8c761a40b6d99d45880b3a71abc18a9a7a5319204da9c8363b2", + "zh:21a15ac74adb8ba499aab989a4248321b51946e5431219b56fc827e565776714", + "zh:221acfac3f7a5bcd6cb49f79a1fca99da7679bde01017334bad1f951a12d85ba", + "zh:3026fcdc0c1258e32ab519df878579160b1050b141d6f7883b39438244e08954", + "zh:50d07a7066ea46873b289548000229556908c3be746059969ab0d694e053ee4c", + "zh:54280cdac041f2c2986a585f62e102bc59ef412cad5f4ebf7387c2b3a357f6c0", + "zh:632adf40f1f63b0c5707182853c10ae23124c00869ffff05f310aef2ed26fcf3", + "zh:b8c2876cce9a38501d14880a47e59a5182ee98732ad7e576e9a9ce686a46d8f5", + "zh:f27e6995e1e9fe3914a2654791fc8d67cdce44f17bf06e614ead7dfd2b13d3ae", + "zh:f423f2b7e5c814799ad7580b5c8ae23359d8d342264902f821c357ff2b3c6d3d", ] } diff --git a/deployment/modules/cloudbuild/main.tf b/deployment/modules/cloudbuild/main.tf index 2d1e466..674bfec 100644 --- a/deployment/modules/cloudbuild/main.tf +++ b/deployment/modules/cloudbuild/main.tf @@ -24,115 +24,13 @@ terraform { resource "google_artifact_registry_repository" "distributor_docker" { repository_id = "distributor-docker-${var.env}" location = var.region - description = "docker images for the distributor" + description = "docker images for the distributor project" format = "DOCKER" } locals { artifact_repo = "${var.region}-docker.pkg.dev/${var.project_id}/${google_artifact_registry_repository.distributor_docker.name}" - distributor_docker_image = "${local.artifact_repo}/distributor" witness_docker_image = "${local.artifact_repo}/witness" - feeder_docker_image = "${local.artifact_repo}/feeder" -} - -resource "google_cloudbuild_trigger" "distributor_docker" { - name = "build-distributor-docker-${var.env}" - service_account = google_service_account.cloudbuild_service_account.id - location = var.region - - github { - owner = "transparency-dev" - name = "distributor" - push { - branch = "^main$" - } - } - - build { - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "build", - "-t", "${local.distributor_docker_image}:$SHORT_SHA", - "-t", "${local.distributor_docker_image}:latest", - "-f", "./cmd/Dockerfile", - "." - ] - } - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "push", - "--all-tags", - local.distributor_docker_image - ] - } - # Deploy container image to Cloud Run - step { - name = "gcr.io/google.com/cloudsdktool/cloud-sdk" - entrypoint = "gcloud" - args = [ - "run", - "deploy", - var.distributor_cloud_run_service, - "--image", - "${local.distributor_docker_image}:$SHORT_SHA", - "--region", - var.region - ] - } - options { - logging = "CLOUD_LOGGING_ONLY" - } - } -} - -# When a new tag is pushed to GitHub, add that tag to the docker -# image that was already pushed to the repo for the corresponding -# commit hash. -# This requires that the above step has already completed, but that -# seems like a fair assumption given that we'd have deployed it in ci -# before tagging it. -resource "google_cloudbuild_trigger" "distributor_docker_tag" { - name = "tag-distributor-docker-${var.env}" - service_account = google_service_account.cloudbuild_service_account.id - location = var.region - - github { - owner = "transparency-dev" - name = "distributor" - push { - tag = ".*" - } - } - - build { - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "pull", - "${local.distributor_docker_image}:$SHORT_SHA", - ] - } - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "tag", - "${local.distributor_docker_image}:$SHORT_SHA", - "${local.distributor_docker_image}:$TAG_NAME", - ] - } - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "push", - "${local.distributor_docker_image}:$TAG_NAME", - ] - } - options { - logging = "CLOUD_LOGGING_ONLY" - } - } } resource "google_cloudbuild_trigger" "witness_docker" { @@ -238,110 +136,6 @@ resource "google_cloudbuild_trigger" "witness_docker_tag" { } } -resource "google_cloudbuild_trigger" "feeder_docker" { - name = "build-feeder-docker-${var.env}" - service_account = google_service_account.cloudbuild_service_account.id - location = var.region - - // Only create this trigger if the corresponding cloud run service is specified. - count = var.feeder_cloud_run_service != null ? 1 : 0 - - github { - owner = "transparency-dev" - name = "witness" - push { - branch = "^main$" - } - } - - build { - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "build", - "-t", "${local.feeder_docker_image}:$SHORT_SHA", - "-t", "${local.feeder_docker_image}:latest", - "-f", "./cmd/feedwitness/Dockerfile", - "." - ] - } - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "push", - "--all-tags", - local.feeder_docker_image - ] - } - # Deploy container image to Cloud Run - step { - name = "gcr.io/google.com/cloudsdktool/cloud-sdk" - entrypoint = "gcloud" - args = [ - "run", - "deploy", - var.feeder_cloud_run_service, - "--image", - "${local.feeder_docker_image}:$SHORT_SHA", - "--region", - var.region - ] - } - options { - logging = "CLOUD_LOGGING_ONLY" - } - } -} - -# When a new tag is pushed to GitHub, add that tag to the docker -# image that was already pushed to the repo for the corresponding -# commit hash. -# This requires that the above step has already completed, but that -# seems like a fair assumption given that we'd have deployed it in ci -# before tagging it. -resource "google_cloudbuild_trigger" "feeder_docker_tag" { - name = "tag-feeder-docker-${var.env}" - service_account = google_service_account.cloudbuild_service_account.id - location = var.region - - github { - owner = "transparency-dev" - name = "witness" - push { - tag = ".*" - } - } - - build { - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "pull", - "${local.feeder_docker_image}:$SHORT_SHA", - ] - } - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "tag", - "${local.feeder_docker_image}:$SHORT_SHA", - "${local.feeder_docker_image}:$TAG_NAME", - ] - } - step { - name = "gcr.io/cloud-builders/docker" - args = [ - "push", - "${local.feeder_docker_image}:$TAG_NAME", - ] - } - options { - logging = "CLOUD_LOGGING_ONLY" - } - } -} - - resource "google_service_account" "cloudbuild_service_account" { account_id = "cloudbuild-${var.env}-sa" display_name = "Service Account for CloudBuild (${var.env})" diff --git a/deployment/modules/cloudbuild/outputs.tf b/deployment/modules/cloudbuild/outputs.tf index 153f9cd..63298a9 100644 --- a/deployment/modules/cloudbuild/outputs.tf +++ b/deployment/modules/cloudbuild/outputs.tf @@ -14,32 +14,8 @@ * limitations under the License. */ -output "artifact_registry_id" { - description = "The ID of the created artifact registry for distributor docker images" - value = google_artifact_registry_repository.distributor_docker.id -} - -output "artifact_registry_name" { - description = "The name of the created artifact registry for distributor docker images" - value = google_artifact_registry_repository.distributor_docker.name -} - -output "cloudbuild_trigger_id" { - description = "The ID of the created trigger for building images" - value = google_cloudbuild_trigger.distributor_docker.id -} - -output "distributor_docker_image" { - description = "The address of the distributor docker image that will be built" - value = local.distributor_docker_image -} - output "witness_docker_image" { description = "The address of the witness docker image that will be built" value = local.witness_docker_image } -output "feeder_docker_image" { - description = "The address of the feeder docker image that will be built" - value = local.feeder_docker_image -} diff --git a/deployment/modules/distributor/main.tf b/deployment/modules/distributor/main.tf index 4a836d6..e12e802 100644 --- a/deployment/modules/distributor/main.tf +++ b/deployment/modules/distributor/main.tf @@ -115,6 +115,7 @@ module "private-service-access" { version = "22.0.0" project_id = var.project_id vpc_network = module.network-safer-mysql-simple.network_name + deletion_policy = "ABANDON" } locals { @@ -191,6 +192,7 @@ resource "google_cloud_run_v2_service" "default" { name = "distributor-service-${var.env}" location = var.region launch_stage = "GA" + deletion_protection = false template { service_account = google_service_account.cloudrun_service_account.email