knife-cfn 0.1.10 → 0.1.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ed956b7bf7624fb88560a3aec0e5bc243b8a0169
+  data.tar.gz: 770c634481f6a69b773fa4602c521f0633b3664b
+SHA512:
+  metadata.gz: d307cc10dd135f22c375397678232228331ae59cb9429dffc3b0a346169a0c6e7cc74029942ae9f067906715beafeaa5905de0093fecea7a222a7f8ac67dd92b
+  data.tar.gz: 67be89dad9b22c72d132529c8baefaaa9cf430305125e0415405bc959c6918e155d6d409f6358b5464d5747da878c4edeb0085426d5b5c1728a0534f5f17210c

data/lib/chef/knife/cfn_base.rb

@@ -1,4 +1,8 @@
 #
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright (c) 2011-2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -30,6 +34,17 @@ class Chef
             require 'chef/json_compat'
           end
 
+          option :aws_credential_file,
+            :long => "--aws-credential-file FILE",
+            :description => "File containing AWS credentials as used by aws cmdline tools",
+            :proc => Proc.new { |key| Chef::Config[:knife][:aws_credential_file] = key }
+
+          option :aws_profile,
+            :long => "--aws-profile PROFILE",
+            :description => "AWS profile, from credential file, to use",
+            :default => 'default',
+            :proc => Proc.new { |key| Chef::Config[:knife][:aws_profile] = key }
+
           option :aws_access_key_id,
             :short => "-A ID",
             :long => "--aws-access-key-id KEY",
@@ -42,27 +57,45 @@ class Chef
             :description => "Your AWS API Secret Access Key",
             :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key }
 
+          option :aws_session_token,
+            :long => "--aws-session-token TOKEN",
+            :description => "Your AWS Session Token, for use with AWS STS Federation or Session Tokens",
+            :proc => Proc.new { |key| Chef::Config[:knife][:aws_session_token] = key }
+
           option :region,
             :long => "--region REGION",
             :description => "Your AWS region",
-            :default => "us-east-1",
             :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
+
+          option :use_iam_profile,
+            :long => "--use-iam-profile",
+            :description => "Use IAM profile assigned to current machine",
+            :boolean => true,
+            :default => false,
+            :proc => Proc.new { |key| Chef::Config[:knife][:use_iam_profile] = key }
         end
       end
 
       def connection
+        connection_settings = {
+#          :provider => 'AWS',
+          :region => locate_config_value(:region)
+        }
+        if locate_config_value(:use_iam_profile)
+          connection_settings[:use_iam_profile] = true
+        else
+          connection_settings[:aws_access_key_id] = locate_config_value(:aws_access_key_id)
+          connection_settings[:aws_secret_access_key] = locate_config_value(:aws_secret_access_key)
+          connection_settings[:aws_session_token] = locate_config_value(:aws_session_token)
+        end
         @connection ||= begin
-          connection =  Fog::AWS::CloudFormation.new(
-            :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
-            :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
-            :region => locate_config_value(:region)
-          )
+          connection = Fog::AWS::CloudFormation.new(connection_settings)
         end
       end
 
       def locate_config_value(key)
         key = key.to_sym
-        Chef::Config[:knife][key] || config[key]
+        config[key] || Chef::Config[:knife][key]
       end
 
       def msg_pair(label, value, color=:cyan)
@@ -71,23 +104,75 @@ class Chef
         end
       end
 
+      def is_image_windows?
+        image_info = connection.images.get(@server.image_id)
+        return image_info.platform == 'windows'
+      end
+
       def validate!(keys=[:aws_access_key_id, :aws_secret_access_key])
         errors = []
 
-        keys.each do |k|
-          pretty_key = k.to_s.gsub(/_/, ' ').gsub(/\w+/){ |w| (w =~ /(ssh)|(aws)/i) ? w.upcase  : w.capitalize }
-          if Chef::Config[:knife][k].nil?
-            errors << "You did not provide a valid '#{pretty_key}' value."
+        unless locate_config_value(:use_iam_profile)
+          unless Chef::Config[:knife][:aws_credential_file].nil?
+            unless (Chef::Config[:knife].keys & [:aws_access_key_id, :aws_secret_access_key]).empty?
+              errors << "Either provide a credentials file or the access key and secret keys but not both."
+            end
+            # File format:
+            # AWSAccessKeyId=somethingsomethingdarkside
+            # AWSSecretKey=somethingsomethingcomplete
+            #               OR
+            # [default]
+            # aws_access_key_id = somethingsomethingdarkside
+            # aws_secret_access_key = somethingsomethingdarkside
+
+            aws_creds = ini_parse(File.read(Chef::Config[:knife][:aws_credential_file]))
+            profile = Chef::Config[:knife][:aws_profile] || 'default'
+            entries = aws_creds.values.first.has_key?("AWSAccessKeyId") ? aws_creds.values.first : aws_creds[profile]
+
+            Chef::Config[:knife][:aws_access_key_id] = entries['AWSAccessKeyId'] || entries['aws_access_key_id']
+            Chef::Config[:knife][:aws_secret_access_key] = entries['AWSSecretKey'] || entries['aws_secret_access_key']
+          end
+
+          keys.each do |k|
+            pretty_key = k.to_s.gsub(/_/, ' ').gsub(/\w+/){ |w| (w =~ /(ssh)|(aws)/i) ? w.upcase  : w.capitalize }
+            if Chef::Config[:knife][k].nil?
+              errors << "You did not provide a valid '#{pretty_key}' value."
+            end
           end
