knife-cfn 0.1.10 → 0.1.11

data/lib/chef/knife/cfn_update.rb

@@ -26,15 +26,15 @@ class Chef
         require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
       end
-      
+
       banner "knife cfn update <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(',') }  
-        
+        :proc => Proc.new { |capabilities| capabilities.split(',') }
+
       option :disable_rollback,
         :short => "-d",
         :long => "--disable-rollback",
@@ -46,44 +46,84 @@ class Chef
         :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 update the stack",
         :proc => Proc.new { |parameters| parameters.split(';') }
-        
+
       option :timeout,
         :short => "-t TIMEOUT_VALUE",
         :long => "--timeout TIMEOUT_VALUE",
         :description => " Stack update timeout in minutes",
-        :proc => Proc.new { |t| Chef::Config[:knife][:timeout] = t }  
-        
+        :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 was created in",
         :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
-        
+
+      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")
+
+        if stack_name.nil?
+          show_usage
+          ui.error("You must specify a stack name")
           exit 1
-	end
-        
+        end
+
         begin
           response = connection.update_stack(stack_name, create_update_def)
           rescue Excon::Errors::BadRequest => e
@@ -99,18 +139,18 @@ class Chef
             message = "Stack #{stack_name} update started"
             print "\n#{ui.color(message, :green)}\n"
           end
-        end  
-      end   
-      
+        end
+      end
+
       def create_update_def
-        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['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={}
@@ -120,6 +160,6 @@ class Chef
         create_def['TimeoutInMinutes'] = locate_config_value(:timeout)
         create_def
       end
-      
+
   end
 end

data/lib/chef/knife/cfn_validate.rb

@@ -18,7 +18,7 @@ require 'chef/knife/cfn_base'
 class Chef
   class Knife
     class CfnValidate < Chef::Knife::CfnBase
-    
+
       deps do
         require 'fog'
         require 'readline'
@@ -26,7 +26,7 @@ class Chef
         require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
       end
-      
+
       banner "knife cfn validate (options)"
 
       option :template_file,
@@ -34,23 +34,62 @@ class Chef
         :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 :template_url,
         :short => "-u TEMPLATE_URL",
         :long => "--template-file TEMPLATE_URL",
         :description => "Path to the URL that contains the template",
         :proc => Proc.new { |u| Chef::Config[:knife][:template_url] = u }
-        
+
+      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!
-        
-	begin
+
+        begin
            response = connection.validate_template(create_validate_def)
         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])
@@ -61,20 +100,20 @@ class Chef
         else
            print "\n#{ui.color("Template validated successfully", :green)}"
         end
-      end   
-        
+      end
+
       def create_validate_def
-        validate_def = {} 
+        validate_def = {}
         template_file = locate_config_value(:template_file)
         if template_file != nil and template_file != ""
             doc = File.open(template_file, 'rb') { |file| file.read }
-	    validate_def['TemplateBody'] = doc
-	else    
-	    validate_def['TemplateURL'] = locate_config_value(:template_url)
-	end
-	validate_def
+            validate_def['TemplateBody'] = doc
+        else
+            validate_def['TemplateURL'] = locate_config_value(:template_url)
+        end
+        validate_def
       end
-      
+
     end
   end
 end

data/lib/knife-cfn/version.rb

@@ -1,3 +1,3 @@
-module KnifeCfn
-  VERSION = "0.1.10"
-end
+module KnifeCfn
+  VERSION = "0.1.10"
+end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: knife-cfn
 version: !ruby/object:Gem::Version
-  version: 0.1.10
-  prerelease: 
+  version: 0.1.11
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11'
 description: CloudFormation Support for Chef's Knife Command
@@ -61,26 +56,25 @@ files:
 - lib/knife-cfn/version.rb
 homepage: https://github.com/neillturner/knife-cfn
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CloudFormation Support for Knife
 test_files: []