Merge branch 'origin/main' into security-updates-shop-examples and resolve conflicts

Author: stevemcghee

.github/workflows/terraform-checks.yaml

@@ -8,9 +8,9 @@ jobs:
     name: Format Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
-      - uses: hashicorp/setup-terraform@v3
+      - uses: hashicorp/setup-terraform@v4
       - run: go install github.com/terraform-docs/terraform-docs@v0.18.0
       - run: make lint
       - name: diff check

cli/rapctl/go.mod

@@ -2,7 +2,7 @@ module github.com/GoogleCloudPlatform/reliable-app-platforms/cli/rapctl
 
 go 1.21.3
 
-require github.com/spf13/cobra v1.10.1
+require github.com/spf13/cobra v1.10.2
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect

cli/rapctl/go.sum

@@ -12,11 +12,14 @@ github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
 github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
 github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

examples/shop/email/app-repo/src/requirements.in

@@ -1,10 +1,11 @@
 google-api-core>=2.11.1
-google-cloud-profiler>=4.1.0
 grpcio-health-checking>=1.58.0
+grpcio>=1.58.0
+jinja2>=3.1.5
 python-json-logger>=2.0.7
-requests>=2.32.2
-rsa>=4.9
+google-cloud-profiler>=4.1.0
+google-cloud-trace>=1.11.2
+requests>=2.32.4
 opentelemetry-distro>=0.41b0
 opentelemetry-instrumentation-grpc>=0.41b0
 opentelemetry-exporter-otlp-proto-grpc>=1.20.0
-jinja2>=3.1.2

examples/shop/email/app-repo/src/requirements.txt

@@ -121,7 +121,7 @@ pyparsing==3.1.1
     # via httplib2
 python-json-logger==2.0.7
     # via -r requirements.in
-requests==2.32.2
+requests==2.32.4
     # via
     #   -r requirements.in
     #   google-api-core

examples/shop/recommendations/app-repo/src/requirements.in

@@ -2,7 +2,7 @@ google-api-core>=2.11.1
 google-cloud-profiler>=4.1.0
 grpcio-health-checking>=1.58.0
 python-json-logger>=2.0.7
-requests>=2.32.2
+requests>=2.32.4
 rsa>=4.9
 opentelemetry-distro>=0.41b0
 opentelemetry-instrumentation-grpc>=0.41b0

examples/shop/recommendations/app-repo/src/requirements.txt

@@ -103,7 +103,7 @@ pyparsing==3.1.1
     # via httplib2
 python-json-logger==2.0.7
     # via -r requirements.in
-requests==2.32.2
+requests==2.32.4
     # via
     #   -r requirements.in
     #   google-api-core

infra/terraform/enable-apis/main.tf

@@ -1,6 +1,6 @@
 module "project-services" {
   source     = "terraform-google-modules/project-factory/google//modules/project_services"
-  version    = "~> 17.0"
+  version    = "~> 18.0"
   project_id = var.project_id
   activate_apis = [
     "compute.googleapis.com",

infra/terraform/gke/gke.tf

@@ -1,7 +1,7 @@
 module "gke" {
   for_each                   = { for i, v in local.fleet_clusters_info : i => v }
   source                     = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster"
-  version                    = "39.0.0"
+  version                    = "44.0.0"
   project_id                 = var.project_id
   name                       = each.value.cluster_name
   regional                   = true
@@ -22,7 +22,7 @@ module "gke" {
 
 module "gke-config-cluster" {
   source                     = "terraform-google-modules/kubernetes-engine/google//modules/beta-autopilot-public-cluster"
-  version                    = "39.0.0"
+  version                    = "44.0.0"
   project_id                 = var.project_id
   name                       = local.config_cluster_info.cluster_name
   regional                   = true

infra/terraform/gke/hub.tf

@@ -21,7 +21,7 @@ locals {
 module "fleet-hub" {
   for_each        = { for i, v in local.all-clusters : i => v }
   source          = "terraform-google-modules/kubernetes-engine/google//modules/fleet-membership"
-  version         = "39.0.0"
+  version         = "44.0.0"
   project_id      = var.project_id
   location        = each.value.region
   cluster_name    = each.value.name