chore: update examples to use registry (#141)

terraform-google-modules · Dec 20, 2023 · d421cc2 · d421cc2
1 parent 3847dd9
commit d421cc2
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -14,6 +14,9 @@
 
 timeout: 3600s
 steps:
+- id: swap-module-refs
+  name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
+  args: ['module-swapper']
 - id: prepare
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment']

diff --git a/examples/advanced/main.tf b/examples/advanced/main.tf
@@ -15,7 +15,9 @@
  */
 
 module "cloud-nat" {
-  source                             = "../../"
+  source  = "terraform-google-modules/cloud-nat/google"
+  version = "~> 5.0"
+
   project_id                         = var.project_id
   region                             = var.region
   router                             = var.router_name

diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -15,7 +15,9 @@
  */
 
 module "cloud-nat" {
-  source     = "../../"
+  source  = "terraform-google-modules/cloud-nat/google"
+  version = "~> 5.0"
+
   router     = var.router_name
   project_id = var.project_id
   region     = var.region

diff --git a/examples/nat_with_compute_engine/main.tf b/examples/nat_with_compute_engine/main.tf
@@ -84,8 +84,9 @@ resource "google_compute_router" "router" {
 
 # [START cloudnat_nat_gce]
 module "cloud-nat" {
-  source                             = "terraform-google-modules/cloud-nat/google"
-  version                            = "~> 4.0"
+  source  = "terraform-google-modules/cloud-nat/google"
+  version = "~> 5.0"
+
   project_id                         = var.project_id
   region                             = "us-east4"
   router                             = google_compute_router.router.name

diff --git a/test/integration/advanced/testdata/TestAdvanced.json b/test/integration/advanced/testdata/TestAdvanced.json
@@ -1,6 +1,6 @@
 {
-  "enableEndpointIndependentMapping": false,
   "enableDynamicPortAllocation": false,
+  "enableEndpointIndependentMapping": false,
   "endpointTypes": [
     "ENDPOINT_TYPE_VM"
   ],
@@ -12,5 +12,6 @@
   "tcpEstablishedIdleTimeoutSec": 600,
   "tcpTimeWaitTimeoutSec": 240,
   "tcpTransitoryIdleTimeoutSec": 15,
+  "type": "PUBLIC",
   "udpIdleTimeoutSec": 15
 }
diff --git a/test/integration/basic/testdata/TestBasic.json b/test/integration/basic/testdata/TestBasic.json
@@ -1,7 +1,7 @@
 {
   "autoNetworkTier": "PREMIUM",
-  "enableEndpointIndependentMapping": false,
   "enableDynamicPortAllocation": false,
+  "enableEndpointIndependentMapping": false,
   "endpointTypes": [
     "ENDPOINT_TYPE_VM"
   ],
@@ -13,5 +13,6 @@
   "tcpEstablishedIdleTimeoutSec": 1200,
   "tcpTimeWaitTimeoutSec": 120,
   "tcpTransitoryIdleTimeoutSec": 30,
+  "type": "PUBLIC",
   "udpIdleTimeoutSec": 30
 }
diff --git a/test/integration/subnetworks/testdata/TestSubnetworks.json b/test/integration/subnetworks/testdata/TestSubnetworks.json
@@ -1,7 +1,7 @@
 {
-  "enableEndpointIndependentMapping": false,
   "enableDynamicPortAllocation": false,
-  "endpointTypes":[
+  "enableEndpointIndependentMapping": false,
+  "endpointTypes": [
     "ENDPOINT_TYPE_VM"
   ],
   "icmpIdleTimeoutSec": 15,
@@ -20,5 +20,6 @@
   "tcpEstablishedIdleTimeoutSec": 600,
   "tcpTimeWaitTimeoutSec": 240,
   "tcpTransitoryIdleTimeoutSec": 15,
+  "type": "PUBLIC",
   "udpIdleTimeoutSec": 15
 }