Fix cookiecutter Pact and Vault flags (#209)

Author: filippo-20tab

bootstrap/runner.py

@@ -505,8 +505,8 @@ def init_service(self):
                 "terraform_backend": self.terraform_backend,
                 "terraform_cloud_organization": self.terraform_cloud_organization,
                 "tfvars": self.tfvars,
-                "use_pact": bool(self.pact_broker_url),
-                "use_vault": bool(self.vault_url),
+                "use_pact": self.pact_broker_url and "true" or "false",
+                "use_vault": self.vault_url and "true" or "false",
             },
             output_dir=self.output_dir,
             no_input=True,

cookiecutter.json

@@ -12,8 +12,8 @@
   "terraform_backend": "gitlab",
   "terraform_cloud_organization": "",
   "media_storage": ["digitalocean-s3", "aws-s3", "local", "none"],
-  "use_pact": false,
-  "use_vault": false,
+  "use_pact": "false",
+  "use_vault": "false",
   "stacks": {
     "main": {
       "dev": {

{{cookiecutter.project_dirname}}/.env_template

@@ -19,7 +19,7 @@ PYTHONBREAKPOINT=IPython.core.debugger.set_trace
 # PROJECT_URL=https://localhost:8443
 # INTERNAL_BACKEND_URL=http://{{ cookiecutter.backend_service_slug }}:{{ cookiecutter.backend_service_port }}
 # REACT_ENVIRONMENT=Development
-{% endif %}{% if cookiecutter.use_pact %}# pact
+{% endif %}{% if cookiecutter.use_pact == "true" %}# pact
 PACT_BROKER_URL=https://user:password@broker.pact.com
 PACT_PROVIDER_NAME={{ cookiecutter.project_slug }}-{{ cookiecutter.backend_service_slug }}
 {% endif %}# {{ cookiecutter.service_slug }}

{{cookiecutter.project_dirname}}/.gitlab-ci.yml

@@ -29,15 +29,15 @@ services:
       -w ${PWD}{% if cookiecutter.terraform_backend == "gitlab" %}
       -e CI_API_V4_URL
       -e CI_COMMIT_SHA
-      -e CI_JOB_ID{% if cookiecutter.use_vault %}
+      -e CI_JOB_ID{% if cookiecutter.use_vault == "true" %}
       -e CI_JOB_JWT_V2{% endif %}
       -e CI_JOB_STAGE
       -e CI_JOB_TOKEN
       -e CI_PROJECT_ID
       -e CI_PROJECT_NAME
       -e CI_PROJECT_NAMESPACE
       -e CI_PROJECT_PATH
-      -e CI_PROJECT_URL{% elif cookiecutter.use_vault %}
+      -e CI_PROJECT_URL{% elif cookiecutter.use_vault == "true" %}
       -e CI_JOB_JWT_V2{% endif %}
       -e ENV_SLUG
       -e PROJECT_DIR=${CI_PROJECT_DIR}
@@ -47,7 +47,7 @@ services:
       -e TERRAFORM_EXTRA_VAR_FILE
       -e TERRAFORM_VARS_DIR
       -e TF_ROOT{% if cookiecutter.terraform_backend == "gitlab" %}
-      -e TF_STATE_NAME{% endif %}{% if not cookiecutter.use_vault %}{% if cookiecutter.deployment_type == "digitalocean-k8s" %}
+      -e TF_STATE_NAME{% endif %}{% if cookiecutter.use_vault == "false" %}{% if cookiecutter.deployment_type == "digitalocean-k8s" %}
       -e TF_VAR_digitalocean_token="${DIGITALOCEAN_TOKEN}"{% elif cookiecutter.deployment_type == "other-k8s" %}
       -e TF_VAR_kubernetes_cluster_ca_certificate="${KUBERNETES_CLUSTER_CA_CERTIFICATE}"
       -e TF_VAR_kubernetes_host="${KUBERNETES_HOST}"
@@ -64,8 +64,8 @@ services:
       -e TF_VAR_registry_username="${REGISTRY_USERNAME}"
       -e TF_VAR_tls_certificate_crt="${TLS_CERTIFICATE_CRT}"
       -e TF_VAR_tls_certificate_key="${TLS_CERTIFICATE_KEY}"{% endif %}{% if cookiecutter.terraform_backend != "gitlab" %}
-      -e TF_WORKSPACE{% endif %}{% if cookiecutter.terraform_backend == "terraform-cloud" and not cookiecutter.use_vault %}
-      -e TFC_TOKEN{% endif %}{% if cookiecutter.use_vault %}
+      -e TF_WORKSPACE{% endif %}{% if cookiecutter.terraform_backend == "terraform-cloud" and cookiecutter.use_vault == "false" %}
+      -e TFC_TOKEN{% endif %}{% if cookiecutter.use_vault == "true" %}
       -e VAULT_ADDR
       -e VAULT_ENV_SECRETS
       -e VAULT_STACK_SECRETS
@@ -107,7 +107,7 @@ services:
 .base_stage:
   stage: Base
   variables:
-    TERRAFORM_VARS_DIR: ${CI_PROJECT_DIR}/terraform/base/vars{% if cookiecutter.use_vault %}
+    TERRAFORM_VARS_DIR: ${CI_PROJECT_DIR}/terraform/base/vars{% if cookiecutter.use_vault == "true" %}
     VAULT_STACK_SECRETS: "digitalocean s3"{% endif %}{% for stack_slug in cookiecutter.stacks %}
 
 # {{ stack_slug|title }} Stack (Base Stage) #
@@ -126,7 +126,7 @@ services:
     paths:
       - ${TF_ROOT}/.terraform
   environment:
-    name: Stack_{{ stack_slug|title }}/Stage_Base
+    name: stack-{{ stack_slug }}/base
   rules:
     - if: $ENABLED_ALL == "true"
       when: always
@@ -162,7 +162,7 @@ stack_{{ stack_slug }}_base_apply:
 .cluster_stage:
   stage: Cluster
   variables:
-    TERRAFORM_VARS_DIR: ${CI_PROJECT_DIR}/terraform/cluster/vars{% if cookiecutter.use_vault %}
+    TERRAFORM_VARS_DIR: ${CI_PROJECT_DIR}/terraform/cluster/vars{% if cookiecutter.use_vault == "true" %}
     VAULT_STACK_SECRETS: "digitalocean k8s"{% endif %}{% for stack_slug, stack_envs in cookiecutter.stacks.items() %}
 
 # {{ stack_slug|title }} Stack (Cluster Stage) #
@@ -181,7 +181,7 @@ stack_{{ stack_slug }}_base_apply:
     paths:
       - ${TF_ROOT}/.terraform
   environment:
-    name: Stack_{{ stack_slug|title }}/Stage_Cluster
+    name: stack-{{ stack_slug }}/cluster
   rules:
     - if: $ENABLED_ALL == "true"
       when: always
@@ -221,7 +221,7 @@ stack_{{ stack_slug }}_cluster_apply:
   stage: Environment
   variables:
     TERRAFORM_VARS_DIR: ${CI_PROJECT_DIR}/terraform/environment/vars
-    TF_ROOT: ${CI_PROJECT_DIR}/terraform/environment/{{ cookiecutter.deployment_type }}{% if cookiecutter.use_vault %}
+    TF_ROOT: ${CI_PROJECT_DIR}/terraform/environment/{{ cookiecutter.deployment_type }}{% if cookiecutter.use_vault == "true" %}
     VAULT_ENV_SECRETS: "basic_auth regcred tls"
     VAULT_STACK_SECRETS: "digitalocean k8s monitoring s3"{% endif %}{% for stack_slug, stack_envs in cookiecutter.stacks.items() %}
 
@@ -243,7 +243,7 @@ stack_{{ stack_slug }}_cluster_apply:
     paths:
       - ${TF_ROOT}/.terraform
   environment:
-    name: Stack_{{ stack_slug|title }}/Stage_Environment/Env_{{ env_conf.name }}
+    name: stack-{{ stack_slug }}/env-{{ env_slug }}
     url: {{ env_conf.url }}
   rules:
     - if: $ENABLED_ALL == "true"

{{cookiecutter.project_dirname}}/docker-compose.yaml

@@ -24,7 +24,7 @@ services:
       - DJANGO_SUPERUSER_EMAIL
       - DJANGO_SUPERUSER_PASSWORD
       - DJANGO_SUPERUSER_USERNAME
-      - EMAIL_URL{% if cookiecutter.use_pact %}
+      - EMAIL_URL{% if cookiecutter.use_pact == "true" %}
       - PACT_BROKER_URL
       - PACT_PROVIDER_NAME{% endif %}
       - PYTHONBREAKPOINT