awspec 1.18.3 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb0f0d41e833307fa113f79242db844f92839b8957cda778037099ae996fd07e
-  data.tar.gz: ef50e4986fb63cfbb75cf7227b34c524864e0728c51d0e56ab5bf4f5dc671051
+  metadata.gz: 18795d83f853defad01b4fba21d8c37adde28239a88695fc6092c9cd3c7bda52
+  data.tar.gz: 4f1e5ca8c45bf66e2eef19db079c68930895b2f8cf4fee283bfb2d09138211e0
 SHA512:
-  metadata.gz: 1073d5248b672be4cfeea40672c2f06ade383bc1ea402d952183f906ed6d32241754c126a542ed30f5bd2d16083fbfe98810db03ec96b1f3689e7878ca71dd86
-  data.tar.gz: 74ca0db14930a8ebe0a5de40c1631800a88be27ee9cc4efdd0f8f667eca514073e8673a1176bfcf6b0678729c904c83055b082f3bf53472d738938f15f1af68d
+  metadata.gz: 17ce9cd02aca06f1ce991448a4e74776d9c795242dfe4297d971cf2cdb97124c4009509c4f2927202081800a3c940aeae627d1548cbd18e9317659b2445ebd92
+  data.tar.gz: e8a3945166922c258860cc332d802872b47c1dd8551165ec70520cdfaa92734edace4ad9a2b941688771b656a88db2de9bdd313ac75a5f1922d6cdb540a9fce4

data/awspec.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rspec-its'
   spec.add_runtime_dependency 'term-ansicolor'
   spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'addressable'
   spec.add_development_dependency 'bundler', '>= 1.9', '< 3.0'
   spec.add_development_dependency 'octorelease'
   spec.add_development_dependency 'pry'

data/doc/resource_types.md

@@ -267,7 +267,7 @@ end
 
 ### have_tag
 
-### its(:architecture), its(:creation_date), its(:image_id), its(:image_location), its(:image_type), its(:public), its(:kernel_id), its(:owner_id), its(:platform), its(:ramdisk_id), its(:state), its(:description), its(:ena_support), its(:hypervisor), its(:image_owner_alias), its(:name), its(:root_device_name), its(:root_device_type), its(:sriov_net_support), its(:state_reason), its(:virtualization_type)
+### its(:architecture), its(:creation_date), its(:image_id), its(:image_location), its(:image_type), its(:public), its(:kernel_id), its(:owner_id), its(:platform), its(:platform_details), its(:usage_operation), its(:ramdisk_id), its(:state), its(:description), its(:ena_support), its(:hypervisor), its(:image_owner_alias), its(:name), its(:root_device_name), its(:root_device_type), its(:sriov_net_support), its(:state_reason), its(:virtualization_type)
 ### :unlock: Advanced use
 
 `ami` can use `Aws::EC2::Image` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Image.html).
@@ -284,6 +284,14 @@ describe apigateway('my-apigateway') do
 end
 ```
 
+### have_integration_method
+
+### have_integration_path
+
+### have_method
+
+### have_path
+
 ### its(:id), its(:name), its(:description), its(:created_date), its(:version), its(:warnings), its(:binary_media_types), its(:minimum_compression_size), its(:api_key_source), its(:policy), its(:tags)
 ## <a name="autoscaling_group">autoscaling_group</a>
 
@@ -894,7 +902,7 @@ end
 ```
 
 
-### its(:availability_zone), its(:create_time), its(:encrypted), its(:kms_key_id), its(:outpost_arn), its(:size), its(:snapshot_id), its(:state), its(:volume_id), its(:iops), its(:volume_type), its(:fast_restored)
+### its(:availability_zone), its(:create_time), its(:encrypted), its(:kms_key_id), its(:outpost_arn), its(:size), its(:snapshot_id), its(:state), its(:volume_id), its(:iops), its(:volume_type), its(:fast_restored), its(:multi_attach_enabled)
 ### :unlock: Advanced use
 
 `ebs` can use `Aws::EC2::Volume` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Volume.html).
@@ -1319,7 +1327,7 @@ describe eks('my-eks') do
 end
 ```
 
-### its(:name), its(:arn), its(:created_at), its(:version), its(:endpoint), its(:role_arn), its(:logging), its(:identity), its(:status), its(:client_request_token), its(:platform_version), its(:tags)
+### its(:name), its(:arn), its(:created_at), its(:version), its(:endpoint), its(:role_arn), its(:logging), its(:identity), its(:status), its(:client_request_token), its(:platform_version), its(:tags), its(:encryption_config)
 ## <a name="elasticache">elasticache</a>
 
 Elasticache resource type.
@@ -1388,7 +1396,7 @@ describe elasticache('my-rep-group-001') do
 end
 ```
 
