Merge pull request #13 from commitdev/default-subdomain

default subdomain values for zero-module.yml

Author: davidcheung

templates/.circleci/config.yml

@@ -213,7 +213,7 @@ workflows:
             config: staging
             requires:
               - build_staging
-            bucket: "<% index .Params `stagingFrontendHost` %>"
+            bucket: "<% index .Params `stagingFrontendSubdomain` %><% index .Params `stagingHostRoot` %>"
             region: "<% index .Params `region` %>"
             # Depending on your development flow you may want to also only deploy to staging on master.
             # filters:
@@ -226,7 +226,7 @@ workflows:
             requires:
               - unit_test
               - build_production
-            bucket: "<% index .Params `productionFrontendHost` %>"
+            bucket: "<% index .Params `productionFrontendSubdomain` %><% index .Params `productionHostRoot` %>"
             region: "<% index .Params `region` %>"
             filters:
               branches:

templates/src/config/production.json

@@ -1,5 +1,5 @@
 {
     "appName": "<% .Name %>",
     "environment": "production",
-    "backendURL": "https://<% index .Params `productionBackendHost` %>"
+    "backendURL": "https://<% index .Params `productionBackendSubdomain` %><% index .Params `productionHostRoot` %>"
 }

templates/src/config/staging.json

@@ -1,5 +1,5 @@
 {
     "appName": "<% .Name %>",
     "environment": "staging",
-    "backendURL": "https://<% index .Params `stagingBackendHost` %>"
+    "backendURL": "https://<% index .Params `stagingBackendSubdomain` %><% index .Params `stagingHostRoot` %>"
 }

zero-module.yml

@@ -23,11 +23,19 @@ parameters:
       - "us-west-2"
       - "us-east-1"
       - "us-east-2"
-  - field: productionFrontendHost
-    label: Production Frontend Host Name (e.g. app.mydomain.com)
-  - field: productionBackendHost
-    label: Production Backend Host Name (e.g. api.mydomain.com)
-  - field: stagingFrontendHost
-    label: Staging Frontend Host Name (e.g. app.mydomain-staging.com)
-  - field: stagingBackendHost
-    label: Staging Backend Host Name (e.g. api.mydomain-staging.com)
+  - field: productionHostRoot
+    label: Production Root Host Name (e.g. mydomain.com) - this must be the root of the chosen domain, not a subdomain.
+  - field: productionFrontendSubdomain
+    label: Production Frontend Host Name (e.g. app.)
+    default: app.
+  - field: productionBackendSubdomain
+    label: Production Backend Host Name (e.g. api.)
+    default: api.
+  - field: stagingHostRoot
+    label: Staging Root Host Name (e.g. mydomain-staging.com) - this must be the root of the chosen domain, not a subdomain.
+  - field: stagingFrontendSubdomain
+    label: Staging Frontend Host Name (e.g. app.)
+    default: app.
+  - field: stagingBackendSubdomain
+    label: Staging Backend Host Name (e.g. api.)
+    default: api.