awspec 0.69.1 → 0.70.0

data/lib/awspec/stub/ecs_container_instance.rb

@@ -30,10 +30,10 @@ Aws.config[:ecs] = {
               integer_value: 0,
               long_value: 0,
               string_set_value: %w[
-                '2376',
-                '22',
-                '51678',
-                '2375'
+                2376
+                22
+                51678
+                2375
               ]
             }
           ],
@@ -59,11 +59,11 @@ Aws.config[:ecs] = {
               integer_value: 0,
               long_value: 0,
               string_set_value: %w[
-                '2376',
-                '22',
-                '80',
-                '51678',
-                '2375'
+                2376
+                22
+                80
+                51678
+                2375
               ]
             }
           ],

data/lib/awspec/toolbox.rb

@@ -6,8 +6,13 @@ module Awspec
     end
 
     desc 'template [resource_type_name]', 'Generate template files'
+    option :account_attribute, type: :boolean, default: false, aliases: :a
     def template(type)
-      puts Awspec::Generator::Template.generate(type)
+      if options[:account_attribute]
+        puts Awspec::Generator::Template.generate_account_attribute(type)
+      else
+        puts Awspec::Generator::Template.generate(type)
+      end
     end
   end
 end

data/lib/awspec/type/account.rb

@@ -0,0 +1,35 @@
+module Awspec::Type
+  class Account < Base
+    REMOVE_SUFFIX_RE = /
+    _account_attributes|_account_settings|_send_quota
+    /ix
+
+    def resource_via_client
+      attributes = sts_client.get_caller_identity.to_h
+      Awspec::Helper::Type::ACCOUNT_ATTRIBUTES.each do |type|
+        key = type.gsub(REMOVE_SUFFIX_RE, '').to_sym
+        if key == 'ses'
+          # https://docs.aws.amazon.com/ses/latest/DeveloperGuide/regions.html
+          next unless ['us-east-1', 'us-west-2', 'eu-west-1'].include?(Aws.config[:region])
+        end
+        eval "attributes[key] = Awspec::Type::#{type.camelize}.new.resource_via_client"
+      end
+      @resource_via_client ||= attributes.to_struct
+    end
+
+    def id
+      @id ||= sts_client.get_caller_identity.account
+    end
+
+    def lambda
+      resource_via_client[:lambda]
+    end
+
+    def method_missing(name)
+      name = name.to_s if name.class == Symbol
+      describe = name.tr('-', '_').to_sym
+      super unless resource_via_client.members.include?(describe)
+      resource_via_client[describe]
+    end
+  end
+end

data/lib/awspec/type/account_attribute.rb

@@ -0,0 +1,28 @@
+module Awspec::Type
+  class AccountAttribute < Base
+    def initialize(key = nil)
+      @key = key.to_sym
+    end
+
+    def resource_via_client
+      attributes = nil
+      Awspec::Helper::Type::ACCOUNT_ATTRIBUTES.each do |type|
+        key = type.gsub(Awspec::Type::Account::REMOVE_SUFFIX_RE, '').to_sym
+        next unless key == @key
+        if key == 'ses'
+          # https://docs.aws.amazon.com/ses/latest/DeveloperGuide/regions.html
+          next unless ['us-east-1', 'us-west-2', 'eu-west-1'].include?(Aws.config[:region])
+        end
+        eval "attributes = Awspec::Type::#{type.camelize}.new.resource_via_client"
+      end
+      @resource_via_client ||= attributes
+    end
+
+    def method_missing(name)
+      name = name.to_s if name.class == Symbol
+      describe = name.tr('-', '_').to_sym
+      super unless resource_via_client.members.include?(describe)
+      resource_via_client[describe]
+    end
+  end
+end

data/lib/awspec/type/account_attribute_base.rb

@@ -0,0 +1,4 @@
+module Awspec::Type
+  class AccountAttributeBase < Base
+  end
+end

data/lib/awspec/type/acm.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Acm < Base
+  class Acm < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_certificate(@display_name)
     end

