Skip to content

Commit

Permalink
move to aws v3 api, and fix travis tests to work again
Browse files Browse the repository at this point in the history
Signed-off-by: Jaymz Julian <[email protected]>
  • Loading branch information
jjlimepoint committed Jul 13, 2018
1 parent 44f8195 commit e5dd141
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: false
language: ruby
rvm:
- 2.3.1
- 2.4.2
env:
global:
# encrypted with `travis encrypt "AWS_ACCESS_KEY_ID=... AWS_SECRET_ACCESS_KEY=..."`
Expand All @@ -10,10 +10,10 @@ env:
- RAKE_TASK=spec
# We run the tests in different environments so they don't try to overwrite each other (deleting, creating the same VPC)
# If we need to we can get rid of this but its nice for speed
- RAKE_TASK="travis[integration]" AWS_TRAVIS_DRIVER=aws::us-west-2
- RAKE_TASK="travis[super_slow]" AWS_TRAVIS_DRIVER=aws::us-west-1
- RAKE_TASK="travis[integration]" AWS_TEST_DRIVER=aws::us-west-2
- RAKE_TASK="travis[super_slow]" AWS_TEST_DRIVER=aws::us-west-1
# machine_image is a special snowflake - they take so long to run we need to give them their own builder
- RAKE_TASK="machine_image" AWS_TRAVIS_DRIVER=aws::eu-west-1
- RAKE_TASK="machine_image" AWS_TEST_DRIVER=aws::eu-west-1

before_script:
- mkdir -p /home/travis/.chef
Expand Down
2 changes: 1 addition & 1 deletion chef-provisioning-aws.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |s|

s.add_dependency 'chef-provisioning', '>= 1.0', '< 3.0'

s.add_dependency 'aws-sdk', ['>= 2.2.18', '< 3.0']
s.add_dependency 'aws-sdk', ['>= 2.2.18', '< 4.0']
s.add_dependency 'retryable', '~> 2.0', '>= 2.0.1'
s.add_dependency 'ubuntu_ami', '~> 0.4', '>= 0.4.1'

Expand Down
2 changes: 1 addition & 1 deletion lib/chef/provisioning/aws_driver/version.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Chef
module Provisioning
module AWSDriver
VERSION = '3.0.2'
VERSION = '4.0.0'
end
end
end
2 changes: 1 addition & 1 deletion lib/chef/resource/aws_nat_gateway.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# We provide this class because the AWS SDK V2 does not provide it (as of
# May 2016). We copied the pattern in their SDK so when they do add a real
# resource there shouldn't be a need for much translation.
class Aws::EC2::NatGateway < ::Aws::Resources::Resource
class Aws::EC2::NatGateway # < ::Aws::Resources::Resource
attr_reader :resource, :id, :nat_gateway_id, :vpc_id, :subnet_id, :nat_gateway_addresses

def initialize(id, options = {})
Expand Down

0 comments on commit e5dd141

Please sign in to comment.