awspec 0.82.3 → 0.83.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51d07fb005a53885d56ce715120e6dc1bd3dc11a
-  data.tar.gz: 5055bf986407ca826b518a51cf41ceb12d9f90bb
+  metadata.gz: 35e0d4f4b803b52d799f8f40579fa88eda612267
+  data.tar.gz: 8329066b3d6b470ce05746c33774900b4c1f196d
 SHA512:
-  metadata.gz: e57f7a1c5009f3909034d332f845d46c6039e5dba5b8cc6c9fade7e5c761efa9185ddd3be61cc274692da053841b2aa561e622de935cc743ee5f94b759983c51
-  data.tar.gz: 8a5ff8aa85678320fffc58facb58ce569c70ce553bb53bf3078ea4eb3741a81f71ad7fc33e3b7fa1c4e193bf8fecad7c4364de7cfc62cde244de3ba307c82270
+  metadata.gz: b1b2f9061e86bb879597803daf5e8dd784c3eda525a3eaec6a928392bbeeb1066f27fc5ee6e074057f3030ead4292de5e481719f141e71e396245ae9f272692a
+  data.tar.gz: 163f822f89c775a756f12889a30117a1ead75244e2eca930f9a1df4da69c52e8abdb232700f0d5930d074af3c300b49bebd6e89a249c866b3f60d8be9fda2a89

data/doc/_resource_types/alb.md

@@ -22,4 +22,10 @@ describe alb('my-alb') do
 end
 ```
 
+### have_subnet
 
+```ruby
+describe alb('my-alb') do
+  it { should have_subnet('subnet-1234a567') }
+end
+```

data/doc/_resource_types/alb_listener.md

@@ -0,0 +1,9 @@
+# exist
+
+```ruby
+describe alb_listener('arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:listener/app/my-alb/1aa1bb1cc1ddee11/f2f7dc8efc522ab2') do
+  it { should exist }
+  its(:port) { should eq 80 }
+  its(:protocol) { should eq 'HTTP' }
+end
+```

data/doc/resource_types.md

@@ -2,6 +2,7 @@
 
 [acm](#acm)
 | [alb](#alb)
+| [alb_listener](#alb_listener)
 | [ami](#ami)
 | [autoscaling_group](#autoscaling_group)
 | [cloudfront_distribution](#cloudfront_distribution)
@@ -100,8 +101,22 @@ end
 ```
 
 
+### have_subnet
+
+```ruby
+describe alb('my-alb') do
+  it { should have_subnet('subnet-1234a567') }
+end
+```
 
 ### its(:load_balancer_arn), its(:dns_name), its(:canonical_hosted_zone_id), its(:created_time), its(:load_balancer_name), its(:scheme), its(:vpc_id), its(:type), its(:security_groups), its(:ip_address_type)
+## <a name="alb_listener">alb_listener</a>
+
+AlbListener resource type.
+
+### exist
+
+### its(:listener_arn), its(:load_balancer_arn), its(:port), its(:protocol), its(:certificates), its(:ssl_policy)
 ## <a name="ami">ami</a>
 
 AMI resource type.
