fog-aws 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b81ad3bfcfe0482650342c825be51289c0530ab5
-  data.tar.gz: 72f9f0dfc281ec1454f318a43d148bd049b68b21
+  metadata.gz: f7ed98704279ce0f10689cfe548af6163b1ab02f
+  data.tar.gz: 2e2b92d7a351e877f6cfc012626e1b8dbdbbc73d
 SHA512:
-  metadata.gz: 9a06e4f197b2cdc74e01d4e3b975fcfc696b44c09fd82e2ffef77e35b84697a6b9afcdfb271f68ecb7d7a3b0326d7f0898742a2ca0d58d6f120e371e5cc12266
-  data.tar.gz: eb2936873d29e923a8a9e9b66d0fa3aba653c185332c0ee733ccecf44d29db09911b22c7be59d4a8b9aa7dfa208bad09ea3d3418a5ef2103fa8c79dad0a5b1eb
+  metadata.gz: 1e59ea6e563f7bf85eabe38ac7d3507f5b7c4b6a0c9d205ff10d187052894a3bdb53c9299c97d929255ccdaf1142c71d0e03f0a7688a46d5bae71d4070c77018
+  data.tar.gz: e32073dbc8772718f1cd830226b6543023f5f543bb80b5a5f9a40c26c9fcf0b5ec024dae8e52258afdc8f6f367538fc4ec3b56a3c718b55125865b00c9dbb55d

data/CHANGELOG.md