data/lib/awspec/type/alb.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Alb < Base
+  class Alb < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_alb(@display_name)
     end

data/lib/awspec/type/ami.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Ami < Base
+  class Ami < ResourceBase
     aws_resource Aws::EC2::Image
 
     def resource_via_client

data/lib/awspec/type/autoscaling_group.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class AutoscalingGroup < Base
+  class AutoscalingGroup < ResourceBase
     aws_resource Aws::AutoScaling::AutoScalingGroup
     tags_allowed
 
@@ -19,9 +19,10 @@ module Awspec::Type
 
     def has_ec2?(id)
       ec2 = find_ec2(id)
+      return nil unless ec2
       resource_via_client.instances.find do |instance|
         instance.instance_id = ec2.instance_id
-      end if ec2
+      end
     end
   end
 end

data/lib/awspec/type/base.rb

@@ -6,12 +6,10 @@ module Awspec::Type
   class Base
     include Awspec::Helper::Finder
     include Awspec::BlackListForwardable
+    attr_accessor :account
 
-    attr_reader :id, :resource_via_client
-
-    def initialize(display_name = nil)
-      @display_name = display_name
-      @id = nil
+    def resource_via_client
+      raise 'this method must be override!'
     end
 
     def to_s
@@ -23,24 +21,6 @@ module Awspec::Type
       to_s
     end
 
-    def exists?
-      id
-    end
-
-    def id
-      raise 'this method must be override!'
-    end
-
-    def resource_via_client
-      raise 'this method must be override!'
-    end
-
-    def self.aws_resource(resource)
-      define_method :resource do
-        @resource ||= Awspec::ResourceReader.new(resource.new(id))
-      end
-    end
-
     def self.tags_allowed
       define_method :has_tag? do |key, value|
         begin
@@ -54,8 +34,9 @@ module Awspec::Type
     end
 
     def method_missing(name)
-      describe = name.to_sym
-      if resource_via_client.members.include?(describe)
+      name_str = name.to_s if name.class == Symbol
+      describe = name_str.tr('-', '_').to_sym
+      if !resource_via_client.nil? && resource_via_client.members.include?(describe)
         resource_via_client[describe]
       else
         super unless self.respond_to?(:resource)

data/lib/awspec/type/cloudfront_distribution.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class CloudfrontDistribution < Base
+  class CloudfrontDistribution < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_cloudfront_distribution(@display_name)
     end

data/lib/awspec/type/cloudtrail.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Cloudtrail < Base
+  class Cloudtrail < ResourceBase
     aws_resource Aws::CloudTrail
 
     def resource_via_client

data/lib/awspec/type/cloudwatch_alarm.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class CloudwatchAlarm < Base
+  class CloudwatchAlarm < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_cloudwatch_alarm(@display_name)
     end

data/lib/awspec/type/cloudwatch_event.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class CloudwatchEvent < Base
+  class CloudwatchEvent < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_cloudwatch_event(@display_name)
     end

data/lib/awspec/type/cloudwatch_logs.rb