-        end
 
-        if errors.each{|e| ui.error(e)}.any?
-          exit 1
+          if errors.each{|e| ui.error(e)}.any?
+            exit 1
+          end
         end
       end
 
     end
-  end
-end
 
+    def iam_name_from_profile(profile)
+      # The IAM profile object only contains the name as part of the arn
+      if profile && profile.key?('arn')
+        name = profile['arn'].split('/')[-1]
+      end
+      name ||= ''
+    end
 
+    def ini_parse(file)
+      current_section = {}
+      map = {}
+      file.each_line do |line|
+        line = line.split(/^|\s;/).first # remove comments
+        section = line.match(/^\s*\[([^\[\]]+)\]\s*$/) unless line.nil?
+        if section
+          current_section = section[1]
+        elsif current_section
+          item = line.match(/^\s*(.+?)\s*=\s*(.+?)\s*$/) unless line.nil?
+          if item
+            map[current_section] ||= {}
+            map[current_section][item[1]] = item[2]
+          end
+        end
+      end
+      map
+    end
+  end
+end

data/lib/chef/knife/cfn_create.rb

@@ -1,125 +1,125 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef/knife'
-require 'chef/knife/cfn_base'
-
-class Chef
-  class Knife
-    class CfnCreate < Chef::Knife::CfnBase
-
-      deps do
-        require 'fog'
-        require 'readline'
-        require 'chef/json_compat'
-        require 'chef/knife/bootstrap'
-        Chef::Knife::Bootstrap.load_deps
-      end
-      
-      banner "knife cfn create <stack name> (options)"
- 
-      option :capabilities,
-        :short => "-C CAPABILITY..",
-        :long => "--capabilities CAPABILITY1,CAPABILITY2,CAPABILITY3..",
-        :description => "The explicitly approved capabilities that may be used during this stack creation",
-        :proc => Proc.new { |capabilities| capabilities.split(',') }  
-        
-      option :disable_rollback,
-        :short => "-d",
-        :long => "--disable-rollback",
-        :description => "Flag to disable rollback of created resources when failures are encountered during stack creation. The default value is 'false'",
-        :proc => Proc.new { |d| Chef::Config[:knife][:disable_rollback] = "true" }
-
-      option :template_file,
-        :short => "-f TEMPLATE_FILE",
-        :long => "--template-file TEMPLATE_FILE",
-        :description => "Path to the file that contains the template",
-        :proc => Proc.new { |f| Chef::Config[:knife][:template_file] = f }
-        
-      option :notification_arns,
-        :short => "-n NOTIFICATION_ARN1,NOTIFICATION_ARN2,NOTIFICATION_ARN3..",
-        :long => "--notification-arns VALUE1,VALUE2,VALUE3..",
-        :description => "SNS ARNs to receive notification about the stack",
-        :proc => Proc.new { |notification_arns| notification_arns.split(',') }
-           
-      option :parameters,
-        :short => "-p 'key1=value1;key2=value2...'",
-        :long => "--parameters 'key1=value1;key2=value2...'",
-        :description => "Parameter values used to create the stack",
-        :proc => Proc.new { |parameters| parameters.split(';') }
-        
-      option :timeout,
-        :short => "-t TIMEOUT_VALUE",
-        :long => "--timeout TIMEOUT_VALUE",
-        :description => " Stack creation timeout in minutes",
-        :proc => Proc.new { |t| Chef::Config[:knife][:timeout] = t }  
-        
-      option :template_url,
-        :short => "-u TEMPLATE_URL",
-        :long => "--template-file TEMPLATE_URL",
-        :description => "Path of the URL that contains the template. This must be a reference to a template in an S3 bucket in the same region that the stack will be created in",
-        :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
-        
-      def run
-        $stdout.sync = true
-
-        validate!
-        
-        stack_name = @name_args[0]
-	
-	if stack_name.nil?
-	  show_usage
-	  ui.error("You must specify a stack name")
-          exit 1
-	end
-        
-        begin
-          response = connection.create_stack(stack_name, create_create_def)
-          rescue Excon::Errors::BadRequest => e
-            i= e.response.body.index("<Message>")
-            j = e.response.body.index("</Message>")
-            if !i.nil? and !j.nil?
-              ui.error(e.response.body[i+9,j-i-9])
-            else
-              print "\n#{e.response.body}"
-            end
-            exit 1
-          else
-            message = "Stack #{stack_name} creation started"
-            print "\n#{ui.color(message, :green)}\n"
-          end
-        end  
-      end   
-      
-      def create_create_def
-        create_def = {} 
-        template_file = locate_config_value(:template_file)
-        if template_file != nil and template_file != ""
-          doc = File.open(template_file, 'rb') { |file| file.read }
-	  create_def['TemplateBody'] = doc
-	end
-	create_def['TemplateURL'] = locate_config_value(:template_url)
-	create_def['Capabilities'] = locate_config_value(:capabilities)
-        create_def['DisableRollback'] = locate_config_value(:disable_rollback)
-        create_def['NotificationARNs'] = locate_config_value(:notification_arns)
-        hashed_parameters={}
-        parameters = locate_config_value(:parameters)
-        parameters.map{ |t| key,val=t.split('='); hashed_parameters[key]=val} unless parameters.nil?
-        create_def['Parameters'] = hashed_parameters
-        create_def['TimeoutInMinutes'] = locate_config_value(:timeout)
-        create_def
-      end
-      
-  end
-end
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/knife/cfn_base'
+
+class Chef
+  class Knife
+    class CfnCreate < Chef::Knife::CfnBase
+
+      deps do
+        require 'fog'
+        require 'readline'
+        require 'chef/json_compat'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+
+      banner "knife cfn create <stack name> (options)"
+
+      option :capabilities,
+        :short => "-C CAPABILITY..",
+        :long => "--capabilities CAPABILITY1,CAPABILITY2,CAPABILITY3..",
+        :description => "The explicitly approved capabilities that may be used during this stack creation",
+        :proc => Proc.new { |capabilities| capabilities.split(',') }
+
+      option :disable_rollback,
+        :short => "-d",
+        :long => "--disable-rollback",
+        :description => "Flag to disable rollback of created resources when failures are encountered during stack creation. The default value is 'false'",
+        :proc => Proc.new { |d| Chef::Config[:knife][:disable_rollback] = "true" }
+
+      option :template_file,
+        :short => "-f TEMPLATE_FILE",
+        :long => "--template-file TEMPLATE_FILE",
+        :description => "Path to the file that contains the template",
+        :proc => Proc.new { |f| Chef::Config[:knife][:template_file] = f }
+
+      option :notification_arns,
+        :short => "-n NOTIFICATION_ARN1,NOTIFICATION_ARN2,NOTIFICATION_ARN3..",
+        :long => "--notification-arns VALUE1,VALUE2,VALUE3..",
+        :description => "SNS ARNs to receive notification about the stack",
+        :proc => Proc.new { |notification_arns| notification_arns.split(',') }
+
+      option :parameters,
+        :short => "-p 'key1=value1;key2=value2...'",
+        :long => "--parameters 'key1=value1;key2=value2...'",
+        :description => "Parameter values used to create the stack",
+        :proc => Proc.new { |parameters| parameters.split(';') }
+
+      option :timeout,
+        :short => "-t TIMEOUT_VALUE",
+        :long => "--timeout TIMEOUT_VALUE",
+        :description => " Stack creation timeout in minutes",
+        :proc => Proc.new { |t| Chef::Config[:knife][:timeout] = t }
+
+      option :template_url,
+        :short => "-u TEMPLATE_URL",
+        :long => "--template-file TEMPLATE_URL",
+        :description => "Path of the URL that contains the template. This must be a reference to a template in an S3 bucket in the same region that the stack will be created in",
+        :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
+
+      def run
+        $stdout.sync = true
+
+        validate!
+
+        stack_name = @name_args[0]
+
+        if stack_name.nil?
+          show_usage
+          ui.error("You must specify a stack name")
+          exit 1
+        end
+
+        begin
+          response = connection.create_stack(stack_name, create_create_def)
+          rescue Excon::Errors::BadRequest => e
+            i= e.response.body.index("<Message>")
+            j = e.response.body.index("</Message>")
+            if !i.nil? and !j.nil?
+              ui.error(e.response.body[i+9,j-i-9])
+            else
+              print "\n#{e.response.body}"
+            end
+            exit 1
+          else
+            message = "Stack #{stack_name} creation started"
+            print "\n#{ui.color(message, :green)}\n"
+          end
+        end
+      end
+
+      def create_create_def
+        create_def = {}
+        template_file = locate_config_value(:template_file)
+        if template_file != nil and template_file != ""
+          doc = File.open(template_file, 'rb') { |file| file.read }
+          create_def['TemplateBody'] = doc
+        end
+        create_def['TemplateURL'] = locate_config_value(:template_url)
+        create_def['Capabilities'] = locate_config_value(:capabilities)
+        create_def['DisableRollback'] = locate_config_value(:disable_rollback)
+        create_def['NotificationARNs'] = locate_config_value(:notification_arns)
+        hashed_parameters={}
+        parameters = locate_config_value(:parameters)
+        parameters.map{ |t| key,val=t.split('='); hashed_parameters[key]=val} unless parameters.nil?
+        create_def['Parameters'] = hashed_parameters
+        create_def['TimeoutInMinutes'] = locate_config_value(:timeout)
+        create_def
+      end
+
+  end
+end

