awspec 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a905721558237afba127319af4db1276f903347
-  data.tar.gz: 13acb88e7253a96c4bd8eb23afea29c5fb934c37
+  metadata.gz: 8160e6d118ed605184bcc364565d0a5c0653ee65
+  data.tar.gz: eee4aee22a2cb01f93b81a194a251f79b4ab4560
 SHA512:
-  metadata.gz: d5af22547903d27edce8b88bba5b627578ba1b5e1d0783d549bb48e024e3a30e8aaedd61ea922685155009f9c9143791e84784f6dc6731990102b1578baa1542
-  data.tar.gz: 74fbb35e7cb25517623416b245e48fea042c381356960562f63ec387a6f2eb6e2a3f72e8496e0884796635fe93ddffe0a72a721cbd5d06a132ede3571509811e
+  metadata.gz: 1c150a676daa377f6b74514572b6af6a123dc9d269f3bb1cea0822945e57bd367947f66ace85627eec04eb2d79f32c3254fa0f1c8185c3d1cc654c4be4adeaea
+  data.tar.gz: c9b2d48ec1c1db7e08f59a13df0e6feeecc5cbc3652a9379f103395a15e7c784be6cd1cfcc51627fc230305f76237200a3a9f3ed5ffd9310eb7fefe8a21d2d7f

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: 2.1
+
 Lint/Eval:
   Enabled: false
 
@@ -25,6 +28,12 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 15
 
+Performance/StringReplacement:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
 Style/BarePercentLiterals:
   Enabled: false
 
@@ -34,6 +43,12 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
+Style/MutableConstant:
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  Enabled: false
+
 Style/StabbyLambdaParentheses:
   Enabled: false
 

data/awspec.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rspec', '~> 3.0'
   spec.add_runtime_dependency 'rspec-its'
   spec.add_runtime_dependency 'aws-sdk', '~> 2.1'
-  spec.add_runtime_dependency 'aws_config'
+  spec.add_runtime_dependency 'awsecrets', '~> 0.2'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'term-ansicolor'

data/doc/_resource_types/ec2.md

@@ -48,6 +48,14 @@ describe ec2('my-ec2') do
 end
 ```
 
+### have_tag
+
+```ruby
+describe ec2('my-ec2') do
+  it { should have_tag('Name').value('my-ec2') }
+end
+```
+
 ### belong_to_subnet
 
 ```ruby

data/doc/_resource_types/network_acl.md

@@ -14,6 +14,14 @@ describe network_acl('my-network-acl') do
 end
 ```
 
+### have_tag
+
+```ruby
+describe network_acl('my-network-acl') do
+  it { should have_tag('Name').value('my-network-acl') }
+end
+```
+
 ### belong_to_vpc
 
 ```ruby

data/doc/_resource_types/route_table.md

@@ -26,6 +26,14 @@ describe route_table('my-route-table') do
 end
 ```
 
+### have_tag
+
+```ruby
+describe route_table('my-route-table') do
+  it { should have_tag('Name').value('my-route-table') }
+end
+```
+
 ### advanced
 
 `route_table` can use `Aws::EC2::RouteTable` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/RouteTable.html).

data/doc/_resource_types/subnet.md

@@ -14,6 +14,14 @@ describe subnet('my-subnet') do
 end
 ```
 
+### have_tag
+
+```ruby
+describe subnet('my-subnet') do
+  it { should have_tag('Environment').value('QA') }
+end
+```
+
 ### advanced
 
 `subnet` can use `Aws::EC2::Subnet` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Subnet.html).

data/doc/_resource_types/vpc.md

@@ -27,8 +27,16 @@ end
 
 ```ruby
 describe vpc('vpc-ab123cde') do
-  it { should have_network_acl('acl-1abc2d3e') }
-  it { should have_network_acl('my-network-acl') }
+  it { should have_route_table('rtb-ab123cde') }
+  it { should have_route_table('my-route-table') }
+end
+```
+
+### have_tag
+
+```ruby
+describe vpc('vpc-ab123cde') do
+  it { should have_tag('Stack').value('Networking') }
 end
 ```
 

data/doc/resource_types.md

