From 38661f8f07f9bc9dd0b557374ebe4b4803b64c08 Mon Sep 17 00:00:00 2001 From: "Conor.McManus" Date: Fri, 7 Jun 2019 10:17:17 +0200 Subject: [PATCH 1/2] Add emoji --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26f7fab..68e8663 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![CircleCI](https://circleci.com/gh/Spengreb/atmos.svg?style=svg)](https://circleci.com/gh/Spengreb/atmos) [![Build Status](https://cloud.drone.io/api/badges/Spengreb/atmos/status.svg)](https://cloud.drone.io/Spengreb/atmos) -# Terraform Atmosphere +# Terraform Atmosphere :earth_africa: Atmos is a thin wrapper for managing Terraform Workspaces easily. Using the workspace name it will select the correct .tfvar file, defaulting to a qa var file for any other workspace. This is primarily for pipelines but works just as well from the command line. It can process all terraform commands and parameters passing them on directly. Atmos will automatically switch workspaces per git branches if it discovers its in a git repository # Quick Start From f12fd7b2f33925d1266703a2cf6d626cd59be47e Mon Sep 17 00:00:00 2001 From: conor Date: Tue, 11 Jun 2019 13:11:50 +0200 Subject: [PATCH 2/2] Master branch will try to get default.tfvars --- atmos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos.py b/atmos.py index 82b101f..dc75837 100755 --- a/atmos.py +++ b/atmos.py @@ -23,7 +23,7 @@ def determine_actions(args, params): for param in params: # Pass terraform params directly through cmd = cmd + ' ' + param - if (args.command in env_actions) and (workspace != "default"): # Append with env context + if (args.command in env_actions): # Append with env context cmd = cmd + ' -var-file=vars/{env}.tfvars -var "workspace={env}"'.format(env=workspace) if (args.e):