Reduce to single doppler run command

DopplerUniversity · Oct 7, 2020 · dfd3593 · dfd3593
1 parent f7832b2
commit dfd3593
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/aws-ec2-deploy.yml b/.github/workflows/aws-ec2-deploy.yml
@@ -15,15 +15,15 @@ jobs:
               env:
                   DOPPLER_TOKEN: ${{ secrets.DOPPLER_TOKEN }}
               run: |
-                  doppler run -- terraform init --upgrade -input=false
-                  doppler run -- sh -c 'echo vpc_id = \"$VPC_ID\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo subnet_id = \"$SUBNET_ID\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo region = \"$REGION\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo key_name = \"$KEY_NAME\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo cloudflare_email = \"$CLOUDFLARE_EMAIL\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo cloudflare_api_key = \"$CLOUDFLARE_API_KEY\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo cloudflare_zone_id = \"$CLOUDFLARE_ZONE_ID\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo doppler_service_token = \"$DOPPLER_AWS_APP_SERVICE_TOKEN\"' >> terraform.tfvars
+                  doppler run --command 'terraform init --upgrade -input=false && \
+                    echo vpc_id = \"${VPC_ID}\" >> terraform.tfvars && \
+                    echo subnet_id = \"${SUBNET_ID}\" >> terraform.tfvars && \
+                    echo region = \"${REGION}\" >> terraform.tfvars && \
+                    echo key_name = \"${KEY_NAME}\" >> terraform.tfvars && \
+                    echo cloudflare_email = \"${CLOUDFLARE_EMAIL}\" >> terraform.tfvars && \
+                    echo cloudflare_api_key = \"${CLOUDFLARE_API_KEY}\" >> terraform.tfvars && \
+                    echo cloudflare_zone_id = \"${CLOUDFLARE_ZONE_ID}\" >> terraform.tfvars && \
+                    echo doppler_service_token = \"${DOPPLER_AWS_APP_SERVICE_TOKEN}\" >> terraform.tfvars'
 
             - name: Terraform validation
               working-directory: ./aws/ec2

diff --git a/.github/workflows/aws-ec2-destroy.yml b/.github/workflows/aws-ec2-destroy.yml
@@ -15,13 +15,12 @@ jobs:
               env:
                   DOPPLER_TOKEN: ${{ secrets.DOPPLER_TOKEN }}
               run: |
-                  doppler run -- terraform init --upgrade -input=false
-                  doppler run -- sh -c 'echo vpc_id = \"$VPC_ID\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo subnet_id = \"$SUBNET_ID\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo region = \"$REGION\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo key_name = \"$KEY_NAME\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo cloudflare_email = \"$CLOUDFLARE_EMAIL\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo cloudflare_api_key = \"$CLOUDFLARE_API_KEY\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo cloudflare_zone_id = \"$CLOUDFLARE_ZONE_ID\"' >> terraform.tfvars
-                  doppler run -- sh -c 'echo doppler_service_token = \"$DOPPLER_AWS_APP_SERVICE_TOKEN\"' >> terraform.tfvars
-                  doppler run -- terraform destroy -force -var-file terraform.tfvars
+                  doppler run --command 'terraform init --upgrade -input=false && \
+                    echo vpc_id = \"${VPC_ID}\" >> terraform.tfvars && \
+                    echo subnet_id = \"${SUBNET_ID}\" >> terraform.tfvars && \
+                    echo region = \"${REGION}\" >> terraform.tfvars && \
+                    echo key_name = \"${KEY_NAME}\" >> terraform.tfvars && \
+                    echo cloudflare_email = \"${CLOUDFLARE_EMAIL}\" >> terraform.tfvars && \
+                    echo cloudflare_api_key = \"${CLOUDFLARE_API_KEY}\" >> terraform.tfvars && \
+                    echo cloudflare_zone_id = \"${CLOUDFLARE_ZONE_ID}\" >> terraform.tfvars && \
+                    echo doppler_service_token = \"${DOPPLER_AWS_APP_SERVICE_TOKEN}\" >> terraform.tfvars'