@@ -2,7 +2,21 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v0.13.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.0.0...HEAD)
+
+**Closed issues:**
+
+- Support new Ohio region \(us-east-2\) [\#313](https://github.com/fog/fog-aws/issues/313)
+
+**Merged pull requests:**
+
+- Canada and London regions [\#333](https://github.com/fog/fog-aws/pull/333) ([mattheworiordan](https://github.com/mattheworiordan))
+- Updated ELB Dual Stack hosted zone DNS records [\#332](https://github.com/fog/fog-aws/pull/332) ([mattheworiordan](https://github.com/mattheworiordan))
+- Added support for attaching auto scaling groups to target groups [\#330](https://github.com/fog/fog-aws/pull/330) ([maf23](https://github.com/maf23))
+- credential\_fetcher: Mark AWS metadata calls as idempotent [\#329](https://github.com/fog/fog-aws/pull/329) ([mtekel](https://github.com/mtekel))
+
+## [v1.0.0](https://github.com/fog/fog-aws/tree/v1.0.0) (2016-12-12)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v0.13.0...v1.0.0)
 
 **Merged pull requests:**
 

data/lib/fog/aws.rb

@@ -228,7 +228,7 @@ module Fog
     end
 
     def self.regions
-      @regions ||= ['ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'sa-east-1', 'cn-north-1', 'us-gov-west-1', 'ap-south-1']
+      @regions ||= ['ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'ca-central-1', 'eu-west-1', 'eu-west-2', 'us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'sa-east-1', 'cn-north-1', 'us-gov-west-1', 'ap-south-1']
     end
 
     def self.validate_region!(region, host=nil)

data/lib/fog/aws/auto_scaling.rb

@@ -12,6 +12,7 @@ module Fog
 
       request_path 'fog/aws/requests/auto_scaling'
       request :attach_load_balancers
+      request :attach_load_balancer_target_groups
       request :create_auto_scaling_group
       request :create_launch_configuration
       request :create_or_update_tags
@@ -35,6 +36,7 @@ module Fog
       request :describe_tags
       request :describe_termination_policy_types
       request :detach_load_balancers
+      request :detach_load_balancer_target_groups
       request :detach_instances
       request :attach_instances
       request :disable_metrics_collection

data/lib/fog/aws/credential_fetcher.rb

@@ -21,15 +21,15 @@ module Fog
               if ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
                 connection = options[:connection] || Excon.new(CONTAINER_CREDENTIALS_HOST)
                 credential_path = options[:credential_path] || ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
-                role_data = connection.get(:path => credential_path, :expects => 200).body
+                role_data = connection.get(:path => credential_path, :idempotent => true, :expects => 200).body
 
                 connection = options[:metadata_connection] || Excon.new(INSTANCE_METADATA_HOST)
-                az_data = connection.get(:path => INSTANCE_METADATA_AZ, :expects => 200).body
+                az_data = connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body
               else
                 connection = options[:connection] || Excon.new(INSTANCE_METADATA_HOST)
-                role_name = connection.get(:path => INSTANCE_METADATA_PATH, :expects => 200).body
-                role_data = connection.get(:path => INSTANCE_METADATA_PATH+role_name, :expects => 200).body
-                az_data = connection.get(:path => INSTANCE_METADATA_AZ, :expects => 200).body
+                role_name = connection.get(:path => INSTANCE_METADATA_PATH, :idempotent => true, :expects => 200).body
+                role_data = connection.get(:path => INSTANCE_METADATA_PATH+role_name, :idempotent => true, :expects => 200).body
+                az_data = connection.get(:path => INSTANCE_METADATA_AZ, :idempotent => true, :expects => 200).body
               end
 
               region = az_data[0..-2] # get region from az

data/lib/fog/aws/models/auto_scaling/group.rb

@@ -75,6 +75,18 @@ module Fog
           reload
         end
 
+        def attach_load_balancer_target_groups(*target_group_arns)
+          requires :id
+          service.attach_load_balancer_target_groups(id, 'TargetGroupARNs' => target_group_arns)
+          reload
+        end
+
+        def detach_load_balancer_target_groups(*target_group_arns)
+          requires :id
+          service.detach_load_balancer_target_groups(id, 'TargetGroupARNs' => target_group_arns)
+          reload
+        end
+
         def disable_metrics_collection(metrics = {})
           requires :id
           service.disable_metrics_collection(id, 'Metrics' => metrics)

data/lib/fog/aws/requests/auto_scaling/attach_load_balancer_target_groups.rb

@@ -0,0 +1,58 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Attaches one or more load balancer target groups to the specified Auto Scaling
+        # group.
+        #
+        # ==== Parameters
+        # * auto_scaling_group_name<~String> - The name of the Auto Scaling
+        # group.
+        # * options<~Hash>:
+        # 'TagetGroupARNs'<~Array> - A list of target group arns to use.
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_AttachLoadBalancerTargetGroups.html
+        #
+
+        ExpectedOptions[:attach_load_balancer_target_groups] = %w[TargetGroupARNs]
+
+        def attach_load_balancer_target_groups(auto_scaling_group_name, options = {})
+          if target_group_arns = options.delete('TargetGroupARNs')
+            options.merge!(AWS.indexed_param('TargetGroupARNs.member.%d', *target_group_arns))
+          end
+
+          request({
+            'Action'               => 'AttachLoadBalancerTargetGroups',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+
+      end
+
+      class Mock
+        def attach_load_balancer_target_groups(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - ExpectedOptions[:attach_load_balancer_target_groups]
+
+          unless unexpected_options.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")
+          end
+
+          unless self.data[:auto_scaling_groups].key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/auto_scaling/detach_load_balancer_target_groups.rb

@@ -0,0 +1,57 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Removes one or more load balancer target groups from the specified
+        # Auto Scaling group.
+        #
+        # ==== Parameters
+        # * auto_scaling_group_name<~String> - The name of the Auto Scaling
+        # group.
+        # * options<~Hash>:
+        # 'TargetGroupARNs'<~Array> - A list of target groups to detach.
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AutoScaling/latest/APIReference/API_DetachLoadBalancerTargetGroups.html
+        #
+
+        ExpectedOptions[:detach_load_balancer_target_groups] = %w[TargetGroupARNs]
+
+        def detach_load_balancer_target_groups(auto_scaling_group_name, options = {})
+          if target_group_arns = options.delete('TargetGroupARNs')
+            options.merge!(AWS.indexed_param('TargetGroupARNs.member.%d', *target_group_arns))
+          end
+
+          request({
+            'Action'               => 'DetachLoadBalancerTargetGroups',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def detach_load_balancer_target_groups(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - ExpectedOptions[:detach_load_balancer_target_groups]
+
+          unless unexpected_options.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")
+          end
+
+          unless self.data[:auto_scaling_groups].key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/compute/describe_availability_zones.rb

@@ -67,9 +67,15 @@ module Fog
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1c", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "eu-west-2", "zoneName" => "eu-west-2a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "eu-west-2", "zoneName" => "eu-west-2b", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "eu-central-1", "zoneName" => "eu-central-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-central-1", "zoneName" => "eu-central-1b", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "ca-central-1", "zoneName" => "ca-central-1a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "ca-central-1", "zoneName" => "ca-central-1b", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "ap-northeast-1", "zoneName" => "ap-northeast-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "ap-northeast-1", "zoneName" => "ap-northeast-1b", "zoneState" => "available"},
 

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -29,17 +29,25 @@ module Fog
       end
 
       # See https://forums.aws.amazon.com/message.jspa?messageID=612414
+      # Note: Oddly, to update this list, I have had to revert to going to
+      #       dev console at https://console.aws.amazon.com/route53/home, then using
+      #       search all sources for Z14GRHDCWA56QT to find this in a HashMap
       def self.elb_dualstack_hosted_zone_mapping
         @elb_dualstack_hosted_zone_mapping ||= {
           "ap-northeast-1" => "Z14GRHDCWA56QT",
+          "ap-northeast-2" => "ZWKZPGTI48KDX",
+          "ap-south-1" => "ZP97RAFLXTNZK",
           "ap-southeast-1" => "Z1LMS91P8CMLE5",
           "ap-southeast-2" => "Z1GM3OXH4ZPM65",
-          "eu-central-1"   => "Z215JYRZR1TBD5",
-          "eu-west-1"      => "Z32O12XQLNTSW2",
-          "sa-east-1"      => "Z2P70J7HTTTPLU",
-          "us-east-1"      => "Z35SXDOTRQ7X7K",
-          "us-west-1"      => "Z368ELLRRE2KJ0",
-          "us-west-2"      => "Z1H1FL5HABSF5",
+          "ca-central-1" => "ZQSVJUPU6J1EY",
+          "eu-central-1" => "Z215JYRZR1TBD5",
+          "eu-west-1" => "Z32O12XQLNTSW2",
+          "eu-west-2" => "ZHURV8PSTC4K8",
+          "us-east-1" => "Z35SXDOTRQ7X7K",
+          "us-east-2" => "Z3AADJGX6KTTL2",
+          "us-west-1" => "Z368ELLRRE2KJ0",
+          "us-west-2" => "Z1H1FL5HABSF5",
+          "sa-east-1" => "Z2P70J7HTTTPLU",
         }
       end
 

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/tests/requests/auto_scaling/auto_scaling_tests.rb

@@ -35,6 +35,14 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
       Fog::AWS[:auto_scaling].detach_load_balancers(@asg_name, 'LoadBalancerNames' => 'elb-test-fog').body
     end
 
+    tests("#attach_load_balancer_target_groups").formats(AWS::AutoScaling::Formats::BASIC) do
+      Fog::AWS[:auto_scaling].attach_load_balancer_target_groups(@asg_name, 'TargetGroupARNs' => 'elb-test-fog').body
+    end
+
+    tests("#detach_load_balancer_target_groups").formats(AWS::AutoScaling::Formats::BASIC) do
+      Fog::AWS[:auto_scaling].detach_load_balancer_target_groups(@asg_name, 'TargetGroupARNs' => 'elb-test-fog').body
+    end
+
     tests("#detach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
       Fog::AWS[:auto_scaling].detach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -730,6 +730,7 @@ files:
 - lib/fog/aws/rds.rb
 - lib/fog/aws/redshift.rb
 - lib/fog/aws/requests/auto_scaling/attach_instances.rb
+- lib/fog/aws/requests/auto_scaling/attach_load_balancer_target_groups.rb
 - lib/fog/aws/requests/auto_scaling/attach_load_balancers.rb
 - lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb
 - lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb
@@ -754,6 +755,7 @@ files:
 - lib/fog/aws/requests/auto_scaling/describe_tags.rb
 - lib/fog/aws/requests/auto_scaling/describe_termination_policy_types.rb
 - lib/fog/aws/requests/auto_scaling/detach_instances.rb
+- lib/fog/aws/requests/auto_scaling/detach_load_balancer_target_groups.rb
 - lib/fog/aws/requests/auto_scaling/detach_load_balancers.rb
 - lib/fog/aws/requests/auto_scaling/disable_metrics_collection.rb
 - lib/fog/aws/requests/auto_scaling/enable_metrics_collection.rb