@@ -0,0 +1,27 @@
+module Awspec::Type
+  class CloudwatchLogs < ResourceBase
+    def resource_via_client
+      @resource_via_client ||= find_cloudwatch_logs_group(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.log_group_name if resource_via_client
+    end
+
+    def has_log_stream?(stream_name)
+      ret = find_cloudwatch_logs_stream_by_log_group_name(@id).log_stream_name
+      return true if ret == stream_name
+    end
+
+    def has_metric_filter?(filter_name)
+      ret = find_cloudwatch_logs_metric_fileter_by_log_group_name(@id, filter_name).filter_name
+      return true if ret == filter_name
+    end
+
+    def has_subscription_filter?(filter_name, pattern = nil)
+      ret = find_cloudwatch_logs_subscription_fileter_by_log_group_name(@id, filter_name)
+      return false unless ret.filter_pattern == pattern
+      return true if ret.filter_name == filter_name
+    end
+  end
+end

data/lib/awspec/type/customer_gateway.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class CustomerGateway < Base
+  class CustomerGateway < ResourceBase
     tags_allowed
 
     def initialize(name)

data/lib/awspec/type/directconnect_virtual_interface.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class DirectconnectVirtualInterface < Base
+  class DirectconnectVirtualInterface < ResourceBase
     def initialize(name)
       super
       @display_name = name

data/lib/awspec/type/ebs.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Ebs < Base
+  class Ebs < ResourceBase
     aws_resource Aws::EC2::Volume
     tags_allowed
 

data/lib/awspec/type/ec2.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Ec2 < Base
+  class Ec2 < ResourceBase
     aws_resource Aws::EC2::Instance
     tags_allowed
 

data/lib/awspec/type/ec2_account_attributes.rb

@@ -0,0 +1,7 @@
+module Awspec::Type
+  class Ec2AccountAttributes < AccountAttributeBase
+    def resource_via_client
+      @resource_via_client ||= find_ec2_account_attributes
+    end
+  end
+end

data/lib/awspec/type/ecr_repository.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class EcrRepository < Base
+  class EcrRepository < ResourceBase
     aws_resource Aws::ECR::Types::Repository
 
     def initialize(repository_name)

data/lib/awspec/type/ecs_cluster.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class EcsCluster < Base
+  class EcsCluster < ResourceBase
     def initialize(name)
       super
       @display_name = name

data/lib/awspec/type/ecs_container_instance.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class EcsContainerInstance < Base
+  class EcsContainerInstance < ResourceBase
     attr_accessor :cluster
 
     def initialize(container_instance)

data/lib/awspec/type/ecs_service.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class EcsService < Base
+  class EcsService < ResourceBase
     def initialize(service)
       super
       @display_name = service

data/lib/awspec/type/ecs_task_definition.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class EcsTaskDefinition < Base
+  class EcsTaskDefinition < ResourceBase
     def initialize(taskdef)
       super
       @display_name = taskdef

data/lib/awspec/type/efs.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Efs < Base
+  class Efs < ResourceBase
     def initialize(file_system_id)
       super
       @display_name = file_system_id

data/lib/awspec/type/elasticache.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Elasticache < Base
+  class Elasticache < ResourceBase
     def initialize(name)
       super
       @display_name = name

data/lib/awspec/type/elasticache_cache_parameter_group.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class ElasticacheCacheParameterGroup < Base
+  class ElasticacheCacheParameterGroup < ResourceBase
     def initialize(name)
       super
       @display_name = name

data/lib/awspec/type/elasticsearch.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Elasticsearch < Base
+  class Elasticsearch < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_elasticsearch_domain(@display_name)
     end

data/lib/awspec/type/elastictranscoder_pipeline.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class ElastictranscoderPipeline < Base
+  class ElastictranscoderPipeline < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_pipeline(@display_name)
     end

data/lib/awspec/type/elb.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class Elb < Base
+  class Elb < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_elb(@display_name)
     end
@@ -21,9 +21,10 @@ module Awspec::Type
 
     def has_ec2?(id)
       ec2 = find_ec2(id)
+      return nil unless ec2
       resource_via_client.instances.find do |instance|
         instance.instance_id = ec2.instance_id
-      end if ec2
+      end
     end
 
     def has_security_group?(sg_id)

data/lib/awspec/type/iam_group.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class IamGroup < Base
+  class IamGroup < ResourceBase
     aws_resource Aws::IAM::Group
 
     def resource_via_client

data/lib/awspec/type/iam_policy.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class IamPolicy < Base
+  class IamPolicy < ResourceBase
     def resource_via_client
       @resource_via_client ||= find_iam_policy(@display_name)
     end

data/lib/awspec/type/iam_role.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class IamRole < Base
+  class IamRole < ResourceBase
     aws_resource Aws::IAM::Role
 
     def resource_via_client

data/lib/awspec/type/iam_user.rb

@@ -1,5 +1,5 @@
 module Awspec::Type
-  class IamUser < Base
+  class IamUser < ResourceBase
     aws_resource Aws::IAM::User
 
     def resource_via_client