google-ads-googleads 8.0.0 → 8.1.0

data/lib/google/ads/google_ads/google_ads_client.rb

@@ -63,7 +63,8 @@ module Google
             yield @config
           else
             if config_path.nil?
-              config_path = File.join(ENV['HOME'], DEFAULT_CONFIG_FILENAME)
+              config_path = ENV.fetch("GOOGLE_ADS_CONFIGURATION_FILE_PATH",
+                File.join(ENV['HOME'], DEFAULT_CONFIG_FILENAME))
             end
 
             unless File.exist?(config_path)
@@ -96,6 +97,23 @@ module Google
           yield @config
         end
 
+        def load_environment_config
+          # Generic variables
+          @config.refresh_token = ENV.fetch("GOOGLE_ADS_REFRESH_TOKEN", @config.refresh_token)
+          @config.client_id = ENV.fetch("GOOGLE_ADS_CLIENT_ID", @config.client_id)
+          @config.client_secret = ENV.fetch("GOOGLE_ADS_CLIENT_SECRET", @config.client_secret)
+          @config.keyfile = ENV.fetch("GOOGLE_ADS_JSON_KEY_FILE_PATH", @config.keyfile)
+          @config.impersonate = ENV.fetch("GOOGLE_ADS_IMPERSONATED_EMAIL", @config.impersonate)
+          @config.developer_token = ENV.fetch("GOOGLE_ADS_DEVELOPER_TOKEN", @config.developer_token)
+          @config.login_customer_id = ENV.fetch("GOOGLE_ADS_LOGIN_CUSTOMER_ID", @config.login_customer_id)
+          @config.linked_customer_id = ENV.fetch("GOOGLE_ADS_LINKED_CUSTOMER_ID", @config.linked_customer_id)
+          @config.api_endpoint = ENV.fetch("GOOGLE_ADS_ENDPOINT", @config.api_endpoint)
+
+          # Client library-specific variables
+          @config.log_level = ENV.fetch("GOOGLE_ADS_RUBY_LOG_LEVEL", @config.log_level)
+          @config.http_proxy = ENV.fetch("GOOGLE_ADS_RUBY_HTTP_PROXY", @config.http_proxy)
+        end
+
         # Return a service for the provided entity type. For example, passing
         # :Campaign will return an instantiated CampaignServiceClient.
         #
@@ -117,7 +135,7 @@ module Google
 
         def target
           default_target = "googleads.googleapis.com:443"
-          target = ENV.fetch('GOOGLEADS_SERVICE_PATH', default_target)
+          target = @config.api_endpoint || default_target
         end
 
         def make_channel

data/lib/google/ads/google_ads/interceptors/logging_interceptor.rb

@@ -34,7 +34,7 @@ module Google
             userEmail
           ]
           SEARCH_REQUEST_MASK =
-            /customer_user_access.email_address|change_event.user_email/
+            /customer_user_access.email_address|change_event.user_email|feed.places_location_feed_data.email_address/
 
           MASK_REPLACEMENT = "REDACTED"
 
@@ -172,12 +172,16 @@ module Google
             metadata
           end
 
+          def clone_to_json(message)
+            JSON.parse(message.to_json)
+          end
+
           def sanitize_message(message)
             message_class = message.class.to_s.split("::").last
             if %w[SearchGoogleAdsStreamResponse SearchGoogleAdsResponse].include?(
                 message_class)
               # Sanitize all known sensitive fields across all search responses.
-              message = JSON.parse(message.to_json)
+              message = clone_to_json(message)
               message["fieldMask"].split(",").each do |path|
                 if SEARCH_RESPONSE_FIELDS_TO_MASK.include?(path.split(".").last)
                   message["results"].each do |result|
@@ -189,22 +193,41 @@ module Google
             elsif %w[SearchGoogleAdsRequest SearchGoogleAdsStreamRequest].include?(
                 message_class)
               if SEARCH_REQUEST_MASK === message.query
-                message = JSON.parse(message.to_json)
+                message = clone_to_json(message)
                 message["query"] = MASK_REPLACEMENT
               end
               message
             elsif "CustomerUserAccess" == message_class
               # Sanitize sensitive fields specific to CustomerUserAccess get requests.
