knife-cfn 0.1.10 → 0.1.11

data/lib/chef/knife/cfn_describe.rb

@@ -34,6 +34,46 @@ class Chef
              :long   => "--long",
              :description  => "Use long stack names (ARN) instead of friendly names"
 
+      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
 

data/lib/chef/knife/cfn_events.rb

@@ -18,29 +18,69 @@ require 'chef/knife/cfn_base'
 class Chef
   class Knife
     class CfnEvents < Chef::Knife::CfnBase
-    
+
       deps do
         require 'fog'
         require 'readline'
         require 'chef/json_compat'
         require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
-      end    
+      end
 
       banner "knife cfn events <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
 
         events_list = [
           ui.color('Event ID', :bold),
@@ -53,12 +93,12 @@ class Chef
           ui.color('Resource Status Reason', :bold)
         ]
         @name_args.each do |stack_name|
-	  data = Array.new
-	  begin
+          data = Array.new
+          begin
             response = connection.describe_stack_events(stack_name)
             data = response.body['StackEvents']
           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])
@@ -67,7 +107,7 @@ class Chef
             end
             exit 1
           else
-	    data.each do |event|        
+            data.each do |event|
               events_list << event['EventId']
               events_list << event['StackId']
               events_list << event['LogicalResourceId']

data/lib/chef/knife/cfn_outputs.rb

@@ -1,108 +1,148 @@
-#
-# 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 CfnOutputs < 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 outputs <stack name>"
-
-      option :output_parameter_format,
-             :short    => "-o",
-             :long     => "--output_parameter_format",
-             :description => "Stack output is formatted in a suitable syntax to use for parameters for another stack",
-             :proc     => Proc.new{ |o| Chef::Config[:knife][:output_format] = "parameter" }
-
-      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
-
-        outputs_list = [
-            ui.color("Stack", :bold),
-            ui.color('Output Key', :bold),
-            ui.color('Output Value', :bold),
-            ui.color('Description', :bold)
-        ]
-
-        @name_args.each do |stack_name|
-          options = {}
-          options["StackName"] = stack_name
-          data = Array.new
-          begin
-            response = connection.describe_stacks(options)
-            data = response.body["Stacks"]
-
-          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
-            parameter_output=""
-            delim=""
-            data.each do |stack|
-              row1 = true
-              parameter_output += delim
-              delim="\n"
-              parameter_output+=stack["StackName"] + ": "
-              outputs_list << stack["StackName"]
-              stack["Outputs"].each do |output|
-                if !row1
-                  outputs_list << ""
-                  parameter_output += ";"
-                end
-                outputs_list << output["OutputKey"]
-                outputs_list << output["OutputValue"]
-                outputs_list << output["Description"]
-                parameter_output += output["OutputKey"] + "=" + output["OutputValue"]
-                row1 = false
-              end
-            end
-            if locate_config_value(:output_format) == "parameter"
-              puts parameter_output
-            else
-              puts ui.list(outputs_list, :uneven_columns_across, 4)
-            end
-
-          end
-        end
-      end
-    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 CfnOutputs < 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 outputs <stack name>"
+
+      option :output_parameter_format,
+             :short    => "-o",
+             :long     => "--output_parameter_format",
+             :description => "Stack output is formatted in a suitable syntax to use for parameters for another stack",
+             :proc     => Proc.new{ |o| Chef::Config[:knife][:output_format] = "parameter" }
+
+      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
+
+        outputs_list = [
+            ui.color("Stack", :bold),
+            ui.color('Output Key', :bold),
+            ui.color('Output Value', :bold),
+            ui.color('Description', :bold)
+        ]
+
+        @name_args.each do |stack_name|
+          options = {}
+          options["StackName"] = stack_name
+          data = Array.new
+          begin
+            response = connection.describe_stacks(options)
+            data = response.body["Stacks"]
+
+          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
+            parameter_output=""
+            delim=""
+            data.each do |stack|
+              row1 = true
+              parameter_output += delim
+              delim="\n"
+              parameter_output+=stack["StackName"] + ": "
+              outputs_list << stack["StackName"]
+              stack["Outputs"].each do |output|
+                if !row1
+                  outputs_list << ""
+                  parameter_output += ";"
+                end
+                outputs_list << output["OutputKey"]
+                outputs_list << output["OutputValue"]
+                outputs_list << output["Description"]
+                parameter_output += output["OutputKey"] + "=" + output["OutputValue"]
+                row1 = false
+              end
+            end
+            if locate_config_value(:output_format) == "parameter"
+              puts parameter_output
+            else
+              puts ui.list(outputs_list, :uneven_columns_across, 4)
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/chef/knife/cfn_resources.rb

@@ -1,86 +1,126 @@
-#
-# 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 CfnResources < 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 resources <stack name> [logical resource id]"
-
-      def run
-        $stdout.sync = true
-
-        validate!
-
-        stack_name = @name_args[0]
-        logical_resource_id = @name_args[1]
-
-        if stack_name.nil?
-          show_usage
-          ui.error("You must specify a stack name")
-          exit 1
-        end
-
-        resources_list = [
-            ui.color('Logical Resource Id', :bold),
-            ui.color('Physical Resource Id', :bold),
-            ui.color('Resource Type', :bold),
-            ui.color('Resource Status', :bold)
-        ]
-
-        connection_params = { "StackName" => stack_name }
-        if !logical_resource_id.nil?
-          connection_params["LogicalResourceId"] = logical_resource_id
-        end
-
-        data = Array.new
-        begin
-          response = connection.describe_stack_resources(connection_params)
-          data = response.body['StackResources']
-        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
-          data.each do |resource|
-            resources_list << resource['LogicalResourceId']
-            resources_list << resource['PhysicalResourceId']
-            resources_list << resource['ResourceType']
-            resources_list << resource['ResourceStatus']
-          end
-          puts ui.list(resources_list, :uneven_columns_across, 4)
-        end
-
-      end
-    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 CfnResources < 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 resources <stack name> [logical resource id]"
+
+      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]
+        logical_resource_id = @name_args[1]
+
+        if stack_name.nil?
+          show_usage
+          ui.error("You must specify a stack name")
+          exit 1
+        end
+
+        resources_list = [
+            ui.color('Logical Resource Id', :bold),
+            ui.color('Physical Resource Id', :bold),
+            ui.color('Resource Type', :bold),
+            ui.color('Resource Status', :bold)
+        ]
+
+        connection_params = { "StackName" => stack_name }
+        if !logical_resource_id.nil?
+          connection_params["LogicalResourceId"] = logical_resource_id
+        end
+
+        data = Array.new
+        begin
+          response = connection.describe_stack_resources(connection_params)
+          data = response.body['StackResources']
+        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
+          data.each do |resource|
+            resources_list << resource['LogicalResourceId']
+            resources_list << resource['PhysicalResourceId']
+            resources_list << resource['ResourceType']
+            resources_list << resource['ResourceStatus']
+          end
+          puts ui.list(resources_list, :uneven_columns_across, 4)
+        end
+
+      end
+    end
+  end
+end
+
+