ubuntu_ami 0.4.1 → 0.4.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: b7478b9edc80983b43047540a08d14defff4aecb4f1447125b6b7959422aa9bc
+  data.tar.gz: 0b777e5e522d85e4977b1b5e0f40f1d8cf74f3223ec31a2b723aed14ef344751
+SHA512:
+  metadata.gz: ae445e0ef42236866a29d5cb9aebdb541154f492ff5a84e71f98c967880679e4110f15cfe7b76d2e25882198276ca29b55d33e32b57a84f5fcd178a7e95247fc
+  data.tar.gz: 9de7c2e0dbb47afb5a934b054bd5a7ed71fef427f7986c247edf5fce5b5ed17f315eb455a8623da95dfe4f44f13f428fbd8c74aa2f5260795c89c6fb201f4602

data/lib/chef/knife/ec2_amis_ubuntu.rb

@@ -43,15 +43,31 @@ module KnifePlugins
       region.gsub(/-1/,'').gsub(/-/,'_')
     end
 
+    # Identifies the virtualization type as HVM if image is HVM.
+    #
+    # === Parameters
+    # type<String>:: comes from Ubuntu::Ami#virtualization_type
+    #
+    # === Returns
+    # String:: "_hvm" if the #virtualization_type is HVM, otherwise empty.
+    def virt_type(type)
+      type =~ /hvm/ ? "_hvm" : ''
+    end
+
     # Indicates whether a particular image has EBS root volume.
     #
     # === Parameters
     # store<String>:: comes from Ubuntu::Ami#root_store
     #
     # === Returns
-    # String:: "_ebs" if the #root_store is EBS, otherwise empty.
+    # String:: "_ebs" if the #root_store is EBS, _ebs_ssd if ebs-ssd,
+    # _ebs_io1 if provisioned IOPS, etc. Otherwise empty.
     def disk_store(store)
-      store =~ /ebs/ ? "_ebs" : ''
+      if store =~ /ebs/
+        "_#{store.tr('-', '_')}"
+      else
+        ''
+      end
     end
 
     # Indicates whether the architecture type is a large or small AMI.
@@ -80,8 +96,8 @@ module KnifePlugins
     # === Returns
     # String:: The region, arch and root_store (if EBS) concatenated
     # with underscore (_).
-    def build_type(region, arch, root_store)
-      "#{region_fix(region)}_#{size_of(arch)}#{disk_store(root_store)}"
+    def build_type(region, arch, root_store, type)
+      "#{region_fix(region)}_#{size_of(arch)}#{disk_store(root_store)}#{virt_type(type)}"
     end
 
     # Iterates over the AMIs available for the specified distro.
@@ -94,7 +110,7 @@ module KnifePlugins
     def list_amis(distro)
       amis = Hash.new
       Ubuntu.release(distro).amis.each do |ami|
-        amis[build_type(ami.region, ami.arch, ami.root_store)] = ami.name
+        amis[build_type(ami.region, ami.arch, ami.root_store, ami.virtualization_type)] = ami.name
       end
       amis
     end

data/lib/ubuntu_ami/version.rb

@@ -17,6 +17,6 @@
 
 class Ubuntu
   class Ami
-    VERSION = '0.4.1'
+    VERSION = '0.4.5'
   end
 end

data/lib/ubuntu_ami.rb

@@ -58,7 +58,7 @@ class Ubuntu
   # === Returns
   # String:: The full URL to the released AMIs.
   def url
-    "http://uec-images.ubuntu.com/query/#{release_name}/server/released.current.txt"
+    "http://cloud-images.ubuntu.com/query/#{release_name}/server/released.current.txt"
   end
 
   # Reads the URL for processing.
@@ -67,7 +67,7 @@ class Ubuntu
   # not found.
   def content
     begin
-      @content ||= open(url).read.split("\n")
+      @content ||= ::OpenURI.open_uri(url).read.split("\n")
     rescue
       raise "Could not find AMI list for distro release '#{release_name}', did you specify it correctly? (e.g., 'lucid')"
     end

metadata

@@ -1,52 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: ubuntu_ami
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.5
 platform: ruby
 authors:
 - Joshua Timberman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Retrieves AMI information from Canonical's Ubuntu release list.Also provides
   a knife plugin to retrieve the list.
-email: joshua@opscode.com
+email: joshua@chef.io
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE
+extra_rdoc_files: []
 files:
 - LICENSE
-- README.md
 - lib/chef/knife/ec2_amis_ubuntu.rb
-- lib/ubuntu_ami/version.rb
 - lib/ubuntu_ami.rb
-homepage: http://github.com/jtimberman/ubuntu_ami
-licenses: []
+- lib/ubuntu_ami/version.rb
+homepage: https://github.com/jtimberman/ubuntu_ami
+licenses:
+- Apache-2.0
+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.23
+rubygems_version: 3.1.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Retrieves AMI information from Canonical's Ubuntu release list.
 test_files: []

data/README.md

@@ -1,53 +0,0 @@
-This gem provides a library for retrieving Canonical's Ubuntu AMI
-release list for Amazon EC2.
-
-It also includes a knife plugin to easily retrieve AMIs for launching
-instances with Chef.
-
-# Usage
-
-Find an AMI based on criteria:
-
-    ami = Ubuntu.release("lucid").amis.find do |ami|
-      ami.arch == "amd64" and
-      ami.root_store == "instance-store" and
-      ami.region == "us-east-1"
-    end
-
-Return certain information about the AMIs:
-
-    Ubuntu.release("lucid").amis.each do |ami|
-      puts "#{ami.region} #{ami.name} (#{ami.arch}, #{ami.root_store})"
-    end
-
-Use the knife plugin with Knife, from Chef. Pass just a distro name
-for the list of available AMIs by type:
-
-    knife ec2 amis ubuntu lucid
-
-The first column will be the available types, and the second is the
-associated AMI. Specify the type to return just the AMI.
-
-    knife ec2 amis ubuntu lucid us_east_small
-
-The type is made up of the region, the architecture size (small for 32
-bit, large for 64 bit). If the AMI is an EBS root store, that will be indicated.
-
-# License and Authors
-
-Author:: Joshua Timberman (<joshua@housepub.org>)
-Author:: Michael Hale (<mike@hales.ws>)
-
-Copyright:: 2011, Joshua Timberman
-
-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.