-### its(:cache_cluster_id), its(:configuration_endpoint), its(:client_download_landing_page), its(:cache_node_type), its(:engine), its(:engine_version), its(:cache_cluster_status), its(:num_cache_nodes), its(:preferred_availability_zone), its(:cache_cluster_create_time), its(:preferred_maintenance_window), its(:notification_configuration), its(:cache_security_groups), its(:cache_subnet_group_name), its(:cache_nodes), its(:auto_minor_version_upgrade), its(:replication_group_id), its(:snapshot_retention_limit), its(:snapshot_window), its(:auth_token_enabled), its(:auth_token_last_modified_date), its(:transit_encryption_enabled), its(:at_rest_encryption_enabled)
+### its(:cache_cluster_id), its(:configuration_endpoint), its(:client_download_landing_page), its(:cache_node_type), its(:engine), its(:engine_version), its(:cache_cluster_status), its(:num_cache_nodes), its(:preferred_availability_zone), its(:cache_cluster_create_time), its(:preferred_maintenance_window), its(:notification_configuration), its(:cache_security_groups), its(:cache_subnet_group_name), its(:cache_nodes), its(:auto_minor_version_upgrade), its(:replication_group_id), its(:snapshot_retention_limit), its(:snapshot_window), its(:auth_token_enabled), its(:auth_token_last_modified_date), its(:transit_encryption_enabled), its(:at_rest_encryption_enabled), its(:arn)
 ## <a name="elasticache_cache_parameter_group">elasticache_cache_parameter_group</a>
 
 ElasticacheCacheParameterGroup resource type.
@@ -1467,7 +1475,7 @@ end
 ```
 
 
-### its(:domain_id), its(:domain_name), its(:arn), its(:created), its(:deleted), its(:endpoint), its(:endpoints), its(:processing), its(:upgrade_processing), its(:elasticsearch_version), its(:access_policies), its(:snapshot_options), its(:vpc_options), its(:cognito_options), its(:encryption_at_rest_options), its(:node_to_node_encryption_options), its(:advanced_options), its(:log_publishing_options), its(:service_software_options), its(:domain_endpoint_options)
+### its(:domain_id), its(:domain_name), its(:arn), its(:created), its(:deleted), its(:endpoint), its(:endpoints), its(:processing), its(:upgrade_processing), its(:elasticsearch_version), its(:access_policies), its(:snapshot_options), its(:vpc_options), its(:cognito_options), its(:encryption_at_rest_options), its(:node_to_node_encryption_options), its(:advanced_options), its(:log_publishing_options), its(:service_software_options), its(:domain_endpoint_options), its(:advanced_security_options)
 ## <a name="elastictranscoder_pipeline">elastictranscoder_pipeline</a>
 
 ElastictranscoderPipeline resource type.
@@ -1612,7 +1620,7 @@ describe emr('my-emr') do
 end
 ```
 
-### its(:id), its(:name), its(:instance_collection_type), its(:log_uri), its(:requested_ami_version), its(:running_ami_version), its(:release_label), its(:auto_terminate), its(:termination_protected), its(:visible_to_all_users), its(:service_role), its(:normalized_instance_hours), its(:master_public_dns_name), its(:configurations), its(:security_configuration), its(:auto_scaling_role), its(:scale_down_behavior), its(:custom_ami_id), its(:ebs_root_volume_size), its(:repo_upgrade_on_boot), its(:cluster_arn), its(:step_concurrency_level), its(:outpost_arn)
+### its(:id), its(:name), its(:instance_collection_type), its(:log_uri), its(:requested_ami_version), its(:running_ami_version), its(:release_label), its(:auto_terminate), its(:termination_protected), its(:visible_to_all_users), its(:service_role), its(:normalized_instance_hours), its(:master_public_dns_name), its(:configurations), its(:security_configuration), its(:auto_scaling_role), its(:scale_down_behavior), its(:custom_ami_id), its(:ebs_root_volume_size), its(:repo_upgrade_on_boot), its(:cluster_arn), its(:outpost_arn), its(:step_concurrency_level)
 ## <a name="firehose">firehose</a>
 
 Firehose resource type.
@@ -3381,7 +3389,7 @@ end
 ```
 
 
-### its(:name), its(:type), its(:key_id), its(:last_modified_date), its(:last_modified_user), its(:description), its(:allowed_pattern), its(:version), its(:tier), its(:policies)
+### its(:name), its(:type), its(:key_id), its(:last_modified_date), its(:last_modified_user), its(:description), its(:allowed_pattern), its(:version), its(:tier), its(:policies), its(:data_type)
 ### :unlock: Advanced use
 
 ```ruby
