awspec 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6103e00c3f0aa3f83d1c10e09d1ca8a5a5c918ac
-  data.tar.gz: 653840c203951bbeec134d9f896fca01949a5b75
+  metadata.gz: 6a905721558237afba127319af4db1276f903347
+  data.tar.gz: 13acb88e7253a96c4bd8eb23afea29c5fb934c37
 SHA512:
-  metadata.gz: 20a641e7724963fdc0898ceaebf578f2c4ea2c92581e8bb951bce565f878ae3afc117f0d1485ab06025f2176fc0cf157caf68723b73b15072fef7d93791ddfe2
-  data.tar.gz: 2c2d5d47471aa4934285029bdccea1d85f3461282e8d6ef9682420b84006a7af7b5321693d802d8b37732ff6b932fc5763d3ae3b2ecbf98c07980527a81c3822
+  metadata.gz: d5af22547903d27edce8b88bba5b627578ba1b5e1d0783d549bb48e024e3a30e8aaedd61ea922685155009f9c9143791e84784f6dc6731990102b1578baa1542
+  data.tar.gz: 74fbb35e7cb25517623416b245e48fea042c381356960562f63ec387a6f2eb6e2a3f72e8496e0884796635fe93ddffe0a72a721cbd5d06a132ede3571509811e

data/doc/_resource_types/ami.md

@@ -0,0 +1,19 @@
+### exist
+
+```ruby
+describe ami('my-ami') do
+  it { should exist }
+end
+```
+
+### be_pending, be_available, be_invalid, be_deregistered, be_transient, be_failed, be_error
+
+```ruby
+describe ami('my-ami') do
+  it { should be_available }
+end
+```
+
+### advanced
+
+`ami` can use `Aws::EC2::Image` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Image.html).

data/doc/_resource_types/ec2.md

@@ -14,14 +14,6 @@ describe ec2('my-ec2') do
 end
 ```
 
-### be_pending
-
-```ruby
-describe ec2('my-ec2') do
-  it { should be_pending }
-end
-```
-
 ### be_pending, be_running, be_shutting_down, be_terminated, be_stopping, be_stopped
 
 ```ruby

data/doc/resource_types.md

@@ -1,6 +1,7 @@
 # Resource Types
 
