fog-aws 3.5.2 → 3.6.6

data/lib/fog/aws/requests/elbv2/describe_listeners.rb

@@ -0,0 +1,38 @@
+module Fog
+  module AWS
+    class ELBV2
+      class Real
+        require 'fog/aws/parsers/elbv2/describe_listeners'
+
+        # Describe all or specified load balancers
+        #
+        # ==== Parameters
+        # * 'LoadBalancerArn'<~String> - The Amazon Resource Name (ARN) of the load balancer
+        # * options<~Hash>
+        #   * 'Marker'<String> - Indicates where to begin in your list of load balancers
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DescribeListenersResult'<~Hash>:
+        #       * 'Listeners'<~Array>
+        #         * 'LoadBalancerArn'<~String> - The Amazon Resource Name (ARN) of the load balancer
+        #         * 'Protocol'<~String> - The protocol for connections from clients to the load balancer
+        #         * 'Port'<~String> - The port on which the load balancer is listening
+        #         * 'DefaultActions'<~Array> - The default actions for the listener
+        #           * 'Type'<~String> - The type of action
+        #           * 'TargetGroupArn'<~String> - The Amazon Resource Name (ARN) of the target group. Specify only when Type is forward
+        #       * 'NextMarker'<~String> - Marker to specify for next page
+        def describe_listeners(load_balancer_arn, options = {})
+          request({
+            'Action'  => 'DescribeListeners',
+            'LoadBalancerArn' => load_balancer_arn,
+            :parser   => Fog::Parsers::AWS::ELBV2::DescribeListeners.new
+          }.merge!(options))
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elbv2/describe_load_balancers.rb

