knife-ec2 2.1.6 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62b16f2073f8b2ee3ef35518c860b18f0e16a6734aa9f5578ed768e5ef4072af
-  data.tar.gz: 8334d4b0fb87418ddb12a244114067b1ff41c39a2bcf0e95f9c03d3812d6c672
+  metadata.gz: 1c9e95c46220d9a4108d3f92dced810864d8df0439108d1478d00f0239c6a1c0
+  data.tar.gz: ae0bce69fb7b2e7f0405db5a484b99adfb2dc8872c5b60fc860c61e988e05f62
 SHA512:
-  metadata.gz: 73b53887684bd8a895d761a1d89d2777daf7778b731524a13b055757bfbd4d83630052805cc584a40057736eb461f65d40fee6dc45ed434720ce62aa35957f58
-  data.tar.gz: f4de7a408a71457a8fa67ee99e071447331d73e842aed67bf1ccbe07e64bc8164e868b9fda32ae867b7bed885057f68c525b140af51c49c1f553741a1f5dd1c4
+  metadata.gz: 1fa2fa5e742a2e30267d02b1c0ab5663559eb15290c936f3fac5501a13eac5f045256b4ec105f828fefd90b8eacfce4173a633a726d71fbb13f3b8ba1395c4b5
+  data.tar.gz: 8602b3465992ec4c0674f879ed8c22a7dc413588d7272c453e80a3a678cf24a8baf896ce0df12d3ec06f7010ea70f75a83f773a36de70d3648eb76022ce74e0e

data/lib/chef/knife/ec2_ami_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Piyush Awasthi (<piyush.awasthi@msystechnologies.com>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -93,18 +93,23 @@ class Chef
 
       def ami_hashes
         all_data = {}
-        ec2_connection.describe_images(image_params).images.each do |v|
+        response = ec2_connection.describe_images(image_params)
+        response.images.each do |v|
           v_data = {}
           if config[:search]
-            next unless v.description.downcase.include?(config[:search].downcase)
+            next unless v.description.to_s.downcase.include?(config[:search].downcase)
           end
 
           %w{image_id platform description architecture}.each do |id|
-            v_data[id] = v.send(id)
+            v_data[id] = v.respond_to?(id) ? v.send(id) : v[id]
           end
 
-          v_data["name"] = v.name.split(/\W+/).first
-          v_data["size"] = v.block_device_mappings[0].ebs.volume_size.to_s
+          name = v.respond_to?(:name) ? v.name : v[:name]
+          v_data["name"] = name ? name.split(/\W+/).first : nil
+
+          mappings = v.respond_to?(:block_device_mappings) ? v.block_device_mappings : v[:block_device_mappings]
+          v_data["size"] = mappings && mappings[0] && mappings[0][:ebs] ? mappings[0][:ebs][:volume_size].to_s : nil
+
           all_data[v_data["image_id"]] = v_data
         end
         all_data

data/lib/chef/knife/ec2_eip_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2018-2019 Chef Software, Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/ec2_flavor_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright (c) 2012-2019 Chef Software, Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/ec2_securitygroup_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2018-2019 Chef Software, Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/ec2_server_create.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -334,10 +334,16 @@ class Chef
         msg_pair("IAM Profile", config[:iam_instance_profile])
 
         msg_pair("AWS Tags", printed_aws_tags)
+
         msg_pair("Volume Tags", printed_volume_tags)
         msg_pair("SSH Key", server.key_name)
         msg_pair("T2/T3 Unlimited", printed_t2_t3_unlimited)
 
+        # Update Name tag after instance creation if chef_node_name contains %s
+        if config[:chef_node_name] && config[:chef_node_name].include?("%s")
+          config[:chef_node_name] = evaluate_node_name(config[:chef_node_name])
+        end
+
         puts("\n")
 
         # occasionally 'ready?' isn't, so retry a couple times if needed.
@@ -981,6 +987,16 @@ class Chef
               cpu_credits: config[:cpu_credits],
             }
         end
+        # Add tag_specifications for instance tags at creation time
+        tags = hashed_tags.map { |k, v| { key: k, value: v } }
+        unless tags.empty?
+          attributes[:tag_specifications] = [
+            {
+              resource_type: "instance",
+              tags: tags,
+            },
+          ]
+        end
         attributes
       end
 
@@ -1448,9 +1464,9 @@ class Chef
         # Always set the Name tag
         unless ht.key?("Name")
           if config[:chef_node_name]
-            ht["Name"] = evaluate_node_name(config[:chef_node_name])
+            ht["Name"] = config[:chef_node_name]
           else
-            ht["Name"] = server.id
+            ht["Name"] = server&.id
           end
         end
 
@@ -1475,3 +1491,4 @@ class Chef
     end
   end
 end
+

data/lib/chef/knife/ec2_server_delete.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright (c) 2009-2019 Chef Software, Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/ec2_server_list.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/ec2_subnet_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2018-2019 Chef Software, Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/ec2_vpc_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2018-2019 Chef Software, Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/helpers/ec2_base.rb

@@ -1,7 +1,7 @@
 
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -184,8 +184,17 @@ class Chef
       # Name tag value return.
       # @return [String]
       def find_name_tag(tags)
-        name_tag = tags.find { |tag| tag[:key] == "Name" }
-        name_tag ? name_tag[:value] : nil
+        name_tag = tags.find do |tag|
+          key_value = tag.respond_to?(:key) ? tag.key : (tag[:key] || tag["key"])
+          key_value == "Name"
+        end
+        if name_tag
+          if name_tag.respond_to?(:value)
+            name_tag.value
+          else
+            name_tag[:value] || name_tag["value"]
+          end
+        end
       end
 
       # Platform value return for Windows AMIs; otherwise, it is blank.

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "2.1.6".freeze
+    VERSION = "2.2.0".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2026-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '18.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '18.0'
 - !ruby/object:Gem::Dependency
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.95'
+- !ruby/object:Gem::Dependency
+  name: abbrev
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: syslog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: Amazon EC2 Support for Chef's Knife Command
 email:
 - info@chef.io
@@ -91,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Amazon EC2 Support for Chef's Knife Command