chore: update examples to use registry (#47)

terraform-google-modules · Dec 20, 2023 · 265df32 · 265df32
1 parent de1246e
commit 265df32
Show file tree

Hide file tree

Showing 5 changed files with 9 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/gsutil/main.tf b/examples/gsutil/main.tf
@@ -21,7 +21,9 @@ provider "google" {
 }
 
 module "startup-scripts" {
-  source                   = "../../"
+  source  = "terraform-google-modules/startup-scripts/google"
+  version = "~> 2.0"
+
   enable_get_from_bucket   = true
   enable_setup_init_script = true
 }

diff --git a/examples/simple_example/README.md b/examples/simple_example/README.md
@@ -141,7 +141,6 @@ $ curl -H Metadata-Flavor:Google http://metadata.google.internal/computeMetadata
 | network | The network name to deploy to | `string` | `"default"` | no |
 | project\_id | The project\_id to deploy the example instance into.  (e.g. "simple-sample-project-1234") | `any` | n/a | yes |
 | region | The region to deploy to | `any` | n/a | yes |
-| url | The url to fetch in the startup script.  This URL is passed via instance metadata to the startup script.  (e.g. ifconfig.co/city) | `string` | `"http://ifconfig.co/json"` | no |
 
 ## Outputs
 

diff --git a/examples/simple_example/main.tf b/examples/simple_example/main.tf
@@ -21,7 +21,9 @@ provider "google" {
 }
 
 module "startup-scripts" {
-  source               = "../../"
+  source  = "terraform-google-modules/startup-scripts/google"
+  version = "~> 2.0"
+
   enable_setup_sudoers = true
 }
 

diff --git a/examples/simple_example/variables.tf b/examples/simple_example/variables.tf
@@ -26,8 +26,3 @@ variable "network" {
   description = "The network name to deploy to"
   default     = "default"
 }
-
-variable "url" {
-  description = "The url to fetch in the startup script.  This URL is passed via instance metadata to the startup script.  (e.g. ifconfig.co/city)"
-  default     = "http://ifconfig.co/json"
-}