@@ -280,6 +280,15 @@ end
 ```
 
 
+### have_tag
+
+```ruby
+describe ec2('my-ec2') do
+  it { should have_tag('Name').value('my-ec2') }
+end
+```
+
+
 ### belong_to_subnet
 
 ```ruby
@@ -639,7 +648,7 @@ end
 
 This matcher does not support Amazon S3 event sources. ( [See SDK doc](http://docs.aws.amazon.com/sdkforruby/api/Aws/Lambda/Client.html#list_event_source_mappings-instance_method) )
 
-### its(:function_name), its(:function_arn), its(:runtime), its(:role), its(:handler), its(:code_size), its(:description), its(:timeout), its(:memory_size), its(:last_modified), its(:code_sha_256), its(:version)
+### its(:function_name), its(:function_arn), its(:runtime), its(:role), its(:handler), its(:code_size), its(:description), its(:timeout), its(:memory_size), its(:last_modified), its(:code_sha_256), its(:version), its(:vpc_config)
 ## <a name="launch_configuration">launch_configuration</a>
 
 LaunchConfiguration resource type.
@@ -724,6 +733,15 @@ end
 ```
 
 
+### have_tag
+
+```ruby
+describe network_acl('my-network-acl') do
+  it { should have_tag('Name').value('my-network-acl') }
+end
+```
+
+
 ### belong_to_vpc
 
 ```ruby
@@ -950,6 +968,15 @@ end
 ```
 
 
+### have_tag
+
+```ruby
+describe route_table('my-route-table') do
+  it { should have_tag('Name').value('my-route-table') }
+end
+```
+
+
 ### its(:route_table_id), its(:vpc_id)
 ### :unlock: Advanced use
 
@@ -1160,6 +1187,15 @@ end
 ```
 
 
+### have_tag
+
+```ruby
+describe subnet('my-subnet') do
+  it { should have_tag('Environment').value('QA') }
+end
+```
+
+
 ### its(:subnet_id), its(:state), its(:vpc_id), its(:cidr_block), its(:available_ip_address_count), its(:availability_zone), its(:default_for_az), its(:map_public_ip_on_launch)
 ### :unlock: Advanced use
 
@@ -1215,8 +1251,17 @@ end
 
 ```ruby
 describe vpc('vpc-ab123cde') do
-  it { should have_network_acl('acl-1abc2d3e') }
-  it { should have_network_acl('my-network-acl') }
+  it { should have_route_table('rtb-ab123cde') }
+  it { should have_route_table('my-route-table') }
+end
+```
+
+
+### have_tag
+
+```ruby
+describe vpc('vpc-ab123cde') do
+  it { should have_tag('Stack').value('Networking') }
 end
 ```
 

data/lib/awspec.rb

@@ -3,6 +3,7 @@ require 'rspec'
 require 'rspec/its'
 require 'time'
 require 'active_support/inflector'
+require 'awsecrets'
 require 'awspec/version'
 require 'awspec/cli'
 require 'awspec/stub'

data/lib/awspec/command/generate.rb

@@ -1,6 +1,5 @@
 require 'thor'
 require 'awspec/setup'
-require 'awspec/helper/credentials_loader'
 
 module Awspec
   class Generate < Thor
@@ -13,7 +12,7 @@ module Awspec
     types.each do |type|
       desc type + ' [vpc_id]', "Generate #{type} spec from VPC ID (or VPC \"Name\" tag)"
       define_method type do |*args|
-        Awspec::Helper::CredentialsLoader.load(options[:profile])
+        Awsecrets.load(profile: options[:profile])
         vpc_id = args.first
         eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_by_vpc_id(vpc_id)"
       end
@@ -21,13 +20,13 @@ module Awspec
 
     desc 'route53_hosted_zone [example.com.]', 'Generate route53_hosted_zone spec from Domain name'
     def route53_hosted_zone(hosted_zone)
-      Awspec::Helper::CredentialsLoader.load(options[:profile])
+      Awsecrets.load(profile: options[:profile])
       puts Awspec::Generator::Spec::Route53HostedZone.new.generate_by_domain_name(hosted_zone)
     end
 
     desc 's3_bucket [backet_name]', 'Generate s3_bucket spec from S3 bucket name. if NO args, Generate all.'
     def s3_bucket(bucket_name = nil)
-      Awspec::Helper::CredentialsLoader.load(options[:profile])
+      Awsecrets.load(profile: options[:profile])
       if bucket_name
         puts Awspec::Generator::Spec::S3Bucket.new.generate(bucket_name)
       else
@@ -46,7 +45,7 @@ module Awspec
         desc type, "Generate #{type} spec"
       end
       define_method type do
-        Awspec::Helper::CredentialsLoader.load(options[:profile])
+        Awsecrets.load(profile: options[:profile])
         eval "puts Awspec::Generator::Spec::#{type.camelize}.new.generate_all"
       end
     end

data/lib/awspec/generator/spec/cloudwatch_alarm.rb

@@ -4,7 +4,7 @@ module Awspec::Generator
       include Awspec::Helper::Finder
       def generate_all
         alarms = select_all_cloudwatch_alarms
-        alarms.empty? && fail('Not Found alarm')
+        raise 'Not Found alarm' if alarms.empty?
         ERB.new(alarm_spec_template, nil, '-').result(binding).chomp
       end
 

data/lib/awspec/generator/spec/directconnect.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
 
       def generate_virtual_interface_all
         virtual_interfaces = select_virtual_interfaces
-        virtual_interfaces.empty? && fail('Not Found virtual_interfaces')
+        raise 'Not Found virtual_interfaces' if virtual_interfaces.empty?
         ERB.new(virtual_interface_spec_template, nil, '-').result(binding).chomp
       end
 

data/lib/awspec/generator/spec/ebs.rb

@@ -4,7 +4,7 @@ module Awspec::Generator
       include Awspec::Helper::Finder
       def generate_all
         volumes = select_all_attached_ebs
-        volumes.empty? && fail('Not Found EBS')
+        raise 'Not Found EBS' if volumes.empty?
         specs = volumes.map do |volume|
           attachment_specs = generate_attachment_specs(volume)
           content = ERB.new(ebs_spec_template, nil, '-').result(binding).gsub(/^\n/, '')

data/lib/awspec/generator/spec/ec2.rb

@@ -8,7 +8,7 @@ module Awspec::Generator
           instance_type private_ip_address public_ip_address
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         instances = select_ec2_by_vpc_id(@vpc_id)

data/lib/awspec/generator/spec/elb.rb

@@ -11,7 +11,7 @@ module Awspec::Generator
           unhealthy_threshold healthy_threshold
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         lbs = select_elb_by_vpc_id(@vpc_id)
@@ -22,7 +22,6 @@ module Awspec::Generator
         specs.join("\n")
       end
 
-      # rubocop:disable all
       def elb_spec_template
         template = <<-'EOF'
 describe elb('<%= lb.load_balancer_name %>') do

data/lib/awspec/generator/spec/iam_policy.rb

@@ -4,7 +4,7 @@ module Awspec::Generator
       include Awspec::Helper::Finder
       def generate_all
         policies = select_all_attached_policies
-        policies.empty? && fail('Not Found policy')
+        raise 'Not Found policy' if policies.empty?
         ERB.new(policy_spec_template, nil, '-').result(binding).chomp
       end
 

data/lib/awspec/generator/spec/nat_gateway.rb

@@ -6,7 +6,7 @@ module Awspec::Generator
         describes = %w(
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         nat_gateways = select_nat_gateway_by_vpc_id(@vpc_id)

data/lib/awspec/generator/spec/network_acl.rb

@@ -6,7 +6,7 @@ module Awspec::Generator
         describes = %w(
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         network_acls = select_network_acl_by_vpc_id(@vpc_id)
@@ -30,11 +30,11 @@ module Awspec::Generator
         specs = []
         acl.associations.each do |a|
           subnet = find_subnet(a.subnet_id)
-          if subnet.tag_name
-            spec = "it { should have_subnet('" + subnet.tag_name + "') }"
-          else
-            spec = "it { should have_subnet('" + subnet.subnet_id + "') }"
-          end
+          spec = if subnet.tag_name
+                   "it { should have_subnet('" + subnet.tag_name + "') }"
+                 else
+                   "it { should have_subnet('" + subnet.subnet_id + "') }"
+                 end
           specs.push(spec)
         end
         specs
@@ -52,11 +52,11 @@ module Awspec::Generator
           line += ' ' + actions[entry.rule_action.to_sym]
           port_range = entry.port_range
           unless port_range.nil?
-            if port_range.from == port_range.to
-              port = port_range.from.to_s
-            else
-              port = "'" + port_range.from.to_s + '-' + port_range.to.to_s + "'"
-            end
+            port = if port_range.from == port_range.to
+                     port_range.from.to_s
+                   else
+                     "'" + port_range.from.to_s + '-' + port_range.to.to_s + "'"
+                   end
             line += '(' + port + ')'
           end
           line += ".protocol('" + protocols[entry.protocol.to_i] + "')"

data/lib/awspec/generator/spec/rds.rb

@@ -7,7 +7,7 @@ module Awspec::Generator
           db_instance_identifier db_instance_class multi_az availability_zone
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         db_instances = select_rds_by_vpc_id(@vpc_id)

data/lib/awspec/generator/spec/route53_hosted_zone.rb

@@ -4,7 +4,7 @@ module Awspec::Generator
       include Awspec::Helper::Finder
       def generate_by_domain_name(id)
         hosted_zone = find_hosted_zone(id)
-        fail 'Not Found Route53 Hosted Zone' unless hosted_zone
+        raise 'Not Found Route53 Hosted Zone' unless hosted_zone
         id = hosted_zone[:id]
         res = @route53_client.list_resource_record_sets({
                                                           hosted_zone_id: id
@@ -24,7 +24,6 @@ it { should have_record_set('<%= name %>').<%= type %>('<%= v %>').ttl(<%= recor
 EOF
           v = record_set.resource_records.map { |r| r.value }.join("\n")
           type = record_set.type.downcase
-          return ERB.new(template, nil, '-').result(binding)
         else
           # ALIAS
           dns_name = record_set.alias_target.dns_name
@@ -32,8 +31,8 @@ EOF
           template = <<-'EOF'
 it { should have_record_set('<%= name %>').alias('<%= dns_name %>', '<%= hosted_zone_id %>') }
 EOF
-          return ERB.new(template, nil, '-').result(binding)
         end
+        ERB.new(template, nil, '-').result(binding)
       end
 
       def route53_hosted_zone_spec_template

data/lib/awspec/generator/spec/route_table.rb

@@ -6,7 +6,7 @@ module Awspec::Generator
         describes = %w(
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         route_tables = select_route_table_by_vpc_id(@vpc_id)
@@ -67,7 +67,6 @@ EOF
         template
       end
 
-      # rubocop:disable Metrics/LineLength
       def route_table_spec_connection_linetemplate
         template = <<-'EOF'
 <%- if connection.tag_name -%>
@@ -78,7 +77,6 @@ it { should have_route('<%= route.destination_cidr_block %>').target(vpc_peering
 EOF
         template
       end
-      # rubocop:enable Metrics/LineLength
 
       def route_table_spec_nat_linetemplate
         template = <<-'EOF'

data/lib/awspec/generator/spec/s3_bucket.rb

@@ -4,7 +4,7 @@ module Awspec::Generator
       include Awspec::Helper::Finder
       def generate_all
         buckets = select_all_buckets
-        buckets.empty? && fail('Not Found Bucket')
+        raise 'Not Found Bucket' if buckets.empty?
         specs = buckets.map do |bucket|
           content(bucket)
         end

data/lib/awspec/generator/spec/security_group.rb

@@ -7,7 +7,7 @@ module Awspec::Generator
           group_id group_name
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         sgs = select_security_group_by_vpc_id(@vpc_id)
@@ -35,11 +35,11 @@ module Awspec::Generator
               next
             end
 
-            if permission.from_port == permission.to_port
-              port = permission.from_port
-            else
-              port = "'" + permission.from_port.to_s + '-' + permission.to_port.to_s + "'"
-            end
+            port = if permission.from_port == permission.to_port
+                     permission.from_port
+                   else
+                     "'" + permission.from_port.to_s + '-' + permission.to_port.to_s + "'"
+                   end
 
             protocol = permission.ip_protocol
             permission.ip_ranges.each do |ip_range|

data/lib/awspec/generator/spec/subnet.rb

@@ -7,7 +7,7 @@ module Awspec::Generator
           subnet_id cidr_block
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         subnets = select_subnet_by_vpc_id(@vpc_id)

data/lib/awspec/generator/spec/vpc.rb

@@ -7,7 +7,7 @@ module Awspec::Generator
           vpc_id cidr_block
         )
         vpc = find_vpc(vpc_id)
-        fail 'Not Found VPC' unless vpc
+        raise 'Not Found VPC' unless vpc
         @vpc_id = vpc[:vpc_id]
         @vpc_tag_name = vpc.tag_name
         route_tables = select_route_table_by_vpc_id(@vpc_id)

data/lib/awspec/helper.rb

@@ -1,7 +1,6 @@
 require 'awspec/helper/color'
 require 'awspec/helper/type'
 require 'awspec/helper/finder'
-require 'awspec/helper/credentials_loader'
 extend Awspec::Helper::Type
 class RSpec::Core::ExampleGroup
   extend Awspec::Helper::Type

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

@@ -32,6 +32,7 @@ module Awspec::Helper
         else
           return nil
         end
+        # rubocop:enable Style/GuardClause
         return res[:reservations].first[:instances].first if res[:reservations].count == 1 && \
                                                              res[:reservations].first[:instances].count == 1
       end

data/lib/awspec/matcher.rb

@@ -1,6 +1,7 @@
 # EC2
 require 'awspec/matcher/belong_to_vpc'
 require 'awspec/matcher/belong_to_subnet'
+require 'awspec/matcher/have_tag'
 
 # RDS
 require 'awspec/matcher/belong_to_db_subnet_group'

data/lib/awspec/matcher/have_tag.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_tag do |key|
+  match do |type|
+    type.has_tag?(key, @value)
+  end
+
+  chain :value do |val|
+    @value = val
+  end
+end

data/lib/awspec/resource_reader.rb

@@ -4,17 +4,14 @@ module Awspec
     end
 
     def method_missing_via_black_list(name, delegate_to: nil)
-      fail(ArguementError, 'delegate_to: must be specified') unless delegate_to
-      if match_black_list?(name)
-        fail CalledMethodInBlackList, "Method call #{name.inspect} is black-listed"
+      raise ArguementError, 'delegate_to: must be specified' unless delegate_to
+      raise CalledMethodInBlackList, "Method call #{name.inspect} is black-listed" if match_black_list?(name)
+      attr = delegate_to.send(name)
+      case attr
+      when Aws::Resources::Resource
+        ResourceReader.new(attr)
       else
-        attr = delegate_to.send(name)
-        case attr
-        when Aws::Resources::Resource
-          ResourceReader.new(attr)
-        else
-          attr
-        end
+        attr
       end
     end
 

data/lib/awspec/setup.rb

@@ -13,7 +13,7 @@ module Awspec
     def self.generate_spec_helper
       content = <<-'EOF'
 require 'awspec'
-Awspec::Helper::CredentialsLoader.load
+Awsecrets.load(secrets_path: File.expand_path('./secrets.yml', File.dirname(__FILE__)))
 EOF
       dir = 'spec'
       if File.exist? dir

data/lib/awspec/type/base.rb

@@ -33,6 +33,14 @@ module Awspec::Type
       end
     end
 
+    def self.tags_allowed
+      define_method :has_tag? do |key, value|
+        tags = @resource_via_client[:tags]
+        return false unless tags
+        tags.any? { |t| t['key'] == key && t['value'] == value }
+      end
+    end
+
     def method_missing(name)
       describe = name.to_sym
       if @resource_via_client.members.include?(describe)

data/lib/awspec/type/ec2.rb

@@ -1,6 +1,7 @@
 module Awspec::Type
   class Ec2 < Base
     aws_resource Aws::EC2::Instance
+    tags_allowed
 
     def initialize(id)
       super

data/lib/awspec/type/network_acl.rb

@@ -1,6 +1,7 @@
 module Awspec::Type
   class NetworkAcl < Base
     aws_resource Aws::EC2::NetworkAcl
+    tags_allowed
 
     def initialize(id)
       super

data/lib/awspec/type/route53_hosted_zone.rb

@@ -11,7 +11,8 @@ module Awspec::Type
     def has_record_set?(name, type, value, options = {})
       name.gsub!(/\*/, '\\\052') # wildcard support
       ret = @resource_via_client_record_sets.find do |record_set|
-        next if record_set.type != type.upcase
+        # next if record_set.type != type.upcase
+        next unless record_set.type.casecmp(type) == 0
         options[:ttl] = record_set.ttl unless options[:ttl]
         if !record_set.resource_records.empty?
           v = record_set.resource_records.map { |r| r.value }.join("\n")

data/lib/awspec/type/route_table.rb

@@ -1,6 +1,7 @@
 module Awspec::Type
   class RouteTable < Base
     aws_resource Aws::EC2::RouteTable
+    tags_allowed
 
     def initialize(id)
       super

data/lib/awspec/type/security_group.rb

@@ -10,11 +10,8 @@ module Awspec::Type
     end
 
     def opened?(port = nil, protocol = nil, cidr = nil)
-      if @inbound
-        return inbound_opened?(port, protocol, cidr)
-      else
-        return outbound_opened?(port, protocol, cidr)
-      end
+      return inbound_opened?(port, protocol, cidr) if @inbound
+      outbound_opened?(port, protocol, cidr)
     end
 
     def inbound_opened?(port = nil, protocol = nil, cidr = nil)

data/lib/awspec/type/subnet.rb

@@ -1,6 +1,7 @@
 module Awspec::Type
   class Subnet < Base
     aws_resource Aws::EC2::Subnet
+    tags_allowed
 
     def initialize(id)
       super

data/lib/awspec/type/vpc.rb

@@ -1,6 +1,7 @@
 module Awspec::Type
   class Vpc < Base
     aws_resource Aws::EC2::Vpc
+    tags_allowed
 
     def initialize(id)
       super

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.30.0'
+  VERSION = '0.31.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: aws_config
+  name: awsecrets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +281,6 @@ files:
 - lib/awspec/generator/template.rb
 - lib/awspec/helper.rb
 - lib/awspec/helper/color.rb
-- lib/awspec/helper/credentials_loader.rb
 - lib/awspec/helper/finder.rb
 - lib/awspec/helper/finder/ami.rb
 - lib/awspec/helper/finder/autoscaling.rb
@@ -314,6 +313,7 @@ files:
 - lib/awspec/matcher/belong_to_vpc.rb
 - lib/awspec/matcher/have_record_set.rb
 - lib/awspec/matcher/have_route.rb
+- lib/awspec/matcher/have_tag.rb
 - lib/awspec/resource_reader.rb
 - lib/awspec/setup.rb
 - lib/awspec/stub.rb

data/lib/awspec/helper/credentials_loader.rb

@@ -1,30 +0,0 @@
-require 'aws-sdk'
-require 'aws_config'
-
-module Awspec::Helper
-  module CredentialsLoader
-    def self.load(profile = nil)
-      profile = ENV['AWS_PROFILE'] if profile.nil?
-      if profile
-        # SharedCredentials
-        aws_config = AWSConfig.profiles[profile]
-        aws_config = AWSConfig.profiles['default'] unless aws_config
-        Aws.config[:region] = aws_config.config_hash[:region] if aws_config
-        Aws.config[:credentials] = Aws::SharedCredentials.new(profile_name: profile)
-      else
-        # secrets.yml
-        creds = YAML.load_file('spec/secrets.yml') if File.exist?('spec/secrets.yml')
-        creds = YAML.load_file('secrets.yml') if File.exist?('secrets.yml')
-        return if creds.nil?
-        Aws.config.update({
-                            region: creds['region']
-                          }) if creds.include?('region')
-        Aws.config.update({
-                            credentials: Aws::Credentials.new(
-                              creds['aws_access_key_id'],
-                              creds['aws_secret_access_key'])
-                          }) if creds.include?('aws_access_key_id') && creds.include?('aws_secret_access_key')
-      end
-    end
-  end
-end