-[autoscaling_group](#autoscaling_group)
+[ami](#ami)
+| [autoscaling_group](#autoscaling_group)
 | [cloudwatch_alarm](#cloudwatch_alarm)
 | [directconnect_virtual_interface](#directconnect_virtual_interface)
 | [ebs](#ebs)
@@ -26,6 +27,33 @@
 | [subnet](#subnet)
 | [vpc](#vpc)
 
+## <a name="ami">ami</a>
+
+AMI resource type.
+
+### exist
+
+```ruby
+describe ami('my-ami') do
+  it { should exist }
+end
+```
+
+
+### be_pending, be_available, be_invalid, be_deregistered, be_transient, be_failed, be_error
+
+```ruby
+describe ami('my-ami') do
+  it { should be_available }
+end
+```
+
+
+### its(:image_id), its(:image_location), its(:state), its(:owner_id), its(:creation_date), its(:public), its(:architecture), its(:image_type), its(:kernel_id), its(:ramdisk_id), its(:platform), its(:sriov_net_support), its(:state_reason), its(:image_owner_alias), its(:name), its(:description), its(:root_device_type), its(:root_device_name), its(:virtualization_type), its(:hypervisor)
+### :unlock: Advanced use
+
+`ami` can use `Aws::EC2::Image` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Image.html).
+
 ## <a name="autoscaling_group">autoscaling_group</a>
 
 AutoscalingGroup resource type.

data/lib/awspec/generator/doc/type/ami.rb

@@ -0,0 +1,19 @@
+module Awspec::Generator
+  module Doc
+    module Type
+      class Ami < Base
+        def initialize
+          super
+          @type_name = 'AMI'
+          @type = Awspec::Type::Ami.new('my-ami')
+          @ret = @type.resource_via_client
+          @matchers = [
+            Awspec::Type::Ami::STATES.map { |state| 'be_' + state }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::Ami::STATES.map { |state| 'be_' + state.tr('-', '_') }
+          @describes = []
+        end
+      end
+    end
+  end
+end

data/lib/awspec/helper/finder.rb

@@ -14,6 +14,7 @@ require 'awspec/helper/finder/elasticache'
 require 'awspec/helper/finder/cloudwatch'
 require 'awspec/helper/finder/ses'
 require 'awspec/helper/finder/directconnect'
+require 'awspec/helper/finder/ami'
 
 module Awspec::Helper
   module Finder
@@ -32,6 +33,7 @@ module Awspec::Helper
     include Awspec::Helper::Finder::Cloudwatch
     include Awspec::Helper::Finder::Ses
     include Awspec::Helper::Finder::Directconnect
+    include Awspec::Helper::Finder::Ami
 
     CLIENTS = {
       ec2_client: Aws::EC2::Client,

data/lib/awspec/helper/finder/ami.rb

@@ -0,0 +1,20 @@
+module Awspec::Helper
+  module Finder
+    module Ami
+      def find_ami(image_id)
+        res = ec2_client.describe_images({
+                                           filters: [{ name: 'image-id', values: [image_id] }]
+                                         })
+        return res[:images].first if res[:images].count == 1
+        res = ec2_client.describe_images({
+                                           filters: [{ name: 'name', values: [image_id] }]
+                                         })
+        return res[:images].first if res[:images].count == 1
+        res = ec2_client.describe_images({
+                                           filters: [{ name: 'tag:Name', values: [image_id] }]
+                                         })
+        return res[:images].first if res[:images].count == 1
+      end
+    end
+  end
+end

data/lib/awspec/helper/type.rb

@@ -4,7 +4,7 @@ module Awspec
       require 'awspec/type/base'
 
       TYPES = %w(
-        autoscaling_group cloudwatch_alarm directconnect_virtual_interface
+        ami autoscaling_group cloudwatch_alarm directconnect_virtual_interface
         ebs ec2 elasticache elasticache_cache_parameter_group elb iam_group
         iam_policy iam_role iam_user lambda launch_configuration nat_gateway
         network_acl rds rds_db_parameter_group route53_hosted_zone route_table

data/lib/awspec/resource_reader.rb

@@ -25,8 +25,9 @@ module Awspec
       create|delete|put|update|add|
       attach|detach|
       reboot|start|stop|terminate|
-      modify|reset|replace
-      authorize|revoke
+      modify|reset|replace|
+      authorize|revoke|
+      deregister
     /ix
 
     def match_black_list?(name)

data/lib/awspec/stub/ami.rb

@@ -0,0 +1,53 @@
+Aws.config[:ec2] = {
+  stub_responses: {
+    describe_images: {
+      images: [
+        {
+          image_id: 'ami-82640282',
+          image_location:
+            'aws-marketplace/CentOS Linux 6 x86_64 20150928_0-74e73035-3435-48d6-88e0-89cc02ad83ee-ami-2b35794e.2',
+          state: 'available',
+          owner_id: '123456789012',
+          creation_date: '2015-10-13T23:00:25.000Z',
+          public: true,
+          product_codes: [
+            {
+              product_code_id: 'abcdefghijklmn01234567890',
+              product_code_type: 'marketplace'
+            }
+          ],
+          architecture: 'x86_64',
+          image_type: 'machine',
+          kernel_id: nil,
+          ramdisk_id: nil,
+          platform: nil,
+          sriov_net_support: nil,
+          state_reason: nil,
+          image_owner_alias: 'aws-marketplace',
+          name: 'my-ami',
+          description: 'CentOS Linux 6 x86_64 HVM EBS 20150928_01',
+          root_device_type: 'ebs',
+          root_device_name: '/dev/sda1',
+          block_device_mappings: [
+            {
+              virtual_name: nil,
+              device_name: '/dev/sda1',
+              ebs: {
+                snapshot_id: 'snap-be484c23',
+                volume_size: 8,
+                delete_on_termination: false,
+                volume_type: 'standard',
+                iops: nil,
+                encrypted: false
+              },
+              no_device: nil
+            }
+          ],
+          virtualization_type: 'hvm',
+          tags: [],
+          hypervisor: 'xen'
+        }
+      ]
+    }
+  }
+}

data/lib/awspec/type/ami.rb

@@ -0,0 +1,22 @@
+module Awspec::Type
+  class Ami < Base
+    aws_resource Aws::EC2::Image
+
+    def initialize(id)
+      super
+      @resource_via_client = find_ami(id)
+      @id = @resource_via_client[:image_id] if @resource_via_client
+    end
+
+    STATES = %w(
+      pending available invalid deregistered
+      transient failed error
+    )
+
+    STATES.each do |state|
+      define_method state + '?' do
+        @resource_via_client[:state] == state
+      end
+    end
+  end
+end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.29.0'
+  VERSION = '0.30.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -200,6 +200,7 @@ files:
 - bin/console
 - bin/setup
 - bin/toolbox
+- doc/_resource_types/ami.md
 - doc/_resource_types/autoscaling_group.md
 - doc/_resource_types/cloudwatch_alarm.md
 - doc/_resource_types/directconnect_virtual_interface.md
@@ -235,6 +236,7 @@ files:
 - lib/awspec/ext/struct.rb
 - lib/awspec/generator.rb
 - lib/awspec/generator/doc/type.rb
+- lib/awspec/generator/doc/type/ami.rb
 - lib/awspec/generator/doc/type/autoscaling_group.rb
 - lib/awspec/generator/doc/type/base.rb
 - lib/awspec/generator/doc/type/cloudwatch_alarm.rb
@@ -281,6 +283,7 @@ files:
 - lib/awspec/helper/color.rb
 - lib/awspec/helper/credentials_loader.rb
 - lib/awspec/helper/finder.rb
+- lib/awspec/helper/finder/ami.rb
 - lib/awspec/helper/finder/autoscaling.rb
 - lib/awspec/helper/finder/cloudwatch.rb
 - lib/awspec/helper/finder/directconnect.rb
@@ -314,6 +317,7 @@ files:
 - lib/awspec/resource_reader.rb
 - lib/awspec/setup.rb
 - lib/awspec/stub.rb
+- lib/awspec/stub/ami.rb
 - lib/awspec/stub/autoscaling_group.rb
 - lib/awspec/stub/cloudwatch_alarm.rb
 - lib/awspec/stub/directconnect_virtual_interface.rb
@@ -340,6 +344,7 @@ files:
 - lib/awspec/stub/subnet.rb
 - lib/awspec/stub/vpc.rb
 - lib/awspec/toolbox.rb
+- lib/awspec/type/ami.rb
 - lib/awspec/type/autoscaling_group.rb
 - lib/awspec/type/base.rb
 - lib/awspec/type/cloudwatch_alarm.rb