awspec 0.65.2 → 0.66.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5a96c7e4a0022412a89fa08c8a6fe1af55ddbef
-  data.tar.gz: 8bb3a41eb66171da8e6f3cca3096b051fca40d00
+  metadata.gz: 0d082c7989d077043be4c2678e8319e2ae1692ad
+  data.tar.gz: a8f134cf2076f264a9019b5e04acb2bd41bf4e5d
 SHA512:
-  metadata.gz: 8b1e05e3132152c79f0733a6efcaf953025f0666abf0492a7b2fda8cd767d1c105b52346017a4a9dbe279b6a8375ba07ce2cd2678328dbe1e4a9043dd3bcc982
-  data.tar.gz: 09ac078215b3f60c2d791c1b300f8ae8a32cea0b499ea8c33ffd09a4206833e74b57473848d4d729dfc7bcc5efce27b727246afa6fe4fc5f11dbee3fa5964ba3
+  metadata.gz: 6dcce735c2782bd85a0ee42fdb01a7b7e8e4c14cc7ee605aa0006313249ed3741b307c8e0ff64128fd832a2e42d7b07f5fe73d5874d24930e9e55e9d50261d6d
+  data.tar.gz: 9f7fecbbf166d249d0ff06d840ec5b50dfe089b2efd00c2120bebb3d3a10f130f904d65f771345a5e51d8165dcec04eac3866ada7c6cff464d026aa791aae7c9

data/doc/_resource_types/ecs_cluster.md

@@ -0,0 +1,23 @@
+### exist
+
+```ruby
+describe ecs_cluster('my-ecs-cluster') do
+  it { should exist }
+end
+```
+
+### be_active, be_inactive
+
+```ruby
+describe ecs_cluster('my-ecs-cluster') do
+  it { should be_active }
+end
+```
+
+### have_container_instance
+
+```ruby
+describe ecs_cluster('my-ecs-cluster') do
+  it { have_container_instance('f2756532-8f13-4d53-87c9-aed50dc94cd7') }
+end
+```

data/doc/_resource_types/ecs_container_instance.md

@@ -0,0 +1,18 @@
+### exist
+
+You can set `cluster` ( default: `default` ).
+
+```ruby
+describe ecs_container_instance('my-container-instance'), cluster: 'my-ecs-cluster' do
+  it { should exist }
+end
+```
+
+### be_active, be_inactive
+
+```ruby
+describe ecs_container_instance('my-container-instance'), cluster: 'my-ecs-cluster' do
+  it { should be_active }
+end
+```
+

data/doc/_resource_types/ecs_service.md

@@ -0,0 +1,15 @@
+### exist
+
+```ruby
+describe ecs_service('my-ecs-service') do
+  it { should exist }
+end
+```
+
+### be_active, be_draining, be_inactive
+
+```ruby
+describe ecs_service('my-ecs-service') do
+  it { should be_active }
+end
+```

data/doc/_resource_types/ecs_task_definition.md

@@ -0,0 +1,15 @@
+### exist
+
+```ruby
+describe ecs_task_definition('my-ecs-task-definition') do
+  it { should exist }
+end
+```
+
+### be_active, be_inactive
+
+```ruby
+describe ecs_task_definition('my-ecs-task-definition') do
+  it { should be_active }
+end
+```

data/doc/resource_types.md

@@ -476,52 +476,106 @@ EcrRepository resource type.
 ### exist
 
 
-## <a name="ecs_cluster">ecs_cluster</a>
+## <a name="ecs cluster">ecs cluster</a>
 
-EcsCluster resource type.
+ECS Cluster resource type.
 
 ### exist
 
-### be_active
+```ruby
+describe ecs_cluster('my-ecs-cluster') do
+  it { should exist }
+end
+```
+
+
+### be_active, be_inactive
+
+```ruby
+describe ecs_cluster('my-ecs-cluster') do
+  it { should be_active }
+end
+```
 
-### be_inactive
 
+### have_container_instance
 
-## <a name="ecs_container_instance">ecs_container_instance</a>
+```ruby
+describe ecs_cluster('my-ecs-cluster') do
+  it { have_container_instance('f2756532-8f13-4d53-87c9-aed50dc94cd7') }
+end
+```
 