-              message = JSON.parse(message.to_json)
+              message = clone_to_json(message)
               sanitize_customer_user_access(message)
             elsif "MutateCustomerUserAccessRequest" == message_class
               # Sanitize sensitive fields when mutating a CustomerUserAccess.
-              message = JSON.parse(message.to_json)
+              message = clone_to_json(message)
               if message.include?("operation") && message["operation"].include?("update")
                 message["operation"]["update"] =
                   sanitize_customer_user_access(message["operation"]["update"])
               end
               message
+            elsif "Feed" == message_class
+              # Sanitize sensitive fields specific to Feed get requests.
+              message = clone_to_json(message)
+              if message.include?("placesLocationFeedData") &&
+                  message["placesLocationFeedData"].include?("emailAddress")
+                message["placesLocationFeedData"]["emailAddress"] = MASK_REPLACEMENT
+              end
+              message
+            elsif "MutateFeedsRequest" == message_class
+              # Sanitize sensitive fields when mutating a Feed.
+              message = clone_to_json(message)
+              sanitize_feeds_request(message)
+            elsif "CreateCustomerClientRequest" == message_class
+              # Sanitize sensitive fields when creating a CustomerClient.
+              message = clone_to_json(message)
+              if message.include?("emailAddress")
+                message["emailAddress"] = MASK_REPLACEMENT
+              end
+              message
             else
               message
             end
@@ -220,6 +243,26 @@ module Google
             message
           end
 
+          def sanitize_feeds_request(message)
+            if message.include?("operations")
+              message["operations"].each do |operation|
+                if operation.include?("create")
+                  operation = operation["create"]
+                elsif operation.include?("update")
+                  operation = operation["update"]
+                else
+                  # Only create and update can contain sensitive fields.
+                  next
+                end
+                if operation.include?("placesLocationFeedData") &&
+                    operation["placesLocationFeedData"].include?("emailAddress")
+                  operation["placesLocationFeedData"]["emailAddress"] = MASK_REPLACEMENT
+                end
+              end
+            end
+            message
+          end
+
           def sanitize_field(object, path)
             split_path = path.split(".")
             target_field = split_path.last

data/lib/google/ads/google_ads/service_lookup.rb

@@ -67,26 +67,39 @@ module Google
           }
 
           if config.login_customer_id
-            validate_login_customer_id
+            validate_customer_id(:login_customer_id)
             # header values must be strings
             headers[:"login-customer-id"] = config.login_customer_id.to_s
           end
 
+          if config.linked_customer_id
+            validate_customer_id(:linked_customer_id)
+            # header values must be strings
+            headers[:"linked-customer-id"] = config.linked_customer_id.to_s
+          end
+
           headers
         end
 
-        def validate_login_customer_id
+        def validate_customer_id(field)
           begin
-            login_customer_id = Integer(config.login_customer_id)
+            customer_id = -1
+            if field == :login_customer_id
+              customer_id = Integer(config.login_customer_id)
+            elsif field == :linked_customer_id
+              customer_id = Integer(config.linked_customer_id)
+            else
+              return
+            end
           rescue ArgumentError => e
             if e.message.start_with?("invalid value for Integer")
-              raise ArgumentError.new("Invalid value for login_customer_id, must be integer")
+              raise ArgumentError.new("Invalid value for #{field.to_s}, must be integer")
             end
           end
-          if login_customer_id <= 0 || login_customer_id > 9_999_999_999
+          if customer_id <= 0 || customer_id > 9_999_999_999
             raise ArgumentError.new(
-              "Invalid login_customer_id. Must be an integer " \
-              "0 < x <= 9,999,999,999. Got #{login_customer_id}"
+              "Invalid #{field.to_s}. Must be an integer " \
+              "0 < x <= 9,999,999,999. Got #{customer_id}"
             )
           end
         end

data/lib/google/ads/google_ads/version.rb

@@ -19,7 +19,7 @@
 module Google
   module Ads
     module GoogleAds
-      CLIENT_LIB_VERSION = '8.0.0'.freeze
+      CLIENT_LIB_VERSION = '8.1.0'.freeze
       VERSION = CLIENT_LIB_VERSION
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-ads-googleads
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Google Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gapic-common