data/lib/chef/knife/cfn_delete.rb

@@ -26,28 +26,68 @@ class Chef
         require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
       end
-      
+
       banner "knife cfn delete <stack name>"
- 
+
+      option :aws_credential_file,
+        :long => "--aws-credential-file FILE",
+        :description => "File containing AWS credentials as used by aws cmdline tools",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_credential_file] = key }
+
+      option :aws_profile,
+        :long => "--aws-profile PROFILE",
+        :description => "AWS profile, from credential file, to use",
+        :default => 'default',
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_profile] = key }
+
+      option :aws_access_key_id,
+        :short => "-A ID",
+        :long => "--aws-access-key-id KEY",
+        :description => "Your AWS Access Key ID",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key }
+
+      option :aws_secret_access_key,
+        :short => "-K SECRET",
+        :long => "--aws-secret-access-key SECRET",
+        :description => "Your AWS API Secret Access Key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key }
+
+      option :aws_session_token,
+        :long => "--aws-session-token TOKEN",
+        :description => "Your AWS Session Token, for use with AWS STS Federation or Session Tokens",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_session_token] = key }
+
+      option :region,
+        :long => "--region REGION",
+        :description => "Your AWS region",
+        :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
+
+      option :use_iam_profile,
+        :long => "--use-iam-profile",
+        :description => "Use IAM profile assigned to current machine",
+        :boolean => true,
+        :default => false,
+        :proc => Proc.new { |key| Chef::Config[:knife][:use_iam_profile] = key }
+
       def run
         $stdout.sync = true
 
         validate!
