DEV-14279 Fix up example.

Author: daniosim

examples/minimal/README.md

@@ -11,11 +11,10 @@ No provider.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| identifier\_prefix | Identifier prefix for the resources | `string` | n/a | yes |
-| parameter\_group\_name | Name of the parameter group | `string` | n/a | yes |
-| pg\_password | Password for postgres | `string` | n/a | yes |
-| pg\_username | Username for postgres | `string` | n/a | yes |
-| postgres\_db\_name | Name of the postgres db | `string` | n/a | yes |
+| spark\_service\_access\_sg\_ids | List of Spark service access security group IDs to allow ingress from | `list(string)` | n/a | yes |
+| subnet\_ids | List of at least 2 subnets in different AZs for DB subnet group | `list(string)` | n/a | yes |
+| tamr\_vm\_sg\_id | Security group ID of Tamr VM to allow ingress from | `string` | n/a | yes |
+| vpc\_id | VPC ID of network. | `string` | n/a | yes |
 
 ## Outputs
 

examples/minimal/local.tfvars

@@ -1 +1,4 @@
-postgres_db_name = "example_postgres_db"
+vpc_id                      = "vpc-example"
+subnet_ids                  = ["subnet-az1", "subnet-az2"]
+spark_service_access_sg_ids = ["example-spark-service-access-sg"]
+tamr_vm_sg_id               = "example-tamr-vm-sg"

examples/minimal/main.tf

@@ -1,15 +1,18 @@
 module "rds_postgres" {
-  source               = "git::https://github.com/Datatamer/terraform-aws-rds-postgres.git?ref=0.3.0"
-  postgres_name        = "example_rds_postgres"
+  # source               = "git::https://github.com/Datatamer/terraform-aws-rds-postgres.git?ref=0.3.0"
+  source = "../.."
+
+  identifier_prefix    = "example-rds-pg-"
+  postgres_name        = "example0"
   parameter_group_name = "example-rds-postgres-pg"
-  identifier_prefix    = "example-rds-"
+  username             = "example-tamr-master"
+  password             = "foo" #tfsec:ignore:GEN003
 
-  username = "exampleUsername"
-  password = "examplePassword"
+  vpc_id            = var.vpc_id
+  subnet_group_name = "example_subnet_group"
+  # Network requirement: DB subnet group needs a subnet in at least two Availability Zones
+  rds_subnet_ids = var.subnet_ids
 
-  subnet_group_name    = "example_subnet"
-  rds_subnet_ids       = ["example-subnet-1", "example-subnet-2"]
-  spark_cluster_sg_ids = ["sg-examplesecuritygroup1", "sg-examplesecuritygroup2"]
-  tamr_vm_sg_id        = "sg-exampletamrsecuritygroup"
-  vpc_id               = "vpc-examplevpcnetworkid"
+  spark_cluster_sg_ids = var.spark_service_access_sg_ids
+  tamr_vm_sg_id        = var.tamr_vm_sg_id
 }

examples/minimal/variables.tf

@@ -1,24 +1,19 @@
-variable "postgres_db_name" {
+variable "vpc_id" {
   type        = string
-  description = "Name of the postgres db"
+  description = "VPC ID of network."
 }
 
-variable "parameter_group_name" {
-  type        = string
-  description = "Name of the parameter group"
+variable "subnet_ids" {
+  type        = list(string)
+  description = "List of at least 2 subnets in different AZs for DB subnet group"
 }
 
-variable "identifier_prefix" {
-  type        = string
-  description = "Identifier prefix for the resources"
-}
-
-variable "pg_username" {
-  type        = string
-  description = "Username for postgres"
+variable "spark_service_access_sg_ids" {
+  type        = list(string)
+  description = "List of Spark service access security group IDs to allow ingress from"
 }
 
-variable "pg_password" {
+variable "tamr_vm_sg_id" {
   type        = string
-  description = "Password for postgres"
+  description = "Security group ID of Tamr VM to allow ingress from"
 }