Skip to content

Commit

Permalink
Update GCP quickstart to SLULA (closes #90)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbeemster committed Feb 1, 2024
1 parent b28c659 commit ca45331
Show file tree
Hide file tree
Showing 20 changed files with 108 additions and 24 deletions.
3 changes: 2 additions & 1 deletion terraform/gcp/iglu_server/default/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ No providers.
|------|--------|---------|
| <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 |
| <a name="module_iglu_server"></a> [iglu\_server](#module\_iglu\_server) | snowplow-devops/iglu-server-ce/google | 0.5.0 |

## Resources

Expand All @@ -36,6 +36,7 @@ No resources.
| <a name="input_region"></a> [region](#input\_region) | The name of the region to deploy within | `string` | n/a | yes |
| <a name="input_ssh_ip_allowlist"></a> [ssh\_ip\_allowlist](#input\_ssh\_ip\_allowlist) | The list of CIDR ranges to allow SSH traffic from | `list(any)` | n/a | yes |
| <a name="input_subnetwork"></a> [subnetwork](#input\_subnetwork) | The name of the sub-network to deploy within | `string` | n/a | yes |
| <a name="input_accept_limited_use_license"></a> [accept\_limited\_use\_license](#input\_accept\_limited\_use\_license) | Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/) | `bool` | `false` | no |
| <a name="input_labels"></a> [labels](#input\_labels) | The labels to append to the resources in this module | `map(string)` | `{}` | no |
| <a name="input_ssh_key_pairs"></a> [ssh\_key\_pairs](#input\_ssh\_key\_pairs) | The list of SSH key-pairs to add to the servers | <pre>list(object({<br> user_name = string<br> public_key = string<br> }))</pre> | `[]` | no |
| <a name="input_ssl_information"></a> [ssl\_information](#input\_ssl\_information) | The ID of an Google Managed certificate to bind to the load balancer | <pre>object({<br> enabled = bool<br> certificate_id = string<br> })</pre> | <pre>{<br> "certificate_id": "",<br> "enabled": false<br>}</pre> | no |
Expand Down
4 changes: 3 additions & 1 deletion terraform/gcp/iglu_server/default/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ module "iglu_db" {

module "iglu_server" {
source = "snowplow-devops/iglu-server-ce/google"
version = "0.4.0"
version = "0.5.0"

accept_limited_use_license = var.accept_limited_use_license

name = "${var.prefix}-iglu-server"

Expand Down
3 changes: 3 additions & 0 deletions terraform/gcp/iglu_server/default/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Please accept the terms of the Snowplow Limited Use License Agreement to proceed. (https://docs.snowplow.io/limited-use-license-1.0/)
accept_limited_use_license = false

# Will be prefixed to all resource names
# Use this to easily identify the resources created and provide entropy for subsequent environments
prefix = "sp"
Expand Down
11 changes: 11 additions & 0 deletions terraform/gcp/iglu_server/default/variables.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
variable "accept_limited_use_license" {
description = "Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/)"
type = bool
default = false

validation {
condition = var.accept_limited_use_license
error_message = "Please accept the terms of the Snowplow Limited Use License Agreement to proceed."
}
}

variable "prefix" {
description = "Will be prefixed to all resource names. Use to easily identify the resources created"
type = string
Expand Down
3 changes: 2 additions & 1 deletion terraform/gcp/iglu_server/secure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ No providers.
|------|--------|---------|
| <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 |
| <a name="module_iglu_server"></a> [iglu\_server](#module\_iglu\_server) | snowplow-devops/iglu-server-ce/google | 0.5.0 |

## Resources

Expand All @@ -36,6 +36,7 @@ No resources.
| <a name="input_region"></a> [region](#input\_region) | The name of the region to deploy within | `string` | n/a | yes |
| <a name="input_ssh_ip_allowlist"></a> [ssh\_ip\_allowlist](#input\_ssh\_ip\_allowlist) | The list of CIDR ranges to allow SSH traffic from | `list(any)` | n/a | yes |
| <a name="input_subnetwork"></a> [subnetwork](#input\_subnetwork) | The name of the sub-network to deploy within | `string` | n/a | yes |
| <a name="input_accept_limited_use_license"></a> [accept\_limited\_use\_license](#input\_accept\_limited\_use\_license) | Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/) | `bool` | `false` | no |
| <a name="input_labels"></a> [labels](#input\_labels) | The labels to append to the resources in this module | `map(string)` | `{}` | no |
| <a name="input_ssh_key_pairs"></a> [ssh\_key\_pairs](#input\_ssh\_key\_pairs) | The list of SSH key-pairs to add to the servers | <pre>list(object({<br> user_name = string<br> public_key = string<br> }))</pre> | `[]` | no |
| <a name="input_ssl_information"></a> [ssl\_information](#input\_ssl\_information) | The ID of an Google Managed certificate to bind to the load balancer | <pre>object({<br> enabled = bool<br> certificate_id = string<br> })</pre> | <pre>{<br> "certificate_id": "",<br> "enabled": false<br>}</pre> | no |
Expand Down
4 changes: 3 additions & 1 deletion terraform/gcp/iglu_server/secure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ module "iglu_db" {

module "iglu_server" {
source = "snowplow-devops/iglu-server-ce/google"
version = "0.4.0"
version = "0.5.0"

accept_limited_use_license = var.accept_limited_use_license

name = "${var.prefix}-iglu-server"

Expand Down
3 changes: 3 additions & 0 deletions terraform/gcp/iglu_server/secure/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Please accept the terms of the Snowplow Limited Use License Agreement to proceed. (https://docs.snowplow.io/limited-use-license-1.0/)
accept_limited_use_license = false

# Will be prefixed to all resource names
# Use this to easily identify the resources created and provide entropy for subsequent environments
prefix = "sp"
Expand Down
11 changes: 11 additions & 0 deletions terraform/gcp/iglu_server/secure/variables.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
variable "accept_limited_use_license" {
description = "Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/)"
type = bool
default = false

validation {
condition = var.accept_limited_use_license
error_message = "Please accept the terms of the Snowplow Limited Use License Agreement to proceed."
}
}

variable "prefix" {
description = "Will be prefixed to all resource names. Use to easily identify the resources created"
type = string
Expand Down
11 changes: 6 additions & 5 deletions terraform/gcp/pipeline/default/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
| Name | Source | Version |
|------|--------|---------|
| <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_bigquery_loader"></a> [bigquery\_loader](#module\_bigquery\_loader) | snowplow-devops/bigquery-loader-pubsub-ce/google | 0.3.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_collector_pubsub"></a> [collector\_pubsub](#module\_collector\_pubsub) | snowplow-devops/collector-pubsub-ce/google | 0.5.0 |
| <a name="module_enrich_pubsub"></a> [enrich\_pubsub](#module\_enrich\_pubsub) | snowplow-devops/enrich-pubsub-ce/google | 0.3.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_postgres_loader_bad"></a> [postgres\_loader\_bad](#module\_postgres\_loader\_bad) | snowplow-devops/postgres-loader-pubsub-ce/google | 0.4.0 |
| <a name="module_postgres_loader_enriched"></a> [postgres\_loader\_enriched](#module\_postgres\_loader\_enriched) | snowplow-devops/postgres-loader-pubsub-ce/google | 0.4.0 |
| <a name="module_raw_topic"></a> [raw\_topic](#module\_raw\_topic) | snowplow-devops/pubsub-topic/google | 0.3.0 |

## Resources
Expand All @@ -50,6 +50,7 @@
| <a name="input_region"></a> [region](#input\_region) | The name of the region to deploy within | `string` | n/a | yes |
| <a name="input_ssh_ip_allowlist"></a> [ssh\_ip\_allowlist](#input\_ssh\_ip\_allowlist) | The list of CIDR ranges to allow SSH traffic from | `list(any)` | n/a | yes |
| <a name="input_subnetwork"></a> [subnetwork](#input\_subnetwork) | The name of the sub-network to deploy within | `string` | n/a | yes |
| <a name="input_accept_limited_use_license"></a> [accept\_limited\_use\_license](#input\_accept\_limited\_use\_license) | Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/) | `bool` | `false` | no |
| <a name="input_bigquery_db_enabled"></a> [bigquery\_db\_enabled](#input\_bigquery\_db\_enabled) | Whether to enable loading into a BigQuery Dataset | `bool` | `false` | no |
| <a name="input_bigquery_loader_dead_letter_bucket_deploy"></a> [bigquery\_loader\_dead\_letter\_bucket\_deploy](#input\_bigquery\_loader\_dead\_letter\_bucket\_deploy) | Whether this module should create a new bucket with the specified name - if the bucket already exists set this to false | `bool` | `true` | no |
| <a name="input_bigquery_loader_dead_letter_bucket_name"></a> [bigquery\_loader\_dead\_letter\_bucket\_name](#input\_bigquery\_loader\_dead\_letter\_bucket\_name) | The name of the GCS bucket to use for dead-letter output of loader | `string` | `""` | no |
Expand Down
8 changes: 6 additions & 2 deletions terraform/gcp/pipeline/default/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ module "enriched_topic" {
# 2. Deploy Collector stack
module "collector_pubsub" {
source = "snowplow-devops/collector-pubsub-ce/google"
version = "0.4.0"
version = "0.5.0"

accept_limited_use_license = var.accept_limited_use_license

name = "${var.prefix}-collector"

Expand Down Expand Up @@ -86,7 +88,9 @@ module "collector_lb" {
# 3. Deploy Enrichment
module "enrich_pubsub" {
source = "snowplow-devops/enrich-pubsub-ce/google"
version = "0.2.0"
version = "0.3.0"

accept_limited_use_license = var.accept_limited_use_license

name = "${var.prefix}-enrich"

Expand Down
4 changes: 3 additions & 1 deletion terraform/gcp/pipeline/default/target_bigquery.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ locals {

module "bigquery_loader" {
source = "snowplow-devops/bigquery-loader-pubsub-ce/google"
version = "0.2.0"
version = "0.3.0"

accept_limited_use_license = var.accept_limited_use_license

count = var.bigquery_db_enabled ? 1 : 0

Expand Down
8 changes: 6 additions & 2 deletions terraform/gcp/pipeline/default/target_postgres.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ module "postgres_db" {

module "postgres_loader_enriched" {
source = "snowplow-devops/postgres-loader-pubsub-ce/google"
version = "0.3.0"
version = "0.4.0"

accept_limited_use_license = var.accept_limited_use_license

count = var.postgres_db_enabled ? 1 : 0

Expand Down Expand Up @@ -55,7 +57,9 @@ module "postgres_loader_enriched" {

module "postgres_loader_bad" {
source = "snowplow-devops/postgres-loader-pubsub-ce/google"
version = "0.3.0"
version = "0.4.0"

accept_limited_use_license = var.accept_limited_use_license

count = var.postgres_db_enabled ? 1 : 0

Expand Down
3 changes: 3 additions & 0 deletions terraform/gcp/pipeline/default/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Please accept the terms of the Snowplow Limited Use License Agreement to proceed. (https://docs.snowplow.io/limited-use-license-1.0/)
accept_limited_use_license = false

# Will be prefixed to all resource names
# Use this to easily identify the resources created and provide entropy for subsequent environments
prefix = "sp"
Expand Down
11 changes: 11 additions & 0 deletions terraform/gcp/pipeline/default/variables.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
variable "accept_limited_use_license" {
description = "Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/)"
type = bool
default = false

validation {
condition = var.accept_limited_use_license
error_message = "Please accept the terms of the Snowplow Limited Use License Agreement to proceed."
}
}

variable "prefix" {
description = "Will be prefixed to all resource names. Use to easily identify the resources created"
type = string
Expand Down
11 changes: 6 additions & 5 deletions terraform/gcp/pipeline/secure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
| Name | Source | Version |
|------|--------|---------|
| <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_bigquery_loader"></a> [bigquery\_loader](#module\_bigquery\_loader) | snowplow-devops/bigquery-loader-pubsub-ce/google | 0.3.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_collector_pubsub"></a> [collector\_pubsub](#module\_collector\_pubsub) | snowplow-devops/collector-pubsub-ce/google | 0.5.0 |
| <a name="module_enrich_pubsub"></a> [enrich\_pubsub](#module\_enrich\_pubsub) | snowplow-devops/enrich-pubsub-ce/google | 0.3.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_postgres_loader_bad"></a> [postgres\_loader\_bad](#module\_postgres\_loader\_bad) | snowplow-devops/postgres-loader-pubsub-ce/google | 0.4.0 |
| <a name="module_postgres_loader_enriched"></a> [postgres\_loader\_enriched](#module\_postgres\_loader\_enriched) | snowplow-devops/postgres-loader-pubsub-ce/google | 0.4.0 |
| <a name="module_raw_topic"></a> [raw\_topic](#module\_raw\_topic) | snowplow-devops/pubsub-topic/google | 0.3.0 |

## Resources
Expand All @@ -50,6 +50,7 @@
| <a name="input_region"></a> [region](#input\_region) | The name of the region to deploy within | `string` | n/a | yes |
| <a name="input_ssh_ip_allowlist"></a> [ssh\_ip\_allowlist](#input\_ssh\_ip\_allowlist) | The list of CIDR ranges to allow SSH traffic from | `list(any)` | n/a | yes |
| <a name="input_subnetwork"></a> [subnetwork](#input\_subnetwork) | The name of the sub-network to deploy within | `string` | n/a | yes |
| <a name="input_accept_limited_use_license"></a> [accept\_limited\_use\_license](#input\_accept\_limited\_use\_license) | Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/) | `bool` | `false` | no |
| <a name="input_bigquery_db_enabled"></a> [bigquery\_db\_enabled](#input\_bigquery\_db\_enabled) | Whether to enable loading into a BigQuery Dataset | `bool` | `false` | no |
| <a name="input_bigquery_loader_dead_letter_bucket_deploy"></a> [bigquery\_loader\_dead\_letter\_bucket\_deploy](#input\_bigquery\_loader\_dead\_letter\_bucket\_deploy) | Whether this module should create a new bucket with the specified name - if the bucket already exists set this to false | `bool` | `true` | no |
| <a name="input_bigquery_loader_dead_letter_bucket_name"></a> [bigquery\_loader\_dead\_letter\_bucket\_name](#input\_bigquery\_loader\_dead\_letter\_bucket\_name) | The name of the GCS bucket to use for dead-letter output of loader | `string` | `""` | no |
Expand Down
8 changes: 6 additions & 2 deletions terraform/gcp/pipeline/secure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ module "enriched_topic" {
# 2. Deploy Collector stack
module "collector_pubsub" {
source = "snowplow-devops/collector-pubsub-ce/google"
version = "0.4.0"
version = "0.5.0"

accept_limited_use_license = var.accept_limited_use_license

name = "${var.prefix}-collector"

Expand Down Expand Up @@ -88,7 +90,9 @@ module "collector_lb" {
# 3. Deploy Enrichment
module "enrich_pubsub" {
source = "snowplow-devops/enrich-pubsub-ce/google"
version = "0.2.0"
version = "0.3.0"

accept_limited_use_license = var.accept_limited_use_license

name = "${var.prefix}-enrich"

Expand Down
4 changes: 3 additions & 1 deletion terraform/gcp/pipeline/secure/target_bigquery.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ locals {

module "bigquery_loader" {
source = "snowplow-devops/bigquery-loader-pubsub-ce/google"
version = "0.2.0"
version = "0.3.0"

accept_limited_use_license = var.accept_limited_use_license

count = var.bigquery_db_enabled ? 1 : 0

Expand Down
8 changes: 6 additions & 2 deletions terraform/gcp/pipeline/secure/target_postgres.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ module "postgres_db" {

module "postgres_loader_enriched" {
source = "snowplow-devops/postgres-loader-pubsub-ce/google"
version = "0.3.0"
version = "0.4.0"

accept_limited_use_license = var.accept_limited_use_license

count = var.postgres_db_enabled ? 1 : 0

Expand Down Expand Up @@ -57,7 +59,9 @@ module "postgres_loader_enriched" {

module "postgres_loader_bad" {
source = "snowplow-devops/postgres-loader-pubsub-ce/google"
version = "0.3.0"
version = "0.4.0"

accept_limited_use_license = var.accept_limited_use_license

count = var.postgres_db_enabled ? 1 : 0

Expand Down
3 changes: 3 additions & 0 deletions terraform/gcp/pipeline/secure/terraform.tfvars
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Please accept the terms of the Snowplow Limited Use License Agreement to proceed. (https://docs.snowplow.io/limited-use-license-1.0/)
accept_limited_use_license = false

# Will be prefixed to all resource names
# Use this to easily identify the resources created and provide entropy for subsequent environments
prefix = "sp"
Expand Down
11 changes: 11 additions & 0 deletions terraform/gcp/pipeline/secure/variables.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
variable "accept_limited_use_license" {
description = "Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/)"
type = bool
default = false

validation {
condition = var.accept_limited_use_license
error_message = "Please accept the terms of the Snowplow Limited Use License Agreement to proceed."
}
}

variable "prefix" {
description = "Will be prefixed to all resource names. Use to easily identify the resources created"
type = string
Expand Down

0 comments on commit ca45331

Please sign in to comment.