Change default workspace to default instead of qa
This commit is contained in:
parent
58785c2c46
commit
a7e03157b3
1 changed files with 6 additions and 4 deletions
10
atmos.py
10
atmos.py
|
|
@ -57,7 +57,7 @@ def workspace_manager():
|
||||||
branch = "default"
|
branch = "default"
|
||||||
else:
|
else:
|
||||||
if branch not in get_valid_envs():
|
if branch not in get_valid_envs():
|
||||||
branch = "qa"
|
branch = "default"
|
||||||
|
|
||||||
if get_env() != branch:
|
if get_env() != branch:
|
||||||
print("[INFO]: Terraform workspace & git branch have diverged. Changing workspace to git branch...")
|
print("[INFO]: Terraform workspace & git branch have diverged. Changing workspace to git branch...")
|
||||||
|
|
@ -100,20 +100,22 @@ def generate_creds(args):
|
||||||
|
|
||||||
def get_valid_envs():
|
def get_valid_envs():
|
||||||
try:
|
try:
|
||||||
# Use var files when present, otherwise default to qa
|
# Use var files when present, otherwise default to default
|
||||||
return [os.path.splitext(os.path.basename(x))[0] for x in glob.glob("vars/*.tfvars")]
|
return [os.path.splitext(os.path.basename(x))[0] for x in glob.glob("vars/*.tfvars")]
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def get_env():
|
def get_env():
|
||||||
try:
|
try:
|
||||||
tf_env = open('.terraform/environment', 'r').read()
|
tf_env = ""
|
||||||
|
with open('.terraform/environment', 'r') as f:
|
||||||
|
tf_env = f.readline()
|
||||||
except:
|
except:
|
||||||
return("default")
|
return("default")
|
||||||
if str(tf_env) in get_valid_envs():
|
if str(tf_env) in get_valid_envs():
|
||||||
return(tf_env)
|
return(tf_env)
|
||||||
else:
|
else:
|
||||||
return("qa")
|
return("default")
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main(sys.argv)
|
main(sys.argv)
|
||||||
Loading…
Add table
Reference in a new issue