@@ -0,0 +1,100 @@
+module Fog
+  module AWS
+    class ELBV2
+      class Real
+        require 'fog/aws/parsers/elbv2/describe_load_balancers'
+
+        # Describe all or specified load balancers
+        #
+        # ==== Parameters
+        # * options<~Hash>
+        #   * 'LoadBalancerNames'<~Array> - List of load balancer names to describe, defaults to all
+        #   * 'Marker'<String> - Indicates where to begin in your list of load balancers
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DescribeLoadBalancersResult'<~Hash>:
+        #       * 'LoadBalancers'<~Array>
+        #         * 'AvailabilityZones'<~Array>:
+        #           * 'SubnetId'<~String> - ID of the subnet
+        #           * 'ZoneName'<~String> - Name of the Availability Zone
+        #           * 'LoadBalancerAddresses'<~Array>:
+        #             * 'IpAddress'<~String> - IP address
+        #             * 'AllocationId'<~String> - ID of the AWS allocation
+        #         * 'CanonicalHostedZoneName'<~String> - name of the Route 53 hosted zone associated with the load balancer
+        #         * 'CanonicalHostedZoneNameID'<~String> - ID of the Route 53 hosted zone associated with the load balancer
+        #         * 'CreatedTime'<~Time> - time load balancer was created
+        #         * 'DNSName'<~String> - external DNS name of load balancer
+        #         * 'LoadBalancerName'<~String> - name of load balancer
+        #         * 'SecurityGroups'<~Array> - array of security group id
+        #         * 'NextMarker'<~String> - Marker to specify for next page
+        def describe_load_balancers(options = {})
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("describe_load_balancers with #{options.class} is deprecated, use all('LoadBalancerNames' => []) instead [light_black](#{caller.first})[/]")
+            options = { 'LoadBalancerNames' => [options].flatten }
+          end
+
+          if names = options.delete('LoadBalancerNames')
+            options.update(Fog::AWS.indexed_param('LoadBalancerNames.member', [*names]))
+          end
+
+          request({
+            'Action'  => 'DescribeLoadBalancers',
+            :parser   => Fog::Parsers::AWS::ELBV2::DescribeLoadBalancers.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def describe_load_balancers(options = {})
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("describe_load_balancers with #{options.class} is deprecated, use all('LoadBalancerNames' => []) instead [light_black](#{caller.first})[/]")
+            options = { 'LoadBalancerNames' => [options].flatten }
+          end
+
+          lb_names = options['LoadBalancerNames'] || []
+
+          lb_names = [*lb_names]
+          load_balancers = if lb_names.any?
+            lb_names.map do |lb_name|
+              lb = self.data[:load_balancers_v2].find { |name, data| name == lb_name }
+              raise Fog::AWS::ELBV2::NotFound unless lb
+              lb[1].dup
+            end.compact
+          else
+            self.data[:load_balancers_v2].map { |lb, values| values.dup }
+          end
+
+          marker = options.fetch('Marker', 0).to_i
+          if load_balancers.count - marker > 400
+            next_marker = marker + 400
+            load_balancers = load_balancers[marker...next_marker]
+          else
+            next_marker = nil
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+
+          response.body = {
+            'ResponseMetadata' => {
+              'RequestId' => Fog::AWS::Mock.request_id
+            },
+            'DescribeLoadBalancersResult' => {
+              'LoadBalancers' => load_balancers
+            }
+          }
+
+          if next_marker
+            response.body['DescribeLoadBalancersResult']['NextMarker'] = next_marker.to_s
+          end
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elbv2/describe_tags.rb

@@ -0,0 +1,50 @@
+module Fog
+  module AWS
+    class ELBV2
+      class Real
+        require 'fog/aws/parsers/elbv2/describe_tags'
+
+        # returns a Hash of tags for a load balancer
+        # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DescribeTags.html
+        # ==== Parameters
+        # * resource_arns <~Array> - ARN(s) of the ELB instance whose tags are to be retrieved
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def describe_tags(resource_arns)
+          request({
+              'Action' => 'DescribeTags',
+              :parser  => Fog::Parsers::AWS::ELBV2::DescribeTags.new
+            }.merge!(Fog::AWS.indexed_param('ResourceArns.member.%d', [*resource_arns]))
+          )
+        end
+      end
+
+      class Mock
+        def describe_tags(resource_arns)
+          response = Excon::Response.new
+          resource_arns = [*resource_arns]
+
+          tag_describtions = resource_arns.map do |resource_arn|
+            if self.data[:load_balancers_v2][resource_arn]
+              {
+                "Tags"=>self.data[:tags][resource_arn],
+                "ResourceArn"=>resource_arn
+              }
+            else
+              raise Fog::AWS::ELBV2::NotFound.new("Elastic load balancer #{resource_arns} not found")
+            end
+          end
+
+          response.status = 200
+          response.body = {
+            "ResponseMetadata"=>{"RequestId"=> Fog::AWS::Mock.request_id },
+            "DescribeTagsResult"=>{"TagDescriptions"=> tag_describtions}
+          }
+
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elbv2/remove_tags.rb

@@ -0,0 +1,45 @@
+module Fog
+  module AWS
+    class ELBV2
+      class Real
+        require 'fog/aws/parsers/elbv2/empty'
+
+        # removes tags from an elastic load balancer instance
+        # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_RemoveTags.html
+        # ==== Parameters
+        # * resource_arn <~String> - ARN of the ELB instance whose tags are to be retrieved
+        # * keys <~Array> A list of String keys for the tags to remove
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def remove_tags(resource_arn, keys)
+          request(
+            { 'Action'                      => 'RemoveTags',
+              'ResourceArns.member.1'  => resource_arn,
+              :parser => Fog::Parsers::AWS::ELBV2::Empty.new,
+            }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
+          )
+        end
+
+      end
+
+      class Mock
+
+        def remove_tags(resource_arn, keys)
+          response = Excon::Response.new
+          if self.data[:load_balancers_v2][resource_arn]
+            keys.each {|key| self.data[:tags][resource_arn].delete key}
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+            }
+            response
+          else
+            raise Fog::AWS::ELBV2::NotFound.new("Elastic load balancer #{resource_arn} not found")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/get_object_tagging.rb

@@ -0,0 +1,41 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+        require 'fog/aws/parsers/storage/get_object_tagging'
+
+        # Get tags for an S3 object
+        #
+        # @param bucket_name [String] Name of bucket to read from
+        # @param object_name [String] Name of object to get tags for
+        #
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * ObjectTagging [Hash]:
+        #       * Key [String] - tag key
+        #       * Value [String] - tag value
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectTagging.html
+
+        def get_object_tagging(bucket_name, object_name)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+
+          request({
+            :expects => 200,
+            :headers => {},
+            :bucket_name => bucket_name,
+            :object_name => object_name,
+            :idempotent => true,
+            :method => 'GET',
+            :parser => Fog::Parsers::AWS::Storage::GetObjectTagging.new,
+            :query => {'tagging' => nil}
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/put_object_tagging.rb

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+        # Change tag set for an S3 object
+        #
+        # @param bucket_name [String] Name of bucket to modify object in
+        # @param object_name [String] Name of object to modify
+        #
+        # @param tags [Hash]:
+        #   * Key [String]: tag key
+        #   * Value [String]: tag value
+        #
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectTagging.html
+
+        def put_object_tagging(bucket_name, object_name, tags)
+          tagging = tags.map do |k,v|
+            "<Tag><Key>#{k}</Key><Value>#{v}</Value></Tag>"
+          end.join("\n")
+          data =
+              <<-DATA
+<Tagging xmlns="http://doc.s3.amazonaws.com/2006-03-01" >
+  <TagSet>
+    #{tagging}
+  </TagSet>
+</Tagging>
+          DATA
+
+          request({
+            :body     => data,
+            :expects  => 200,
+            :headers  => {'Content-MD5' => Base64.encode64(OpenSSL::Digest::MD5.digest(data)).chomp!, 'Content-Type' => 'application/xml'},
+            :bucket_name => bucket_name,
+            :object_name => object_name,
+            :method   => 'PUT',
+            :query    => {'tagging' => nil}
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/sts/assume_role_with_web_identity.rb

@@ -6,12 +6,13 @@ module Fog
 
         def assume_role_with_web_identity(role_arn, web_identity_token, role_session_name, options={})
           request_unsigned(
-            'Action'          => 'AssumeRoleWithWebIdentity',
-            'RoleArn'         => role_arn,
-            'RoleSessionName' => role_session_name,
-            'DurationSeconds' => options[:duration] || 3600,
-            :idempotent       => true,
-            :parser           => Fog::Parsers::AWS::STS::AssumeRoleWithWebIdentity.new
+            'Action'            => 'AssumeRoleWithWebIdentity',
+            'RoleArn'           => role_arn,
+            'RoleSessionName'   => role_session_name,
+            'WebIdentityToken'  => web_identity_token,
+            'DurationSeconds'   => options[:duration] || 3600,
+            :idempotent         => true,
+            :parser             => Fog::Parsers::AWS::STS::AssumeRoleWithWebIdentity.new
           )
         end
       end

data/lib/fog/aws/storage.rb

@@ -84,6 +84,7 @@ module Fog
       request :get_object_http_url
       request :get_object_https_url
       request :get_object_url
+      request :get_object_tagging
       request :get_request_payment
       request :get_service
       request :head_bucket
@@ -107,6 +108,7 @@ module Fog
       request :put_object
       request :put_object_acl
       request :put_object_url
+      request :put_object_tagging
       request :put_request_payment
       request :sync_clock
       request :upload_part

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.5.2"
+    VERSION = "3.6.6"
   end
 end

data/tests/credentials_tests.rb

@@ -7,6 +7,8 @@ Shindo.tests('AWS | credentials', ['aws']) do
   Fog.unmock!
   begin
     Excon.defaults[:mock] = true
+    Excon.stub({ method: :put, path: '/latest/api/token' }, { status: 200, body: 'token1234' })
+
     Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/' }, { status: 200, body: 'arole' })
     Excon.stub({ method: :get, path: '/latest/meta-data/placement/availability-zone/' }, { status: 200, body: 'us-west-1a' })
 
@@ -28,6 +30,23 @@ Shindo.tests('AWS | credentials', ['aws']) do
               aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
     end
 
+    tests('#fetch_credentials when the v2 token 404s') do
+      Excon.stub({ method: :put, path: '/latest/api/token' }, { status: 404, body: 'not found' })
+      returns(aws_access_key_id: 'dummykey',
+              aws_secret_access_key: 'dummysecret',
+              aws_session_token: 'dummytoken',
+              region: 'us-west-1',
+              aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
+    end
+
+    tests('#fetch_credentials when the v2 disabled') do
+      returns(aws_access_key_id: 'dummykey',
+              aws_secret_access_key: 'dummysecret',
+              aws_session_token: 'dummytoken',
+              region: 'us-west-1',
+              aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true, disable_imds_v2: true) }
+    end
+
     ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = '/v1/credentials?id=task_id'
     Excon.stub({ method: :get, path: '/v1/credentials?id=task_id' }, { status: 200, body: Fog::JSON.encode(credentials) })
 
@@ -62,6 +81,7 @@ Shindo.tests('AWS | credentials', ['aws']) do
 
     default_credentials = Fog::AWS::Compute.fetch_credentials({})
     tests('#fetch_credentials when the url 404s') do
+      Excon.stub({ method: :put, path: '/latest/api/token' }, { status: 404, body: 'not found' })
       Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/' }, { status: 404, body: 'not bound' })
       Excon.stub({ method: :get, path: '/latest/meta-data/placement/availability-zone/' }, { status: 400, body: 'not found' })
       returns(default_credentials) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }

data/tests/parsers/elbv2/create_load_balancer_tests.rb

@@ -0,0 +1,48 @@
+require 'fog/xml'
+require 'fog/aws/parsers/elbv2/create_load_balancer'
+
+CREATE_LOAD_BALANCER_RESULT = <<-EOF
+<CreateLoadBalancerResponse xmlns="http://elasticloadbalancing.amazonaws.com/doc/2015-12-01/">
+  <CreateLoadBalancerResult>
+    <LoadBalancers>
+      <member>
+        <LoadBalancerArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-internal-load-balancer/50dc6c495c0c9188</LoadBalancerArn>
+        <Scheme>internet-facing</Scheme>
+        <LoadBalancerName>my-load-balancer</LoadBalancerName>
+        <VpcId>vpc-3ac0fb5f</VpcId>
+        <CanonicalHostedZoneId>Z2P70J7EXAMPLE</CanonicalHostedZoneId>
+        <CreatedTime>2016-03-25T21:29:48.850Z</CreatedTime>
+        <AvailabilityZones>
+          <member>
+            <SubnetId>subnet-8360a9e7</SubnetId>
+            <ZoneName>us-west-2a</ZoneName>
+          </member>
+          <member>
+            <SubnetId>subnet-b7d581c0</SubnetId>
+            <ZoneName>us-west-2b</ZoneName>
+          </member>
+        </AvailabilityZones>
+        <SecurityGroups>
+          <member>sg-5943793c</member>
+        </SecurityGroups>
+        <DNSName>my-load-balancer-424835706.us-west-2.elb.amazonaws.com</DNSName>
+        <State>
+          <Code>provisioning</Code>
+        </State>
+        <Type>application</Type>
+      </member>
+    </LoadBalancers>
+  </CreateLoadBalancerResult>
+  <ResponseMetadata>
+    <RequestId>32d531b2-f2d0-11e5-9192-3fff33344cfa</RequestId>
+  </ResponseMetadata>
+</CreateLoadBalancerResponse>
+EOF
+
+Shindo.tests('AWS::ELBV2 | parsers | create_load_balancer', %w[aws elb parser]) do
+  tests('parses the xml').formats(AWS::ELBV2::Formats::CREATE_LOAD_BALANCER) do
+    parser = Nokogiri::XML::SAX::Parser.new(Fog::Parsers::AWS::ELBV2::CreateLoadBalancer.new)
+    parser.parse(CREATE_LOAD_BALANCER_RESULT)
+    parser.document.response
+  end
+end