-EcsContainerInstance resource type.
+### its(:cluster_arn), its(:cluster_name), its(:status), its(:registered_container_instances_count), its(:running_tasks_count), its(:pending_tasks_count), its(:active_services_count)
+## <a name="ecs container instance">ecs container instance</a>
+
+ECS Container Instance resource type.
 
 ### exist
 
-### be_active
+You can set `cluster` ( default: `default` ).
 
-### be_inactive
+```ruby
+describe ecs_container_instance('my-container-instance'), cluster: 'my-ecs-cluster' do
+  it { should exist }
+end
+```
 
 
-## <a name="ecs_service">ecs_service</a>
+### be_active, be_inactive
 
-EcsService resource type.
+```ruby
+describe ecs_container_instance('my-container-instance'), cluster: 'my-ecs-cluster' do
+  it { should be_active }
+end
+```
+
+
+### its(:container_instance_arn), its(:ec2_instance_id), its(:version), its(:version_info), its(:status), its(:agent_connected), its(:running_tasks_count), its(:pending_tasks_count), its(:agent_update_status), its(:attributes)
+## <a name="ecs service">ecs service</a>
+
+ECS Service resource type.
 
 ### exist
 
-### be_active
+```ruby
+describe ecs_service('my-ecs-service') do
+  it { should exist }
+end
+```
 
-### be_draining
 
-### be_inactive
+### be_active, be_draining, be_inactive
 
+```ruby
+describe ecs_service('my-ecs-service') do
+  it { should be_active }
+end
+```
 
-## <a name="ecs_task_definition">ecs_task_definition</a>
+### its(:service_arn), its(:service_name), its(:cluster_arn), its(:status), its(:desired_count), its(:running_count), its(:pending_count), its(:task_definition), its(:role_arn), its(:created_at), its(:placement_constraints), its(:placement_strategy)
+## <a name="ecs task definition">ecs task definition</a>
 
-EcsTaskDefinition resource type.
+ECS Task Definition resource type.
 
 ### exist
 
-### be_active
+```ruby
+describe ecs_task_definition('my-ecs-task-definition') do
+  it { should exist }
+end
+```
+
 
-### be_inactive
+### be_active, be_inactive
 
+```ruby
+describe ecs_task_definition('my-ecs-task-definition') do
+  it { should be_active }
+end
+```
 
+### its(:task_definition_arn), its(:family), its(:task_role_arn), its(:network_mode), its(:revision), its(:status), its(:requires_attributes), its(:placement_constraints)
 ## <a name="efs">efs</a>
 
 EFS resource type.

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

@@ -4,9 +4,13 @@ module Awspec::Generator
       class EcsCluster < Base
         def initialize
           super
+          @type_name = 'ECS Cluster'
           @type = Awspec::Type::EcsCluster.new('my-ecs-cluster')