@@ -2402,7 +2417,7 @@ end
 ```
 
 
-### its(:customer_gateway_configuration), its(:customer_gateway_id), its(:state), its(:type), its(:vpn_connection_id), its(:vpn_gateway_id), its(:options), its(:routes), its(:tags), its(:vgw_telemetry)
+### its(:customer_gateway_configuration), its(:customer_gateway_id), its(:state), its(:type), its(:vpn_connection_id), its(:vpn_gateway_id), its(:options), its(:routes), its(:vgw_telemetry)
 ## <a name="vpn_gateway">vpn_gateway</a>
 
 VpnGateway resource type.

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

@@ -0,0 +1,18 @@
+module Awspec::Generator
+  module Doc
+    module Type
+      class AlbListener < Base
+        # rubocop:disable Metrics/LineLength
+        def initialize
+          super
+          @type_name = 'AlbListener'
+          @type = Awspec::Type::AlbListener.new('arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:listener/app/my-alb/1aa1bb1cc1ddee11/f2f7dc8efc522ab2')
+          @ret = @type.resource_via_client
+          @matchers = []
+          @ignore_matchers = []
+          @describes = []
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,13 @@ module Awspec::Helper
           lb.vpc_id == vpc_id
         end
       end
+
+      def find_alb_listener(arn)
+        res = elbv2_client.describe_listeners({ listener_arns: [arn] })
+        res.listeners.single_resource(arn)
+      rescue
+        return nil
+      end
     end
   end
 end

data/lib/awspec/helper/type.rb

@@ -15,7 +15,7 @@ module Awspec
         network_acl network_interface rds rds_db_cluster_parameter_group rds_db_parameter_group route53_hosted_zone
         route_table s3_bucket security_group ses_identity subnet vpc cloudfront_distribution
         elastictranscoder_pipeline waf_web_acl customer_gateway vpn_gateway vpn_connection internet_gateway acm
-        cloudwatch_logs dynamodb_table eip sqs
+        cloudwatch_logs dynamodb_table eip sqs alb_listener
       )
 
       ACCOUNT_ATTRIBUTES = %w(

data/lib/awspec/stub/alb.rb

@@ -1,15 +1,16 @@
+# rubocop:disable Metrics/LineLength
 Aws.config[:elasticloadbalancingv2] = {
   stub_responses: {
     describe_load_balancers: {
       load_balancers: [
         {
           load_balancer_arn:
-            'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:loadbalancer/app/my-elb/1aa1bb1cc1ddee11',
+            'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:loadbalancer/app/my-alb/1aa1bb1cc1ddee11',
           dns_name:
             'internal-my-elb-1551266724.ap-northeast-1.elb.amazonaws.com',
           canonical_hosted_zone_id: 'A12BCDEDCBA34BC',
           created_time: Time.new(2017, 4, 4, 9, 00, 00, '+00:00'),
-          load_balancer_name: 'my-elb',
+          load_balancer_name: 'my-alb',
           scheme: 'internal',
           vpc_id: 'vpc-ab123cde',
           state:
@@ -34,6 +35,22 @@ Aws.config[:elasticloadbalancingv2] = {
         }
       ],
       next_marker: nil
+    },
+    describe_listeners: {
+      listeners: [
+        {
+          default_actions: [
+            {
+              target_group_arn: 'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:targetgroup/my-targets/73e2d6bc24d8a067',
+              type: 'forward'
+            }
+          ],
+          listener_arn: 'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:listener/app/my-alb/1aa1bb1cc1ddee11/f2f7dc8efc522ab2',
+          load_balancer_arn: 'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:loadbalancer/app/my-alb/1aa1bb1cc1ddee11',
+          port: 80,
+          protocol: 'HTTP'
+        }
+      ]
     }
   }
 }

data/lib/awspec/stub/alb_listener.rb

@@ -0,0 +1,222 @@
+# rubocop:disable Metrics/LineLength
+Aws.config[:elasticloadbalancingv2] = {
+  stub_responses: {
+    describe_load_balancers: {
+      load_balancers: [
+        {
+          load_balancer_arn:
+            'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:loadbalancer/app/my-alb/1aa1bb1cc1ddee11',
+          dns_name:
+            'internal-my-elb-1551266724.ap-northeast-1.elb.amazonaws.com',
+          canonical_hosted_zone_id: 'A12BCDEDCBA34BC',
+          created_time: Time.new(2017, 4, 4, 9, 00, 00, '+00:00'),
+          load_balancer_name: 'my-alb',
+          scheme: 'internal',
+          vpc_id: 'vpc-ab123cde',
+          state:
+            {
+              code: 'active',
+              reason: nil
+            },
+          type: 'application',
+          availability_zones:
+            [
+              {
+                zone_name: 'ap-northeast-1a',
+                subnet_id: 'subnet-1234a567'
+              },
+              {
+                zone_name: 'ap-northeast-1c',
+                subnet_id: 'subnet-abcd7890'
+              }
+            ],
+          security_groups: ['sg-1a2b3cd4'],
+          ip_address_type: 'ipv4'
+        }
+      ],
+      next_marker: nil
+    },
+    describe_listeners: {
+      listeners: [
+        {
+          default_actions: [
+            {
+              target_group_arn: 'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:targetgroup/my-targets/73e2d6bc24d8a067',
+              type: 'forward'
+            }
+          ],
+          listener_arn: 'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:listener/app/my-alb/1aa1bb1cc1ddee11/f2f7dc8efc522ab2',
+          load_balancer_arn: 'arn:aws:elasticloadbalancing:ap-northeast-1:1234567890:loadbalancer/app/my-alb/1aa1bb1cc1ddee11',
+          port: 80,
+          protocol: 'HTTP'
+        }
+      ]
+    }
+  }
+}
+
+Aws.config[:ec2] = {
+  stub_responses: {
+    describe_security_groups: {
+      security_groups: [
+        {
+          vpc_id: 'vpc-ab123cde',
+          owner_id: '112233445566',
+          group_id: 'sg-1a2b3cd4',
+          group_name: 'my-security-group-name',
+          tags: [
+            {
+              key: 'env',
+              value: 'dev'
+            }
+          ],
+          ip_permissions: [
+            {
+              from_port: 80,
+              to_port: 80,
+              ip_protocol: 'tcp',
+              ip_ranges: [
+                {
+                  cidr_ip: '123.456.789.012/32'
+                },
+                {
+                  cidr_ip: '456.789.123.456/32'
+                }
+              ],
+              user_id_group_pairs: []
+            },
+            {
+              from_port: 22,
+              to_port: 22,
+              ip_protocol: 'tcp',
+              ip_ranges: [],
+              user_id_group_pairs: [
+                {
+                  group_id: 'sg-5a6b7cd8',
+                  group_name: 'group-name-sg'
+                }
+              ]
+            },
+            {
+              from_port: 60_000,
+              to_port: 60_000,
+              ip_protocol: 'tcp',
+              ip_ranges: [
+                {
+                  cidr_ip: '100.456.789.012/32'
+                }
+              ],
+              user_id_group_pairs: []
+            },
+            {
+              from_port: 70_000,
+              to_port: 70_000,
+              ip_protocol: 'tcp',
+              ip_ranges: [
+                {
+                  cidr_ip: '100.456.789.012/32'
+                }
+              ],
+              user_id_group_pairs: []
+            },
+            {
+              from_port: 70_000,
+              to_port: 70_000,
+              ip_protocol: 'tcp',
+              ip_ranges: [
+                {
+                  cidr_ip: '101.456.789.012/32'
+                }
+              ],
+              user_id_group_pairs: []
+            },
+            {
+              from_port: 50_000,
+              to_port: 50_009,
+              ip_protocol: 'tcp',
+              ip_ranges: [
+                {
+                  cidr_ip: '123.456.789.012/32'
+                }
+              ],
+              user_id_group_pairs: []
+            },
+            {
+              from_port: nil,
+              to_port: nil,
+              ip_protocol: '-1',
+              ip_ranges: [],
+              user_id_group_pairs: [
+                {
+                  user_id: '1234567890',
+                  group_name: nil,
+                  group_id: 'sg-3a4b5cd6',
+                  vpc_id: nil,
+                  vpc_peering_connection_id: nil,
+                  peering_status: nil
+                }
+              ]
+            }
+          ],
+          ip_permissions_egress: [
+            {
+              from_port: 50_000,
+              to_port: 50_000,
+              ip_protocol: 'tcp',
+              ip_ranges: [
+                {
+                  cidr_ip: '100.456.789.012/32'
+                }
+              ]
+            },
+            {
+              from_port: 8080,
+              to_port: 8080,
+              ip_protocol: 'tcp',
+              ip_ranges: [],
+              user_id_group_pairs: [
+                {
+                  user_id: '5678901234',
+                  group_name: 'group-in-other-aws-account-with-vpc-peering',
+                  group_id: 'sg-9a8b7c6d',
+                  vpc_id: 'vpc-5b6a7c8f',
+                  vpc_peering_connection_id: 'pcx-f9e8d7c6',
+                  peering_status: 'active'
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    describe_subnets: {
+      subnets: [
+        {
+          state: 'available',
+          vpc_id: 'vpc-ab123cde',
+          subnet_id: 'subnet-1234a567',
+          cidr_block: '10.0.1.0/24',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-subnet'
+            }
+          ]
+        }
+      ]
+    },
+    describe_vpcs: {
+      vpcs: [
+        {
+          vpc_id: 'vpc-ab123cde',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-vpc'
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

data/lib/awspec/type/acm.rb

@@ -5,7 +5,7 @@ module Awspec::Type
     end
 
     def id
-      @id = resource_via_client.certificate_arn if resource_via_client
+      @id ||= resource_via_client.certificate_arn if resource_via_client
     end
 
     STATUSES = %w(

data/lib/awspec/type/alb.rb

@@ -5,7 +5,7 @@ module Awspec::Type
     end
 
     def id
-      @id = resource_via_client.load_balancer_name if resource_via_client
+      @id ||= resource_via_client.load_balancer_name if resource_via_client
     end
 
     STATES = %w(
@@ -28,5 +28,15 @@ module Awspec::Type
       return true if sgs.include? sg2.group_id
       false
     end
+
+    def has_subnet?(subnet_id)
+      azs = resource_via_client.availability_zones
+      ret = azs.find do |az|
+        az.subnet_id == subnet_id
+      end
+      return true if ret
+      subnet2 = find_subnet(subnet_id)
+      subnet2.subnet_id = subnet_id
+    end
   end
 end

data/lib/awspec/type/alb_listener.rb

@@ -0,0 +1,11 @@
+module Awspec::Type
+  class AlbListener < ResourceBase
+    def resource_via_client
+      @resource_via_client ||= find_alb_listener(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.listener_arn if resource_via_client
+    end
+  end
+end

data/lib/awspec/type/elb.rb

@@ -5,7 +5,7 @@ module Awspec::Type
     end
 
     def id
-      @id = resource_via_client.load_balancer_name if resource_via_client
+      @id ||= resource_via_client.load_balancer_name if resource_via_client
     end
 
     health_check_options = %w(

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.82.3'
+  VERSION = '0.83.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.82.3
+  version: 0.83.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -208,6 +208,7 @@ files:
 - bin/toolbox
 - doc/_resource_types/acm.md
 - doc/_resource_types/alb.md
+- doc/_resource_types/alb_listener.md
 - doc/_resource_types/ami.md
 - doc/_resource_types/autoscaling_group.md
 - doc/_resource_types/cloudfront_distribution.md
@@ -277,6 +278,7 @@ files:
 - lib/awspec/generator/doc/type/account_attribute_base.rb
 - lib/awspec/generator/doc/type/acm.rb
 - lib/awspec/generator/doc/type/alb.rb
+- lib/awspec/generator/doc/type/alb_listener.rb
 - lib/awspec/generator/doc/type/ami.rb
 - lib/awspec/generator/doc/type/autoscaling_group.rb
 - lib/awspec/generator/doc/type/base.rb
@@ -432,6 +434,7 @@ files:
 - lib/awspec/stub/account.rb
 - lib/awspec/stub/acm.rb
 - lib/awspec/stub/alb.rb
+- lib/awspec/stub/alb_listener.rb
 - lib/awspec/stub/ami.rb
 - lib/awspec/stub/autoscaling_group.rb
 - lib/awspec/stub/cloudfront_distribution.rb
@@ -490,6 +493,7 @@ files:
 - lib/awspec/type/account_attribute_base.rb
 - lib/awspec/type/acm.rb
 - lib/awspec/type/alb.rb
+- lib/awspec/type/alb_listener.rb
 - lib/awspec/type/ami.rb
 - lib/awspec/type/autoscaling_group.rb
 - lib/awspec/type/base.rb