Skip to content

Commit

Permalink
Terraform cluster name fix: . breaks aws.py inventory script; move hy…
Browse files Browse the repository at this point in the history
…phen to front of []
  • Loading branch information
slfritchie authored and JONBRWN committed Apr 30, 2019
1 parent 53fedd9 commit 7b72705
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion orchestration/terraform/Makefile
Expand Up @@ -541,7 +541,7 @@ acquire-vpc-lock: check-cluster-name ## Acquire vpc lock in order to safely run

check-cluster-name: # check for valid cluster name
$(if $(cluster_name),,$(error 'cluster_name' cannot be empty!))
$(if $(filter $(cluster_name),$(shell echo '$(cluster_name)' | sed 's/[^a-zA-Z0-9\-\.]//g')),,$(error 'cluster_name' can only have [a-zA-Z0-9-.] in it!))
$(if $(filter $(cluster_name),$(shell echo '$(cluster_name)' | sed 's/[^-a-zA-Z0-9]//g')),,$(error 'cluster_name' can only have [-a-zA-Z0-9] in it!))

init-vpc-terraform: check-cluster-name ## Initialize/reset local terraform state based on what is in S3 for vpc
@echo "\033[36m==> Initializing terraform state for VPC in region \
Expand Down

0 comments on commit 7b72705

Please sign in to comment.