🔧 Added deploy config

d3b_cli_igor/utils/generate_tf.py

@@ -42,10 +42,10 @@ def generate(project, region, account, environment, template_name):
         print(file)
         template_path = file[file.find("templates"):len(file)]
         #Create folder structure
-        #template_path_structure=template_path[len("templates/"+template_name+"/"):]
+        template_path_structure=template_path[len("templates/"+template_name+"/"):]
         #if(not os.path.exists(os.path.dirname(template_path_structure))):
         #    print(os.path.dirname(template_path_structure))
-            #os.makedirs(os.path.dirname(template_path_structure))
+        #    os.makedirs(os.path.dirname(template_path_structure))
         template = templateEnv.get_template(template_path)
         output = template.render(project=project, region=region, account=account, environment=environment, state_files_bucket=d3b_cli_igor.common.get_account_info()[account]["state_files_bucket"], account_id=d3b_cli_igor.common.get_account_info()[account]["account_id"],azs=d3b_cli_igor.common.get_account_info()[account]["azs"])
         with(open(template_path[len("templates/"+template_name+"/"):len(template_path)], "w")) as f:

d3b_cli_igor/utils/templates/simple-tf/docker-compose.ci.yml

@@ -2,5 +2,5 @@ services:
   {{ project }}:
     image: {{ project }}:${GIT_COMMIT:-latest}
     build:
-        context: .
+        context: ../
         dockerfile: Dockerfile

d3b_cli_igor/utils/templates/simple-tf/scripts/cibuild

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-config_file=$(find . -name "config" | grep scripts)
+config_file=$(find . -name "app_config" | grep scripts)
 source $config_file
 
 if [[ -n "${ETL_DEBUG}" ]]; then

d3b_cli_igor/utils/templates/simple-tf/scripts/cipublish

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-config_file=$(find . -name "config" | grep scripts)
+config_file=$(find . -name "app_config" | grep scripts)
 source $config_file
 
 function usage() {

d3b_cli_igor/utils/templates/simple-tf/scripts/deploy_config

@@ -0,0 +1,6 @@
+project="{{ project }}"
+BUCKET="{{ account }}-{{ account_id }}-{{ region }}-{{ environment }}-secrets"
+ACCOUNT="{{ account }}"
+REGION="{{ region }}"
+ACCOUNT_ID="{{ account_id }}"
+ENVIRONMENT="{{ environment }}"

d3b_cli_igor/utils/templates/simple-tf/scripts/infra

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-config_file=$(find . -name "config" | grep scripts)
+config_file=$(find . -name "deploy_config" | grep scripts)
 source $config_file
 
 #Check for required variables

d3b_cli_igor/utils/templates/simple-tf/terraform/variables.tf

@@ -1,14 +1,18 @@
 #Variables goes here
 variable "environment" {
-    description="Environment name"
+    description = "Environment name"
     default="{{ environment }}"
 }
 
 variable "region" {
-    description="AWS Region"
+    description = "AWS Region"
     default="{{ region }}"
 }
 
 variable "image_tag" {
-    description="Docker Image Tag in ECR"
+    description = "Docker Image Tag in ECR"
+}
+
+variable "project" {
+    description = "{{ project }}"
 }