Update terraform example for GCP pipeline (closes #67)

terraform/gcp/iglu_server/default/README.md

@@ -2,9 +2,9 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1 |
-| <a name="requirement_google"></a> [google](#requirement\_google) | ~> 3.90.1 |
-| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
+| <a name="requirement_google"></a> [google](#requirement\_google) | >= 3.90 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3 |
 
 ## Providers
 
@@ -14,9 +14,9 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_iglu_db"></a> [iglu\_db](#module\_iglu\_db) | snowplow-devops/cloud-sql/google | 0.1.1 |
-| <a name="module_iglu_lb"></a> [iglu\_lb](#module\_iglu\_lb) | snowplow-devops/lb/google | 0.1.0 |
-| <a name="module_iglu_server"></a> [iglu\_server](#module\_iglu\_server) | snowplow-devops/iglu-server-ce/google | 0.3.2 |
+| <a name="module_iglu_db"></a> [iglu\_db](#module\_iglu\_db) | snowplow-devops/cloud-sql/google | 0.3.0 |
+| <a name="module_iglu_lb"></a> [iglu\_lb](#module\_iglu\_lb) | snowplow-devops/lb/google | 0.3.0 |
+| <a name="module_iglu_server"></a> [iglu\_server](#module\_iglu\_server) | snowplow-devops/iglu-server-ce/google | 0.4.0 |
 
 ## Resources
 
@@ -46,4 +46,4 @@ No resources.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_iglu_server_ip_address"></a> [iglu\_server\_ip\_address](#output\_iglu\_server\_ip\_address) | The IP address for the Iglu Server |
+| <a name="output_iglu_server_ip_address"></a> [iglu\_server\_ip\_address](#output\_iglu\_server\_ip\_address) | The IP address for the Iglu Server |

terraform/gcp/iglu_server/default/main.tf

@@ -4,8 +4,10 @@ provider "google" {
 }
 
 module "iglu_db" {
-  source  = "snowplow-devops/cloud-sql/google"
-  version = "0.1.1"
+  # source  = "snowplow-devops/cloud-sql/google"
+  # version = "0.3.0"
+
+  source = "git::https://github.com/snowplow-devops/terraform-google-cloud-sql.git?ref=release/0.3.0"
 
   name = "${var.prefix}-iglu-db"
 
@@ -18,8 +20,10 @@ module "iglu_db" {
 }
 
 module "iglu_server" {
-  source  = "snowplow-devops/iglu-server-ce/google"
-  version = "0.3.2"
+  # source  = "snowplow-devops/iglu-server-ce/google"
+  # version = "0.4.0"
+
+  source = "git::https://github.com/snowplow-devops/terraform-google-iglu-server-ce.git?ref=release/0.4.0"
 
   name = "${var.prefix}-iglu-server"
 
@@ -46,8 +50,10 @@ module "iglu_server" {
 }
 
 module "iglu_lb" {
-  source  = "snowplow-devops/lb/google"
-  version = "0.1.0"
+  # source  = "snowplow-devops/lb/google"
+  # version = "0.3.0"
+
+  source = "git::https://github.com/snowplow-devops/terraform-google-lb.git?ref=release/0.3.0"
 
   name = "${var.prefix}-iglu-lb"
 

terraform/gcp/iglu_server/default/terraform.tfvars

@@ -31,7 +31,7 @@ ssh_key_pairs = [
 iglu_db_name     = "iglu"
 iglu_db_username = "iglu"
 # Change and keep this secret!
-iglu_db_password = "Hell0W0rld!"
+iglu_db_password = "<PASSWORD>"
 
 # Used for API actions on the Iglu Server
 # Change this to a new UUID and keep it secret!

terraform/gcp/iglu_server/default/versions.tf

@@ -1,14 +1,14 @@
 terraform {
-  required_version = "~> 1"
+  required_version = ">= 1.0.0"
 
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.90.1"
+      version = ">= 3.90"
     }
     random = {
       source  = "hashicorp/random"
-      version = "~> 3.1.0"
+      version = ">= 3"
     }
   }
 }

terraform/gcp/iglu_server/secure/README.md

@@ -2,9 +2,9 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1 |
-| <a name="requirement_google"></a> [google](#requirement\_google) | ~> 3.90.1 |
-| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
+| <a name="requirement_google"></a> [google](#requirement\_google) | >= 3.90 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3 |
 
 ## Providers
 
@@ -14,9 +14,9 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_iglu_db"></a> [iglu\_db](#module\_iglu\_db) | snowplow-devops/cloud-sql/google | 0.1.1 |
-| <a name="module_iglu_lb"></a> [iglu\_lb](#module\_iglu\_lb) | snowplow-devops/lb/google | 0.1.0 |
-| <a name="module_iglu_server"></a> [iglu\_server](#module\_iglu\_server) | snowplow-devops/iglu-server-ce/google | 0.3.2 |
+| <a name="module_iglu_db"></a> [iglu\_db](#module\_iglu\_db) | snowplow-devops/cloud-sql/google | 0.3.0 |
+| <a name="module_iglu_lb"></a> [iglu\_lb](#module\_iglu\_lb) | snowplow-devops/lb/google | 0.3.0 |
+| <a name="module_iglu_server"></a> [iglu\_server](#module\_iglu\_server) | snowplow-devops/iglu-server-ce/google | 0.4.0 |
 
 ## Resources
 
@@ -46,4 +46,4 @@ No resources.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_iglu_server_ip_address"></a> [iglu\_server\_ip\_address](#output\_iglu\_server\_ip\_address) | The IP address for the Iglu Server |
+| <a name="output_iglu_server_ip_address"></a> [iglu\_server\_ip\_address](#output\_iglu\_server\_ip\_address) | The IP address for the Iglu Server |

terraform/gcp/iglu_server/secure/main.tf

@@ -5,7 +5,7 @@ provider "google" {
 
 module "iglu_db" {
   source  = "snowplow-devops/cloud-sql/google"
-  version = "0.1.1"
+  version = "0.3.0"
 
   name = "${var.prefix}-iglu-db"
 
@@ -19,7 +19,7 @@ module "iglu_db" {
 
 module "iglu_server" {
   source  = "snowplow-devops/iglu-server-ce/google"
-  version = "0.3.2"
+  version = "0.4.0"
 
   name = "${var.prefix}-iglu-server"
 
@@ -49,7 +49,7 @@ module "iglu_server" {
 
 module "iglu_lb" {
   source  = "snowplow-devops/lb/google"
-  version = "0.1.0"
+  version = "0.3.0"
 
   name = "${var.prefix}-iglu-lb"
 

terraform/gcp/iglu_server/secure/terraform.tfvars

@@ -30,7 +30,7 @@ ssh_key_pairs = [
 iglu_db_name     = "iglu"
 iglu_db_username = "iglu"
 # Change and keep this secret!
-iglu_db_password = "Hell0W0rld!"
+iglu_db_password = "<PASSWORD>"
 
 # Used for API actions on the Iglu Server
 # Change this to a new UUID and keep it secret!

terraform/gcp/iglu_server/secure/versions.tf

@@ -1,14 +1,14 @@
 terraform {
-  required_version = "~> 1"
+  required_version = ">= 1.0.0"
 
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.90.1"
+      version = ">= 3.90"
     }
     random = {
       source  = "hashicorp/random"
-      version = "~> 3.1.0"
+      version = ">= 3"
     }
   }
 }

terraform/gcp/pipeline/default/README.md

@@ -2,31 +2,31 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1 |
-| <a name="requirement_google"></a> [google](#requirement\_google) | ~> 3.90.1 |
-| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.1.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
+| <a name="requirement_google"></a> [google](#requirement\_google) | >= 3.90 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | ~> 3.90.1 |
+| <a name="provider_google"></a> [google](#provider\_google) | >= 3.90 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_bad_1_topic"></a> [bad\_1\_topic](#module\_bad\_1\_topic) | snowplow-devops/pubsub-topic/google | 0.1.0 |
-| <a name="module_bad_rows_topic"></a> [bad\_rows\_topic](#module\_bad\_rows\_topic) | snowplow-devops/pubsub-topic/google | 0.1.0 |
-| <a name="module_bigquery_loader"></a> [bigquery\_loader](#module\_bigquery\_loader) | snowplow-devops/bigquery-loader-pubsub-ce/google | 0.1.0 |
-| <a name="module_collector_lb"></a> [collector\_lb](#module\_collector\_lb) | snowplow-devops/lb/google | 0.1.0 |
-| <a name="module_collector_pubsub"></a> [collector\_pubsub](#module\_collector\_pubsub) | snowplow-devops/collector-pubsub-ce/google | 0.2.2 |
-| <a name="module_enrich_pubsub"></a> [enrich\_pubsub](#module\_enrich\_pubsub) | snowplow-devops/enrich-pubsub-ce/google | 0.1.2 |
-| <a name="module_enriched_topic"></a> [enriched\_topic](#module\_enriched\_topic) | snowplow-devops/pubsub-topic/google | 0.1.0 |
-| <a name="module_postgres_db"></a> [postgres\_db](#module\_postgres\_db) | snowplow-devops/cloud-sql/google | 0.1.1 |
-| <a name="module_postgres_loader_bad"></a> [postgres\_loader\_bad](#module\_postgres\_loader\_bad) | snowplow-devops/postgres-loader-pubsub-ce/google | 0.2.1 |
-| <a name="module_postgres_loader_enriched"></a> [postgres\_loader\_enriched](#module\_postgres\_loader\_enriched) | snowplow-devops/postgres-loader-pubsub-ce/google | 0.2.1 |
-| <a name="module_raw_topic"></a> [raw\_topic](#module\_raw\_topic) | snowplow-devops/pubsub-topic/google | 0.1.0 |
+| <a name="module_bad_1_topic"></a> [bad\_1\_topic](#module\_bad\_1\_topic) | snowplow-devops/pubsub-topic/google | 0.3.0 |
+| <a name="module_bigquery_loader"></a> [bigquery\_loader](#module\_bigquery\_loader) | snowplow-devops/bigquery-loader-pubsub-ce/google | 0.2.0 |
+| <a name="module_bq_bad_rows_topic"></a> [bq\_bad\_rows\_topic](#module\_bq\_bad\_rows\_topic) | snowplow-devops/pubsub-topic/google | 0.3.0 |
+| <a name="module_collector_lb"></a> [collector\_lb](#module\_collector\_lb) | snowplow-devops/lb/google | 0.3.0 |
+| <a name="module_collector_pubsub"></a> [collector\_pubsub](#module\_collector\_pubsub) | snowplow-devops/collector-pubsub-ce/google | 0.4.0 |
+| <a name="module_enrich_pubsub"></a> [enrich\_pubsub](#module\_enrich\_pubsub) | snowplow-devops/enrich-pubsub-ce/google | 0.2.0 |
+| <a name="module_enriched_topic"></a> [enriched\_topic](#module\_enriched\_topic) | snowplow-devops/pubsub-topic/google | 0.3.0 |
+| <a name="module_postgres_db"></a> [postgres\_db](#module\_postgres\_db) | snowplow-devops/cloud-sql/google | 0.3.0 |
+| <a name="module_postgres_loader_bad"></a> [postgres\_loader\_bad](#module\_postgres\_loader\_bad) | snowplow-devops/postgres-loader-pubsub-ce/google | 0.3.0 |
+| <a name="module_postgres_loader_enriched"></a> [postgres\_loader\_enriched](#module\_postgres\_loader\_enriched) | snowplow-devops/postgres-loader-pubsub-ce/google | 0.3.0 |
+| <a name="module_raw_topic"></a> [raw\_topic](#module\_raw\_topic) | snowplow-devops/pubsub-topic/google | 0.3.0 |
 
 ## Resources
 
@@ -71,4 +71,4 @@
 | <a name="output_bq_loader_dead_letter_bucket_name"></a> [bq\_loader\_dead\_letter\_bucket\_name](#output\_bq\_loader\_dead\_letter\_bucket\_name) | The name of the GCS bucket for dead letter events emitted from the BigQuery loader |
 | <a name="output_collector_ip_address"></a> [collector\_ip\_address](#output\_collector\_ip\_address) | The IP address for the Pipeline Collector |
 | <a name="output_postgres_db_ip_address"></a> [postgres\_db\_ip\_address](#output\_postgres\_db\_ip\_address) | The IP address of the database where your data is being streamed |
-| <a name="output_postgres_db_port"></a> [postgres\_db\_port](#output\_postgres\_db\_port) | The port of the database where your data is being streamed |
+| <a name="output_postgres_db_port"></a> [postgres\_db\_port](#output\_postgres\_db\_port) | The port of the database where your data is being streamed |