Merge branch 'master' into dtan4/use-latest-ruby-1904

adonishi · Apr 21, 2019 · 2aa49c2 · 2aa49c2
2 parents 885ca53 + 1b5585f
commit 2aa49c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/spec/lib/terraforming/resource/efs_file_system_spec.rb b/spec/lib/terraforming/resource/efs_file_system_spec.rb
@@ -18,6 +18,7 @@ module Resource
           owner_id: "999999999999",
           performance_mode: "generalPurpose",
           size_in_bytes: { value: 6144 },
+          tags: [],
         }
       end
 
@@ -32,6 +33,7 @@ module Resource
           owner_id: "999999999999",
           performance_mode: "generalPurpose",
           size_in_bytes: { value: 23481234 },
+          tags: [],
         }
       end
 

diff --git a/terraforming.gemspec b/terraforming.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-autoscaling", "~> 1"
   spec.add_dependency "aws-sdk-cloudwatch", "~> 1"
   spec.add_dependency "aws-sdk-ec2", "~> 1"
-  spec.add_dependency "aws-sdk-efs", "~> 1"
+  spec.add_dependency "aws-sdk-efs", "~> 1", ">= 1.13.0"
   spec.add_dependency "aws-sdk-elasticache", "~> 1"
   spec.add_dependency "aws-sdk-elasticloadbalancing", "~> 1"
   spec.add_dependency "aws-sdk-elasticloadbalancingv2", "~> 1"
@@ -37,7 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "multi_json", "~> 1.12.1"
   spec.add_dependency "thor"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "coveralls", "~> 0.8.13"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.2"