-        
+
         stack_name = @name_args[0]
-	
-	if stack_name.nil?
-	  show_usage
-	  ui.error("You must specify a stack name")
-	  exit 1
-	end
-		
+
+        if stack_name.nil?
+          show_usage
+          ui.error("You must specify a stack name")
+          exit 1
+        end
+
         options = {}
         options['StackName'] = stack_name
         begin
           response = connection.describe_stacks(options)
-        rescue Excon::Errors::BadRequest => e        
-	  i= e.response.body.index("<Message>")
+        rescue Excon::Errors::BadRequest => e
+          i= e.response.body.index("<Message>")
           j = e.response.body.index("</Message>")
           if !i.nil? and !j.nil?
             ui.error(e.response.body[i+9,j-i-9])
@@ -55,15 +95,15 @@ class Chef
             print "\n#{e.response.body}"
           end
           exit 1
-	end
-	
-	puts "\n"
-	confirm("Do you really want to delete stack #{stack_name}")
-        
+        end
+
+        puts "\n"
+        confirm("Do you really want to delete stack #{stack_name}")
+
         begin
           response = connection.delete_stack(stack_name)
         rescue Excon::Errors::BadRequest => e
-	  i= e.response.body.index("<Message>")
+          i= e.response.body.index("<Message>")
           j = e.response.body.index("</Message>")
           if !i.nil? and !j.nil?
             ui.error(e.response.body[i+9,j-i-9])
@@ -74,8 +114,8 @@ class Chef
         else
           message = "Stack #{stack_name} delete started"
           print "\n#{ui.color(message, :green)}"
-        end  
-      end   
-    end     
+        end
+      end
+    end
   end
 end