@@ -3425,7 +3433,7 @@ end
 ```
 
 
-### its(:availability_zone), its(:availability_zone_id), its(:available_ip_address_count), its(:cidr_block), its(:default_for_az), its(:map_public_ip_on_launch), its(:state), its(:subnet_id), its(:vpc_id), its(:owner_id), its(:assign_ipv_6_address_on_creation), its(:ipv_6_cidr_block_association_set), its(:subnet_arn), its(:outpost_arn)
+### its(:availability_zone), its(:availability_zone_id), its(:available_ip_address_count), its(:cidr_block), its(:default_for_az), its(:map_public_ip_on_launch), its(:map_customer_owned_ip_on_launch), its(:customer_owned_ipv_4_pool), its(:state), its(:subnet_id), its(:vpc_id), its(:owner_id), its(:assign_ipv_6_address_on_creation), its(:ipv_6_cidr_block_association_set), its(:subnet_arn), its(:outpost_arn)
 ### :unlock: Advanced use
 
 `subnet` can use `Aws::EC2::Subnet` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Subnet.html).

data/lib/awspec/helper/client_wrap.rb

@@ -2,7 +2,7 @@ require 'awspec/config'
 
 module Awspec::Helper
   class ClientWrap
-    attr_reader :client, :backoff, :iteration, :backoff_limit, :symbol
+    attr_reader :client, :backoff, :iteration, :backoff_limit, :symbol1, :symbol2
     def initialize(real_client = nil)
       raise ArgumentError, 'Client can not be nil' if real_client.nil?
       config = Awspec::Config.instance
@@ -14,7 +14,8 @@ module Awspec::Helper
       @backoff_limit = config[:client_backoff_limit]
       # build the symbol we'll use to compare to any errors caught in method_missing
       # below.
-      @symbol = real_client.class.to_s.split('::').shift(2).push('Errors', 'RequestLimitExceeded').join('::').to_sym
+      @symbol1 = real_client.class.to_s.split('::').shift(2).push('Errors', 'RequestLimitExceeded').join('::').to_sym
+      @symbol2 = real_client.class.to_s.split('::').shift(2).push('Errors', 'Throttling').join('::').to_sym
     end
 
     protected
@@ -28,7 +29,7 @@ module Awspec::Helper
       begin
         results = client.send(m, *args, &block)
       rescue Exception => e # rubocop:disable Lint/RescueException
-        raise unless e.class.to_s == symbol.to_s && backoff < backoff_limit
+        raise unless (e.class.to_s == symbol1.to_s || e.class.to_s == symbol2.to_s) && backoff < backoff_limit
 
         @backoff = backoff + (iteration * iteration * 0.5)
         @iteration += 1

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

@@ -3,8 +3,8 @@ module Awspec::Helper
     module Acm
       def find_certificate(id)
         selected = []
+        req = {}
         loop do
-          req = {}
           res = acm_client.list_certificates(req)
           selected += res.certificate_summary_list.select do |c|
             c.certificate_arn == id || c.domain_name == id
@@ -19,8 +19,8 @@ module Awspec::Helper
 
       def select_all_certificates
         certs = []
+        req = {}
         loop do
-          req = {}
           res = acm_client.list_certificates(req)
           res.certificate_summary_list.each do |c|
             certs << c.certificate_arn

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

@@ -6,7 +6,7 @@ module Awspec::Helper
         res.load_balancers.select do |lb|
           lb.type == 'application'
         end.single_resource(id)
-      rescue
+      rescue Aws::ElasticLoadBalancingV2::Errors::LoadBalancerNotFound
         return nil
       end
 
@@ -20,7 +20,7 @@ module Awspec::Helper
       def find_alb_listener(arn)
         res = elbv2_client.describe_listeners({ listener_arns: [arn] })
         res.listeners.single_resource(arn)
-      rescue
+      rescue StandardError
         return nil
       end
 
@@ -40,7 +40,7 @@ module Awspec::Helper
         res.target_groups.select do |tg|
           %w(HTTP HTTPS).include?(tg.protocol)
         end.single_resource(id)
-      rescue
+      rescue StandardError
         return nil
       end
 
@@ -60,7 +60,7 @@ module Awspec::Helper
         res.tag_descriptions.select do |resource|
           resource.resource_arn == id
         end.first.tags
-      rescue
+      rescue StandardError
         return nil
       end
     end

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

@@ -2,20 +2,34 @@ module Awspec::Helper
   module Finder
     module Apigateway
       def find_apigateway_by_id(id)
-        rest_apis = apigateway_client.get_rest_apis
-        rest_apis.items.each do |item|
-          return item if item.id == id
+        apis = []
+        apigateway_client.get_rest_apis(limit: 500).each do |response|
+          apis += response.items
+        end
+        apis.each do |api|
+          return api if api.id == id
         end
         nil
       end
 
       def find_apigateway_by_name(name)
-        rest_apis = apigateway_client.get_rest_apis
-        rest_apis.items.each do |item|
-          return item if item.name == name
+        apis = []
+        apigateway_client.get_rest_apis(limit: 500).each do |response|
+          apis += response.items
+        end
+        apis.each do |api|
+          return api if api.name == name
         end
         nil
       end
+
+      def find_api_resources_by_id(api_id)
+        all_resources = []
+        apigateway_client.get_resources(rest_api_id: api_id, limit: 500, embed: ['methods']).each do |response|
+          all_resources += response.items
+        end
+        all_resources != [] ? all_resources : nil
+      end
     end
   end
 end

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

@@ -16,7 +16,7 @@ module Awspec::Helper
             break unless res.is_truncated
             res = iam_client.send(
               'list_' + type.pluralize,
-              { marker => res.marker }
+              { marker: res.marker }
             )
           end
 

data/lib/awspec/stub/apigateway.rb

@@ -70,6 +70,45 @@ Aws.config[:apigateway] = {
           }
         }
       ]
+    },
+    get_resources: {
+      position: '1',
+      items: [
+        {
+          path: '/proxy',
+          resource_methods: {
+            'GET' => {
+              http_method: 'GET',
+              method_integration: { http_method: 'POST', uri: 'http://127.0.0.1:8080/hockey' }
+            }
+          }
+        },
+        {
+          path: '/zambonis',
+          resource_methods: {
+            'POST' => {
+              http_method: 'POST',
+              method_integration: { http_method: 'POST',
+                                    uri: 'http://127.0.0.1:8080/zambonis/{arena}?arena=Saddledome' }
+            }
+          }
+        },
+        {
+          path: '/zambonis/123',
+          resource_methods: {
+            'POST' => {
+              http_method: 'POST',
+              method_integration: { http_method: 'AWS',
+                                    uri: 'arn:aws:apigateway:us-east-1:cognito-idp:action/ListUsers' }
+            },
+            'GET' => {
+              http_method: 'GET',
+              method_integration: { http_method: 'AWS',
+                                    uri: 'arn:aws:apigateway:us-east-1:cognito-idp:action/SignUp?username=test' }
+            }
+          }
+        }
+      ]
     }
   }
 }

data/lib/awspec/type/alb.rb

@@ -15,11 +15,13 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
+        check_existence
         resource_via_client.state.code == state
       end
     end
 
     def has_security_group?(sg_id)
+      check_existence
       sgs = resource_via_client.security_groups
       ret = sgs.find do |sg|
         sg == sg_id
@@ -31,6 +33,7 @@ module Awspec::Type
     end
 
     def has_subnet?(subnet_id)
+      check_existence
       azs = resource_via_client.availability_zones
       ret = azs.find do |az|
         az.subnet_id == subnet_id

data/lib/awspec/type/apigateway.rb

@@ -1,3 +1,5 @@
+require 'addressable/uri'
+
 module Awspec::Type
   class Apigateway < ResourceBase
     aws_resource Aws::APIGateway::Client
@@ -11,5 +13,53 @@ module Awspec::Type
     def id
       @id ||= resource_via_client.id if resource_via_client
     end
+
+    def api_resources
+      @api_resources.nil? ? @api_resources = find_api_resources_by_id(@id) : @api_resources
+    end
+
+    def has_path?(path)
+      check_existence
+      self.api_resources.each do |resource|
+        return resource if resource.path == path
+      end
+      nil
+    end
+
+    def has_integration_path?(path)
+      check_existence
+      self.api_resources.each do |resource|
+        next if resource.resource_methods.nil?
+        resource.resource_methods.each do |_, method|
+          if method.method_integration.http_method == 'AWS'
+            aws_path = method.method_integration.uri.match(%r{(\/[^\?]+)\??.*$}).captures[0] # Matches for ARN type path
+            return resource if aws_path == path
+          end
+          uri = Addressable::URI.parse(method.method_integration.uri)
+          return resource if uri.path == path
+        end
+      end
+      nil
+    end
+
+    def has_method?(path, http_method)
+      check_existence
+      resource_to_check = has_path?(path)
+      return nil if resource_to_check.nil?
+      resource_to_check.resource_methods.each do |_, method|
+        return resource_to_check if method.http_method == http_method
+      end
+      nil
+    end
+
+    def has_integration_method?(integration_path, http_method)
+      check_existence
+      integration_resource_to_check = has_integration_path?(integration_path)
+      return nil if integration_resource_to_check.nil?
+      integration_resource_to_check.resource_methods.each do |_, method|
+        return integration_resource_to_check if method.method_integration.http_method == http_method
+      end
+      nil
+    end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '1.18.3'
+  VERSION = '1.19.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.19.1
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement