Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update examples to use registry #141

Merged
merged 3 commits into from
Dec 20, 2023
Merged

chore: update examples to use registry #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0b4c48
chore: update examples to use registry
bharathkkb Dec 18, 2023
8d4580f
update goldens
bharathkkb Dec 20, 2023
ada8ebb
fix lint
bharathkkb Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build/int.cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
4 changes: 3 additions & 1 deletion examples/advanced/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion examples/basic/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/nat_with_compute_engine/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/integration/advanced/testdata/TestAdvanced.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableEndpointIndependentMapping": false,
"enableDynamicPortAllocation": false,
"enableEndpointIndependentMapping": false,
"endpointTypes": [
"ENDPOINT_TYPE_VM"
],
Expand All @@ -12,5 +12,6 @@
"tcpEstablishedIdleTimeoutSec": 600,
"tcpTimeWaitTimeoutSec": 240,
"tcpTransitoryIdleTimeoutSec": 15,
"type": "PUBLIC",
"udpIdleTimeoutSec": 15
}
3 changes: 2 additions & 1 deletion test/integration/basic/testdata/TestBasic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"autoNetworkTier": "PREMIUM",
"enableEndpointIndependentMapping": false,
"enableDynamicPortAllocation": false,
"enableEndpointIndependentMapping": false,
"endpointTypes": [
"ENDPOINT_TYPE_VM"
],
Expand All @@ -13,5 +13,6 @@
"tcpEstablishedIdleTimeoutSec": 1200,
"tcpTimeWaitTimeoutSec": 120,
"tcpTransitoryIdleTimeoutSec": 30,
"type": "PUBLIC",
"udpIdleTimeoutSec": 30
}
5 changes: 3 additions & 2 deletions test/integration/subnetworks/testdata/TestSubnetworks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"enableEndpointIndependentMapping": false,
"enableDynamicPortAllocation": false,
"endpointTypes":[
"enableEndpointIndependentMapping": false,
"endpointTypes": [
"ENDPOINT_TYPE_VM"
],
"icmpIdleTimeoutSec": 15,
Expand All @@ -20,5 +20,6 @@
"tcpEstablishedIdleTimeoutSec": 600,
"tcpTimeWaitTimeoutSec": 240,
"tcpTransitoryIdleTimeoutSec": 15,
"type": "PUBLIC",
"udpIdleTimeoutSec": 15
}