Merge pull request #27 from commitdev/change-param-names

Change parameter names to fit new format from the doc we are working …

Author: bmonkman

README.md

@@ -39,7 +39,7 @@ Then get the aws account id:
 aws sts get-caller-identity --query "Account"
 ```
 
-Then create a `config.yml` file and fill in the appropriate values:
+Then create a `zero.yml` file and fill in the appropriate values:
 
 ```yaml
 name: my-project
@@ -48,8 +48,13 @@ params:
   region: us-east-1
   accountId: <from above>
   kubeWorkerAMI: ami-<from above>
-  productionHost: domain.com
-  stagingHost: domain-staging.com
+  productionHostRoot: domain.com
+  productionFrontendHost: domain.com
+  productionBackendHost: api.domain.com
+  stagingHostRoot: domain-staging.com
+  stagingFrontendHost: domain-staging.com
+  stagingBackendHost: api.domain-staging.com
+
 ```
 
 And run `stack`:

commit0.module.yml

@@ -1,29 +1,3 @@
-name: basic-infrastructure
-description: ''
-author: ''
-icon: ''
-thumbnail: ''
-
-prompts:
-  - field: region
-    label: Select AWS Region
-    options:
-      - "us-west-1"
-      - "us-west-2"
-      - "us-east-1"
-      - "us-east-2"
-      - "ca-central-1"
-      - "eu-central-1"
-      - "eu-west-1"
-      - "ap-east-1"
-      - "ap-south-1"
-  - field: accountId
-    label: AWS Account ID
-  - field: productionHost
-    label: Production Root Host Name (e.g. mydomain.com)
-  - field: stagingHost
-    label: Staging Root Host Name (e.g. mydomain-staging.com)
-
 template:
   strictMode: true
   delimiters:

kubernetes/terraform/environments/development/main.tf

@@ -18,9 +18,9 @@ module "kubernetes" {
   # Authenticate with the EKS cluster via the cluster id
   cluster_name = "<% .Name %>-dev-<% index .Params `region` %>"
 
-  external_dns_zone = "<% index .Params `stagingHost` %>"
+  external_dns_zone = "<% index .Params `stagingHostRoot` %>"
   external_dns_owner_id = "<% GenerateUUID %>" # randomly generated ID
 
   # Registration email for LetsEncrypt
-  cert_manager_acme_registration_email = "devops@<% index .Params `stagingHost` %>"
+  cert_manager_acme_registration_email = "devops@<% index .Params `stagingHostRoot` %>"
 }

kubernetes/terraform/environments/production/main.tf

@@ -18,9 +18,9 @@ module "kubernetes" {
   # Authenticate with the EKS cluster via the cluster id
   cluster_name = "<% .Name %>-production-<% index .Params `region` %>"
 
-  external_dns_zone = "<% index .Params `productionHost` %>"
+  external_dns_zone = "<% index .Params `productionHostRoot` %>"
   external_dns_owner_id = "<% GenerateUUID %>" # randomly generated ID
 
   # Registration email for LetsEncrypt
-  cert_manager_acme_registration_email = "devops@<% index .Params `productionHost` %>"
+  cert_manager_acme_registration_email = "devops@<% index .Params `productionHostRoot` %>"
 }

kubernetes/terraform/environments/staging/main.tf

@@ -22,9 +22,9 @@ module "kubernetes" {
   # Authenticate with the EKS cluster via the cluster id
   cluster_name = "<% .Name %>-staging-<% index .Params `region` %>"
 
-  external_dns_zone = "<% index .Params `stagingHost` %>"
+  external_dns_zone = "<% index .Params `stagingHostRoot` %>"
   external_dns_owner_id = "<% GenerateUUID %>" # randomly generated ID
 
   # Registration email for LetsEncrypt
-  cert_manager_acme_registration_email = "devops@<% index .Params `stagingHost` %>"
+  cert_manager_acme_registration_email = "devops@<% index .Params `stagingHostRoot` %>"
 }

terraform/environments/production/main.tf

@@ -33,9 +33,9 @@ module "production" {
 
   # Hosting configuration
   s3_hosting_buckets = [
-    "assets.<% index .Params `productionHost` %>"
+    "<% index .Params `productionFrontendHost` %>"
   ]
-  domain_name = "<% index .Params `productionHost` %>"
+  domain_name = "<% index .Params `productionHostRoot` %>"
 
   # DB configuration
   db_instance_class = "db.t3.small"

terraform/environments/staging/main.tf

@@ -33,9 +33,9 @@ module "staging" {
 
   # Hosting configuration
   s3_hosting_buckets = [
-    "assets.<% index .Params `stagingHost` %>",
+    "<% index .Params `stagingFrontendHost` %>",
   ]
-  domain_name = "<% index .Params `stagingHost` %>"
+  domain_name = "<% index .Params `stagingHostRoot` %>"
 
   # DB configuration
   db_instance_class = "db.t3.small"