Fix a bug in 1.6.0 where cfncluster configure was broken

Signed-off-by: Balaji Sridharan <[email protected]>

Author: fnubalaj

Diff for: CHANGELOG.rst

@@ -2,6 +2,10 @@
 CHANGELOG
 =========
 
+1.6.1
+=====
+* Fix a bug in `cfncluster configure` introduced in 1.6.0
+
 1.6.0
 =====
 * Refactor scaling up to take into account the number of pending/requested jobs/slots and instance slots.

Diff for: cli/cfncluster/config_sanity.py

@@ -25,6 +25,7 @@ def get_partition(region):
         return 'aws-us-gov'
     return 'aws'
 
+
 def check_resource(region, cluster_name, aws_access_key_id, aws_secret_access_key, resource_type,resource_value):
 
     # Loop over all supported resource checks
@@ -56,11 +57,13 @@ def check_resource(region, cluster_name, aws_access_key_id, aws_secret_access_ke
                         (['sqs:SendMessage', 'sqs:ReceiveMessage', 'sqs:ChangeMessageVisibility', 'sqs:DeleteMessage', 'sqs:GetQueueUrl'], "arn:%s:sqs:%s:%s:cfncluster-*" % (partition, region, accountid)),
                         (['autoscaling:DescribeAutoScalingGroups', 'autoscaling:TerminateInstanceInAutoScalingGroup', 'autoscaling:SetDesiredCapacity', 'autoscaling:DescribeTags', 'autoScaling:UpdateAutoScalingGroup'], "*"),
                         (['dynamodb:PutItem', 'dynamodb:Query', 'dynamodb:GetItem', 'dynamodb:DeleteItem', 'dynamodb:DescribeTable'], "arn:%s:dynamodb:%s:%s:table/cfncluster-*" % (partition, region, accountid)),
-                        (['cloudformation:DescribeStacks'], "arn:%s:cloudformation:%s:%s:stack/cfncluster-%s/*" % (partition, region, accountid, cluster_name)),
                         (['s3:GetObject'], "arn:%s:s3:::%s-cfncluster/*" % (partition, region)),
                         (['sqs:ListQueues'], "*"),
                         (['logs:*'], "arn:%s:logs:*:*:*" % partition)]
 
+            if cluster_name is not None:
+                iam_policy['cloudformation:DescribeStacks'] = "arn:%s:cloudformation:%s:%s:stack/cfncluster-%s/*" % (partition, region, accountid, cluster_name)
+
             for actions, resource_arn in iam_policy:
                 response = iam.simulate_principal_policy(PolicySourceArn=arn, ActionNames=actions, ResourceArns=[resource_arn])
                 for decision in response.get("EvaluationResults"):

Diff for: cli/cfncluster/easyconfig.py

@@ -177,5 +177,8 @@ def configure(args):
     with open(config_file,'w') as cf:
         config.write(cf)
 
+    # Set cluster name to none, since it is needed by config sanity
+    args.cluster_name = None
+
     # Verify the configuration
     cfnconfig.CfnClusterConfig(args)

Diff for: cli/setup.py

@@ -20,7 +20,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 console_scripts = ['cfncluster = cfncluster.cli:main']
-version = "1.6.0"
+version = "1.6.1"
 requires = ['boto3>=1.7.33', 'awscli>=1.11.175', 'future>=0.16.0']
 
 if sys.version_info[:2] == (2, 6):

Diff for: cloudformation/cfncluster.cfn.json

@@ -1710,7 +1710,7 @@
     },
     "CfnClusterVersions": {
       "default": {
-        "cfncluster": "cfncluster-1.6.0",
+        "cfncluster": "cfncluster-1.6.1",
         "cookbook": "cfncluster-cookbook-1.6.0",
         "chef": "14.2.0",
         "ridley": "5.1.1",

Diff for: docs/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.6.0'
+release = '1.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.