awspec 1.18.6 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4153cb88f0be5b9a51b18062dd8be99c748b389086ec50353120901fb180440e
-  data.tar.gz: 921989d56838615417a2f0b2cbe691fab6d255b092a8b7131376809ad9107e12
+  metadata.gz: 104554ac52e531f7d2ddbca1c80dad6f767bdbffad5fe37d389c8a067cfb51d8
+  data.tar.gz: d07bc9d59cad74e8e965c93a5e8921a1705c29ae2560e1a560c441056e7e37a7
 SHA512:
-  metadata.gz: a82d4ca591f00cc86520539604303eeee2363aa003dd8f7c0710242faec71a6b993096b5069906a6387cdb7edebad06179482d716840197131b244d1289314c2
-  data.tar.gz: c99f333f8ccc7c84e2a2b9402de0b21f57facb3ef1f46cf9f9e46e7c28d57c666b7034959c6b72714c228c87e0f9be307ca0ac40d1f01a207ba674cea664004f
+  metadata.gz: 84b19f725a887d11227d951cffbb82c6f22f02154154f2c722bcbfe24cfaeac9a13a7317b8daf0a1160417d28f7723945d9a6d3ee41bff506ebdb73ab87e89b2
+  data.tar.gz: dde35d185574f58977c4327e619b533a342db008d6af9e499b9344e11dc4314a6bea6c2798ac721be38c58c1d5685383257a71d5275f35d1f2848dc5d9e56154

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

@@ -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>
 
@@ -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/finder/apigateway.rb

@@ -22,6 +22,14 @@ module Awspec::Helper
         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/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/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.6'
+  VERSION = '1.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.18.6
+  version: 1.19.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-05-13 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