-          @matchers = []
-          @ignore_matchers = []
+          @ret = @type.resource_via_client
+          @matchers = [
+            Awspec::Type::EcsCluster::STATES.map { |state| 'be_' + state.downcase }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::EcsCluster::STATES.map { |state| 'be_' + state.downcase }
           @describes = []
         end
       end

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

@@ -4,9 +4,13 @@ module Awspec::Generator
       class EcsContainerInstance < Base
         def initialize
           super
+          @type_name = 'ECS Container Instance'
           @type = Awspec::Type::EcsContainerInstance.new('my-ecs-container-instance')
-          @matchers = []
-          @ignore_matchers = []
+          @ret = @type.resource_via_client
+          @matchers = [
+            Awspec::Type::EcsContainerInstance::STATES.map { |state| 'be_' + state.downcase }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::EcsContainerInstance::STATES.map { |state| 'be_' + state.downcase }
           @describes = []
         end
       end

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

@@ -4,9 +4,13 @@ module Awspec::Generator
       class EcsService < Base
         def initialize
           super
+          @type_name = 'ECS Service'
           @type = Awspec::Type::EcsService.new('my-ecs-service')
-          @matchers = []
-          @ignore_matchers = []
+          @ret = @type.resource_via_client
+          @matchers = [
+            Awspec::Type::EcsService::STATES.map { |state| 'be_' + state.downcase }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::EcsService::STATES.map { |state| 'be_' + state.downcase }
           @describes = []
         end
       end

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

@@ -4,9 +4,13 @@ module Awspec::Generator
       class EcsTaskDefinition < Base
         def initialize
           super
+          @type_name = 'ECS Task Definition'
           @type = Awspec::Type::EcsTaskDefinition.new('my-ecs-taskdef')
-          @matchers = []
-          @ignore_matchers = []
+          @ret = @type.resource_via_client
+          @matchers = [
+            Awspec::Type::EcsTaskDefinition::STATES.map { |state| 'be_' + state.downcase }.join(', ')
+          ]
+          @ignore_matchers = Awspec::Type::EcsTaskDefinition::STATES.map { |state| 'be_' + state.downcase }
           @describes = []
         end
       end

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

@@ -1,26 +1,14 @@
 module Awspec::Helper
   module Finder
     module Ecs
-      def find_ecs_cluster(cluster_name)
-        res = ecs_client.describe_clusters(clusters: [cluster_name])
-        res.clusters.first if res.clusters.count == 1
+      def find_ecs_cluster(cluster)
+        res = ecs_client.describe_clusters(clusters: [cluster])
+        res.clusters.single_resource(cluster)
       end
 
-      def list_ecs_container_instances(cluster_name)
-        req = { cluster: cluster_name }
-        container_instances = []
-        loop do
-          res = ecs_client.list_container_instances(req)
-          container_instances.push(*res.container_instance_arns)
-          break if res.next_token.nil?
-          req[:next_token] = res.next_token
-        end
-        container_instances
-      end
-
-      def find_ecs_container_instances(cluster_name, container_instances)
-        res = ecs_client.describe_container_instances(cluster: cluster_name, container_instances: container_instances)
-        res.container_instances if res.container_instances
+      def find_ecs_container_instance(cluster, arn_or_uuid)
+        res = ecs_client.describe_container_instances(cluster: cluster, container_instances: [arn_or_uuid])
+        res.container_instances.single_resource(arn_or_uuid)
       end
 
       def find_ecs_task_definition(taskdef)
@@ -30,8 +18,28 @@ module Awspec::Helper
 
       def find_ecs_service(service)
         res = ecs_client.describe_services(services: [service])
-        res.services.first if res.services.count == 1
+        res.services.single_resource(service)
       end
+
+      def select_ecs_container_instance_arn_by_cluster_name(cluster)
+        req = { cluster: cluster }
+        arns = []
+        loop do
+          res = ecs_client.list_container_instances(req)
+          arns.push(*res.container_instance_arns)
+          break if res.next_token.nil?
+          req[:next_token] = res.next_token
+        end
+        arns
+      end
+
+      # deprecated method
+      def find_ecs_container_instances(cluster, container_instances)
+        res = ecs_client.describe_container_instances(cluster: cluster, container_instances: container_instances)
+        res.container_instances if res.container_instances
+      end
+
+      alias_method :list_ecs_container_instances, :select_ecs_container_instance_arn_by_cluster_name # deprecated method
     end
   end
 end

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

@@ -35,13 +35,14 @@ module Awspec::Helper
       def get_id_by_name_tag(name)
         # takes a name tag and iterates inventory and returns file_system obj
         inventory = efs_client.describe_file_systems
-        inventory.file_systems.each do |fs|
+        file_systems = inventory.file_systems.select do |fs|
           tag_query = efs_client.describe_tags({
                                                  file_system_id: fs.file_system_id
                                                })
-          name_tag = tag_query.find { |tag| tag.key == 'Name' }
-          return fs.file_system_id if name_tag.value == name
+          name_tag = tag_query.tags.find { |tag| tag.key == 'Name' } if tag_query.tags
+          name_tag && name_tag.value == name
         end
+        file_systems.single_resource(name).file_system_id
       end
 
       def get_name_by_id(id)

data/lib/awspec/shared_context.rb

@@ -9,3 +9,9 @@ shared_context 'region', :region do
     Aws.config[:region] = @_region
   end
 end
+
+shared_context 'cluster', :cluster do
+  before do |example|
+    example.metadata[:described_class].cluster = example.metadata[:cluster]
+  end
+end

data/lib/awspec/stub/ecs_cluster.rb

@@ -6,7 +6,7 @@ Aws.config[:ecs] = {
           cluster_arn:                           'arn:aws:ecs:us-east-1:123456789012:cluster/my-ecs-cluster',
           cluster_name:                          'my-ecs-cluster',
           status:                                'ACTIVE',
-          registered_container_instances_count:  0,
+          registered_container_instances_count:  2,
           pending_tasks_count:                   0,
           running_tasks_count:                   0,
           active_services_count:                 0
@@ -17,7 +17,82 @@ Aws.config[:ecs] = {
     },
     list_container_instances: {
       container_instance_arns: [
-        'arn:aws:ecs:us-east-1:123456789012:container-instance/f2756532-8f13-4d53-87c9-aed50dc94cd7'
+        'arn:aws:ecs:us-east-1:123456789012:container-instance/f2756532-8f13-4d53-87c9-aed50dc94cd7',
+        'arn:aws:ecs:us-east-1:123456789012:container-instance/abcdr578-9di3-4c87-8h59-abcdei8fjkd9'
+      ]
+    },
+    describe_container_instances: {
+      container_instances: [
+        {
+          agent_connected: true,
+          container_instance_arn:
+            'arn:aws:ecs:us-east-1:123456789012:container-instance/f2756532-8f13-4d53-87c9-aed50dc94cd7',
+          ec2_instance_id: 'i-01234567',
+          pending_tasks_count: 0,
+          registered_resources: [
+            {
+              name: 'CPU',
+              type: 'INTEGER',
+              double_value: 0.0,
+              integer_value: 2048,
+              long_value: 0
+            },
+            {
+              name: 'MEMORY',
+              type: 'INTEGER',
+              double_value: 0.0,
+              integer_value: 3768,
+              long_value: 0
+            },
+            {
+              name: 'PORTS',
+              type: 'STRINGSET',
+              double_value: 0.0,
+              integer_value: 0,
+              long_value: 0,
+              string_set_value: %w[
+                '2376',
+                '22',
+                '51678',
+                '2375'
+              ]
+            }
+          ],
+          remaining_resources: [
+            {
+              name: 'CPU',
+              type: 'INTEGER',
+              double_value: 0.0,
+              integer_value: 1948,
+              long_value: 0
+            },
+            {
+              name: 'MEMORY',
+              type: 'INTEGER',
+              double_value: 0.0,
+              integer_value: 3668,
+              long_value: 0
+            },
+            {
+              name: 'PORTS',
+              type: 'STRINGSET',
+              double_value: 0.0,
+              integer_value: 0,
+              long_value: 0,
+              string_set_value: %w[
+                '2376',
+                '22',
+                '80',
+                '51678',
+                '2375'
+              ]
+            }
+          ],
+          running_tasks_count: 1,
+          status: 'ACTIVE'
+        }
+      ],
+      failures: [
       ]
     }
   }

data/lib/awspec/type/ecs_cluster.rb

@@ -1,7 +1,5 @@
 module Awspec::Type
   class EcsCluster < Base
-    aws_resource Aws::ECS::Types::Cluster
-
     def initialize(name)
       super
       @display_name = name
@@ -15,19 +13,30 @@ module Awspec::Type
       @id ||= resource_via_client.cluster_name if resource_via_client
     end
 
-    def active?
-      resource_via_client.status == 'ACTIVE'
+    STATES = %w(ACTIVE INACTIVE)
+
+    STATES.each do |state|
+      define_method state.downcase + '?' do
+        resource_via_client.status == state
+      end
     end
 
-    def inactive?
-      resource_via_client.status == 'INACTIVE'
+    def has_container_instance?(uuid)
+      uuid = arn_or_uuid.split('/').last
+      find_ecs_container_instance(id, uuid)
     end
 
+    # deprecated method
     def container_instance_arns
-      @container_instance_arns ||= list_ecs_container_instances(id)
+      puts ''
+      warn Color.on_red(Color.white("!!! `#{__method__}` is deprecated. awspec don't provide complex result !!!"))
+      @container_instance_arns ||= select_ecs_container_instance_arn_by_cluster_name(id)
     end
 
+    # deprecated method
     def container_instances
+      puts ''
+      warn Color.on_red(Color.white("!!! `#{__method__}` is deprecated. awspec don't provide complex result !!!"))
       return @container_instances if @container_instances
       arns = container_instance_arns
       @container_instances ||=

data/lib/awspec/type/ecs_container_instance.rb

@@ -1,8 +1,6 @@
 module Awspec::Type
   class EcsContainerInstance < Base
-    aws_resource Aws::ECS::Types::ContainerInstance
-
-    attr_accessor :cluster_name
+    attr_accessor :cluster
 
     def initialize(container_instance)
       super
@@ -10,23 +8,23 @@ module Awspec::Type
     end
 
     def resource_via_client
-      @resource_via_client ||= find_ecs_container_instances(@cluster_name, [@display_name]).first
+      @resource_via_client ||= find_ecs_container_instance(cluster, @display_name)
     end
 
     def id
       @id ||= resource_via_client.container_instance_arn if resource_via_client
     end
 
-    def cluster_name
-      @cluster_name || 'default'
+    def cluster
+      @cluster || 'default'
     end
 
-    def active?
-      resource_via_client.status == 'ACTIVE'
-    end
+    STATES = %w(ACTIVE INACTIVE)
 
-    def inactive?
-      resource_via_client.status == 'INACTIVE'
+    STATES.each do |state|
+      define_method state.downcase + '?' do
+        resource_via_client.status == state
+      end
     end
   end
 end

data/lib/awspec/type/ecs_service.rb

@@ -1,7 +1,5 @@
 module Awspec::Type
   class EcsService < Base
-    aws_resource Aws::ECS::Types::Service
-
     def initialize(service)
       super
       @display_name = service
@@ -15,16 +13,12 @@ module Awspec::Type
       @id ||= resource_via_client.service_name if resource_via_client
     end
 
-    def active?
-      resource_via_client.status == 'ACTIVE'
-    end
-
-    def draining?
-      resource_via_client.status == 'DRAINING'
-    end
+    STATES = %w(ACTIVE DRAINING INACTIVE)
 
-    def inactive?
-      resource_via_client.status == 'INACTIVE'
+    STATES.each do |state|
+      define_method state.downcase + '?' do
+        resource_via_client.status == state
+      end
     end
   end
 end

data/lib/awspec/type/ecs_task_definition.rb

@@ -1,7 +1,5 @@
 module Awspec::Type
   class EcsTaskDefinition < Base
-    aws_resource Aws::ECS::Types::TaskDefinition
-
     def initialize(taskdef)
       super
       @display_name = taskdef
@@ -15,12 +13,12 @@ module Awspec::Type
       @id ||= "#{resource_via_client.family}:#{resource_via_client.revision}" if resource_via_client
     end
 
-    def active?
-      resource_via_client.status == 'ACTIVE'
-    end
+    STATES = %w(ACTIVE INACTIVE)
 
-    def inactive?
-      resource_via_client.status == 'INACTIVE'
+    STATES.each do |state|
+      define_method state.downcase + '?' do
+        resource_via_client.status == state
+      end
     end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.65.2'
+  VERSION = '0.66.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.65.2
+  version: 0.66.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -216,6 +216,10 @@ files:
 - doc/_resource_types/directconnect_virtual_interface.md
 - doc/_resource_types/ebs.md
 - doc/_resource_types/ec2.md
+- doc/_resource_types/ecs_cluster.md
+- doc/_resource_types/ecs_container_instance.md
+- doc/_resource_types/ecs_service.md
+- doc/_resource_types/ecs_task_definition.md
 - doc/_resource_types/efs.md
 - doc/_resource_types/elasticache.md
 - doc/_resource_types/elasticache_cache_parameter_group.md