google-ads-googleads 2.4.1 → 3.0.0

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

@@ -94,7 +94,7 @@ module Google
             original_value = original[field.name]
             modified_value = modified[field.name]
 
-            if is_repeated?(original_value) || is_repeated?(modified_value)
+            if is_repeated?(field)
               # repeated fields - must match exactly or add the field
               mask.paths << field_path unless original_value == modified_value
             else
@@ -147,8 +147,8 @@ module Google
         end
 
         # Checks if the object is a repeated field
-        def self.is_repeated?(obj)
-          obj.is_a?(Google::Protobuf::RepeatedField)
+        def self.is_repeated?(field)
+          field.label == :repeated
         end
 
         private_class_method :compare_obj, :get_path, :is_wrapper?,

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

@@ -34,6 +34,18 @@ module Google
         module Services
         end
       end
+      module V2
+        module Common
+        end
+        module Enums
+        end
+        module Errors
+        end
+        module Resources
+        end
+        module Services
+        end
+      end
     end
   end
 end
@@ -122,12 +134,10 @@ module Google
         # :Campaign will return an instantiated CampaignServiceClient.
         #
         # Raises ArgumentError if no service can be found for the provided type.
-        def service(name=nil, version = default_api_version)
+        def service
           service_path = ENV['GOOGLEADS_SERVICE_PATH']
 
           ServiceLookup.new(
-            name,
-            version,
             lookup_util,
             service_path,
             @logger,
@@ -158,40 +168,16 @@ module Google
         # example, passing :Campaign will return an instantiated Campaign.
         #
         # Raises ArgumentError if no entity can be found for the provided type.
-        def resource(name=nil, version=default_api_version)
-          if name.nil?
-            Factories.at_version(version).resources
-          else
-            deprecate("Calling `google_ads_client.resource(<ResourceType>)` is deprecated, please use `google_ads_client.service.<resource_type>` instead")
-            lookup_util.resource(name, version)
-          end
+        def resource
+          Factories.version_alternate_for(:resources)
         end
 
-        # Return an operation for the provided entity type. For example, passing
-        # :Campaign will return an instantiated CampaignOperation.
-        #
-        # Raises ArgumentError if no entity can be found for the provided type.
-        def operation(name=nil, version = default_api_version)
-          if name.nil?
-            Factories.at_version(version).operations
-          else
-            deprecate("Calling `google_ads_client.resource(<OperationType>)` is deprecated, please use `google_ads_client.service.<operation_type>` instead")
-            lookup_util.operation(name, version)
-          end
+        def operation
+          Factories.version_alternate_for(:operations)
         end
 
-        # Return a reference to the enum class for the provided enum type. For
-        # example, passing :CampaignStatus will return a reference to the
-        # CampaignStatusEnum.
-        #
-        # Raises ArgumentError if no enum can be found for the provided type.
-        def enum(name=nil, version = default_api_version)
-          if name.nil?
-            Factories.at_version(version).enums
-          else
-            deprecate("Calling `google_ads_client.resource(<EnumType>)` is deprecated, please use `google_ads_client.service.<enum_type>` instead")
-            lookup_util.enum(name, version)
-          end
+        def enum
+          Factories.version_alternate_for(:enums)
         end
 
         # Returns a reference to the FieldMaskUtil class for ease of access.

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

@@ -8,39 +8,6 @@ module Google
           @path_lookup_utils = {}
         end
 
-        # Return a resource or common entity for the provided entity type. For
-        # example, passing :Campaign will return an instantiated Campaign.
-        #
-        # Raises ArgumentError if no entity can be found for the provided type.
-        def resource(name, version)
-          proto_lookup_util(version).resource(name).new
-        end
-
-        # Return an operation for the provided entity type. For example, passing
-        # :Campaign will return an instantiated CampaignOperation.
-        #
-        # Raises ArgumentError if no entity can be found for the provided type.
-        def operation(name, version)
-          proto_lookup_util(version).operation(name).new
-        end
-
-        # Return a reference to the enum class for the provided enum type. For
-        # example, passing :CampaignStatus will return a reference to the
-        # CampaignStatusEnum.
-        #
-        # Raises ArgumentError if no enum can be found for the provided type.
-        def enum(name, version)
-          proto_lookup_util(version).enum(name)
-        end
-
-        # Return a service for the provided entity type. For example, passing
-        # :Campaign will return an instantiated CampaignServiceClient.
-        #
-        # Raises ArgumentError if no service can be found for the provided type.
-        def raw_service(name, version)
-          proto_lookup_util(version).service(name)
-        end
-
         # Returns a reference to the PathLookupUtil to generate resource names.
         def path(version)
           path_lookup_util(version)
@@ -50,25 +17,6 @@ module Google
 
         attr_reader :proto_lookup_utils, :path_lookup_utils
 
-        # Load up the proto lookup util for the given version, storing a copy
-        # of it if this is the first time we needed it.
-        def proto_lookup_util(version)
-          unless valid_version?(version)
-            raise sprintf('Unknown version %s', version)
-          end
-          if proto_lookup_utils[version].nil?
-            path_version = version.downcase
-            require sprintf('google/ads/google_ads/utils/%s/proto_lookup_util',
-                path_version)
-            class_path = sprintf(
-              'Google::Ads::GoogleAds::Utils::%s::ProtoLookupUtil',
-              version
-            )
-            proto_lookup_utils[version] = class_for_path(class_path).new
-          end
-          proto_lookup_utils[version]
-        end
-
         # Load up the path lookup util for the given version, storing a copy
         # of it if this is the first time we needed it.
         def path_lookup_util(version)
@@ -83,8 +31,7 @@ module Google
               'Google::Ads::GoogleAds::Utils::%s::PathLookupUtil',
               version
             )
-            path_lookup_utils[version] = class_for_path(class_path).new(
-                proto_lookup_util(version))
+            path_lookup_utils[version] = class_for_path(class_path).new
           end
           path_lookup_utils[version]
         end

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

@@ -1,12 +1,8 @@
-require 'google/ads/google_ads/patch_lro_headers'
-
 module Google
   module Ads
     module GoogleAds
       class ServiceLookup
-        def initialize(name, version, lookup_util, service_path, logger, config, credentials_or_channel)
-          @name = name
-          @version = version
+        def initialize(lookup_util, service_path, logger, config, credentials_or_channel)
           @lookup_util = lookup_util
           @service_path = service_path
           @logger = logger
@@ -19,23 +15,29 @@ module Google
             logging_interceptor = Google::Ads::GoogleAds::LoggingInterceptor.new(logger)
           end
 
-          if name.nil?
-            services = Factories.at_version(version).services.new(**{
-              service_path: service_path,
-              logging_interceptor: logging_interceptor,
-            }.merge(gax_service_params))
-            apply_patch_delegator(services)
-          else
-            class_to_return = lookup_util.raw_service(name, version)
-            setup_service_class(class_to_return)
-            class_to_return.new(
-              **gax_service_params
-            )
+          version_alternates = {}
+          Factories::VERSIONS.each do |v|
+            version_alternates[v] = factory_at_version(v, logging_interceptor)
           end
+
+          highest_factory = factory_at_version(
+            Factories::HIGHEST_VERSION,
+            logging_interceptor,
+          )
+          VersionAlternate.new(highest_factory, version_alternates)
         end
 
         private
 
+        def factory_at_version(version, logging_interceptor)
+          factory = Factories.at_version(version).services.new(**{
+            service_path: service_path,
+            logging_interceptor: logging_interceptor,
+          }.merge(gax_service_params))
+
+          factory
+        end
+
         def gax_service_params
           {
             credentials: credentials_or_channel,
@@ -44,41 +46,6 @@ module Google
           }
         end
 
-        def setup_service_class(service_class)
-          service_path = @service_path
-          logging_interceptor = @logging_interceptor
-          class_to_return = Class.new(service_class) do
-            unless service_path.nil? || service_path.empty?
-              const_set('SERVICE_ADDRESS', service_path.freeze)
-            end
-
-            const_set('GRPC_INTERCEPTORS', [logging_interceptor].compact)
-          end
-
-          patch_lro_headers(class_to_return)
-        end
-
-        def apply_patch_delegator(services)
-          patch_delegator = Class.new do
-            def initialize(services, patch_callable)
-              @services = services
-              @patch_callable = patch_callable
-            end
-
-            def respond_to_missing?(sym, include_private=false)
-              @services.respond_to?(sym, include_private)
-            end
-
-            def method_missing(name, *args)
-              @services.public_send(name, *args) do |cls|
-                @patch_callable.call(cls)
-                cls
-              end
-            end
-          end
-          patch_delegator.new(services, method(:patch_lro_headers))
-        end
-
         def headers
           headers = {
             :"developer-token" => config.developer_token
@@ -86,16 +53,13 @@ module Google
 
           if config.login_customer_id
             validate_login_customer_id
-            headers[:"login-customer-id"] = config.login_customer_id.to_s  # header values must be strings
+            # header values must be strings
+            headers[:"login-customer-id"] = config.login_customer_id.to_s
           end
 
           headers
         end
 
-        def patch_lro_headers(class_to_return)
-          PatchLROHeaders.new(class_to_return, headers).call
-        end
-
         def validate_login_customer_id
           begin
             login_customer_id = Integer(config.login_customer_id)

data/lib/google/ads/google_ads/utils/v1/path_lookup_util.rb

@@ -22,23 +22,28 @@ module Google
       module Utils
         module V1
           class PathLookupUtil
-            def initialize(proto_lookup_util)
-              @proto_lookup_util = proto_lookup_util
-            end
+            include Google::Ads::GoogleAds::V1::Services
 
             def account_budget_proposal(customer_id, account_budget_proposal_id)
-              @proto_lookup_util.service(:AccountBudgetProposal).
-                  account_budget_proposal_path(customer_id.to_s,
-                    account_budget_proposal_id.to_s)
+              require 'google/ads/google_ads/v1/services/account_budget_proposal_service_client'
+
+              AccountBudgetProposalServiceClient
+              .account_budget_proposal_path(
+                customer_id.to_s,
+                account_budget_proposal_id.to_s,
+              )
             end
 
             def account_budget(customer_id, account_budget_id)
-              @proto_lookup_util.service(:AccountBudget).
+              require 'google/ads/google_ads/v1/services/account_budget_service_client'
+
+              AccountBudgetServiceClient.
                   account_budget_path(customer_id.to_s, account_budget_id.to_s)
             end
 
             def ad_group_ad_label(customer_id, ad_group_id, ad_id, label_id)
-              @proto_lookup_util.service(:AdGroupAdLabel).
+              require 'google/ads/google_ads/v1/services/ad_group_ad_label_service_client'
+              AdGroupAdLabelServiceClient.
                   ad_group_ad_label_path(
                     customer_id.to_s,
                     sprintf('%s~%s~%s', ad_group_id.to_s, ad_id.to_s,
@@ -47,14 +52,17 @@ module Google
             end
 
             def ad_group_ad(customer_id, ad_group_id, ad_id)
-              @proto_lookup_util.service(:AdGroupAd).ad_group_ad_path(
+              require 'google/ads/google_ads/v1/services/ad_group_ad_service_client'
+              AdGroupAdServiceClient
+              .ad_group_ad_path(
                 customer_id.to_s,
                 sprintf('%s~%s', ad_group_id.to_s, ad_id.to_s)
               )
             end
 
             def ad_group_audience_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:AdGroupAudienceView).
+              require 'google/ads/google_ads/v1/services/ad_group_audience_view_service_client'
+              AdGroupAudienceViewServiceClient.
                   ad_group_audience_view_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
@@ -62,7 +70,8 @@ module Google
             end
 
             def ad_group_bid_modifier(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:AdGroupBidModifier).
+              require 'google/ads/google_ads/v1/services/ad_group_bid_modifier_service_client'
+              AdGroupBidModifierServiceClient.
                   ad_group_bid_modifier_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
@@ -71,7 +80,8 @@ module Google
 
             def ad_group_criterion_label(customer_id, ad_group_id, criterion_id,
                 label_id)
-              @proto_lookup_util.service(:AdGroupCriterionLabel).
+              require 'google/ads/google_ads/v1/services/ad_group_criterion_label_service_client'
+              AdGroupCriterionLabelServiceClient.
                   ad_group_criterion_label_path(
                     customer_id.to_s,
                     sprintf('%s~%s~%s', ad_group_id.to_s, criterion_id.to_s,
@@ -80,7 +90,8 @@ module Google
             end
 
             def ad_group_criterion(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:AdGroupCriterion).
+              require 'google/ads/google_ads/v1/services/ad_group_criterion_service_client'
+              AdGroupCriterionServiceClient.
                   ad_group_criteria_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
@@ -89,7 +100,8 @@ module Google
 
             def ad_group_criterion_simulation(customer_id, ad_group_id,
                 criterion_id, type, modification_method, start_date, end_date)
-              @proto_lookup_util.service(:AdGroupCriterionSimulation).
+              require 'google/ads/google_ads/v1/services/ad_group_criterion_simulation_service_client'
+              AdGroupCriterionSimulationServiceClient.
                   ad_group_criterion_simulation_path(
                     customer_id.to_s,
                     sprintf(
@@ -106,7 +118,8 @@ module Google
 
             def ad_group_extension_setting(customer_id, ad_group_id,
                 extension_type)
-              @proto_lookup_util.service(:AdGroupExtensionSetting).
+              require 'google/ads/google_ads/v1/services/ad_group_extension_setting_service_client'
+              AdGroupExtensionSettingServiceClient.
                   ad_group_extension_setting_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, extension_type.to_s)
@@ -114,27 +127,34 @@ module Google
             end
 
             def ad_group_feed(customer_id, ad_group_id, feed_id)
-              @proto_lookup_util.service(:AdGroupFeed).ad_group_feed_path(
+              require 'google/ads/google_ads/v1/services/ad_group_feed_service_client'
+              AdGroupFeedServiceClient
+                .ad_group_feed_path(
                 customer_id.to_s,
                 sprintf('%s~%s', ad_group_id.to_s, feed_id.to_s)
               )
             end
 
             def ad_group_label(customer_id, ad_group_id, label_id)
-              @proto_lookup_util.service(:AdGroupLabel).ad_group_label_path(
+              require 'google/ads/google_ads/v1/services/ad_group_label_service_client'
+              AdGroupLabelServiceClient
+              .ad_group_label_path(
                 customer_id.to_s,
                 sprintf('%s~%s', ad_group_id.to_s, label_id.to_s)
               )
             end
 
             def ad_group(customer_id, ad_group_id)
-              @proto_lookup_util.service(:AdGroup).ad_group_path(
+              require 'google/ads/google_ads/v1/services/ad_group_service_client'
+              AdGroupServiceClient
+                .ad_group_path(
                   customer_id.to_s, ad_group_id.to_s)
             end
 
             def ad_group_simulation(customer_id, ad_group_id, type,
                 modification_method, start_date, end_date)
-              @proto_lookup_util.service(:AdGroupSimulation).
+              require 'google/ads/google_ads/v1/services/ad_group_simulation_service_client'
+              AdGroupSimulationServiceClient.
                 ad_group_simulation_path(
                   customer_id.to_s,
                   sprintf(
@@ -150,35 +170,44 @@ module Google
 
             def ad_parameter(customer_id, ad_group_id, criterion_id,
                 parameter_index)
-              @proto_lookup_util.service(:AdParameter).ad_parameter_path(
+              require 'google/ads/google_ads/v1/services/ad_parameter_service_client'
+              AdParameterServiceClient
+              .ad_parameter_path(
                 customer_id.to_s,
                 sprintf('%s~%s~%s', ad_group_id, criterion_id, parameter_index)
               )
             end
 
             def ad_schedule_view(customer_id, campaign_id, criterion_id)
-              @proto_lookup_util.service(:AdScheduleView).ad_schedule_view_path(
+              require 'google/ads/google_ads/v1/services/ad_schedule_view_service_client'
+              AdScheduleViewServiceClient
+                .ad_schedule_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', campaign_id, criterion_id)
               )
             end
 
             def age_range_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:AgeRangeView).age_range_view_path(
+              require 'google/ads/google_ads/v1/services/age_range_view_service_client'
+              AgeRangeViewServiceClient
+                .age_range_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
               )
             end
 
             def asset(customer_id, asset_id)
-              @proto_lookup_util.service(:Asset).asset_path(
+              require 'google/ads/google_ads/v1/services/asset_service_client'
+              AssetServiceClient
+              .asset_path(
                 customer_id.to_s,
                 asset_id.to_s
               )
             end
 
             def bidding_strategy(customer_id, bidding_strategy_id)
-              @proto_lookup_util.service(:BiddingStrategy).
+              require 'google/ads/google_ads/v1/services/bidding_strategy_service_client'
+              BiddingStrategyServiceClient.
                   bidding_strategy_path(
                     customer_id.to_s,
                     bidding_strategy_id.to_s
@@ -186,12 +215,15 @@ module Google
             end
 
             def billing_setup(customer_id, billing_id)
-              @proto_lookup_util.service(:BillingSetup).billing_setup_path(
+              require 'google/ads/google_ads/v1/services/billing_setup_service_client'
+              BillingSetupServiceClient
+                .billing_setup_path(
                   customer_id.to_s, billing_id.to_s)
             end
 
             def campaign_audience_view(customer_id, campaign_id, criterion_id)
-              @proto_lookup_util.service(:CampaignAudienceView).
+              require 'google/ads/google_ads/v1/services/campaign_audience_view_service_client'
+              CampaignAudienceViewServiceClient.
                   campaign_audience_view_path(
                     customer_id.to_s,
                     sprintf('%s~%s', campaign_id.to_s, criterion_id.to_s)
@@ -199,18 +231,22 @@ module Google
             end
 
             def campaign_bid_modifier(customer_id, campaign_bid_modifier_id)
-              @proto_lookup_util.service(:CampaignBidModifier).
+              require 'google/ads/google_ads/v1/services/campaign_bid_modifier_service_client'
+              CampaignBidModifierServiceClient.
                   campaign_bid_modifier_path(customer_id.to_s,
                       campaign_bid_modifier_id.to_s)
             end
 
             def campaign_budget(customer_id, campaign_budget_id)
-              @proto_lookup_util.service(:CampaignBudget).campaign_budget_path(
+              require 'google/ads/google_ads/v1/services/campaign_budget_service_client'
+              CampaignBudgetServiceClient
+                .campaign_budget_path(
                   customer_id.to_s, campaign_budget_id.to_s)
             end
 
             def campaign_criterion(customer_id, campaign_id, criterion_id)
-              @proto_lookup_util.service(:CampaignCriterion).
+              require 'google/ads/google_ads/v1/services/campaign_criterion_service_client'
+              CampaignCriterionServiceClient.
                   campaign_criteria_path(
                     customer_id.to_s,
                     sprintf('%s~%s', campaign_id.to_s, criterion_id.to_s)
@@ -219,7 +255,8 @@ module Google
 
             def campaign_criterion_simulation(customer_id, campaign_id, criterion_id,
                 type, modification_method, start_date, end_date)
-              @proto_lookup_util.service(:CampaignCriterionSimulation).
+              require 'google/ads/google_ads/v1/services/campaign_criterion_simulation_service_client'
+              CampaignCriterionSimulationServiceClient.
                 campaign_criterion_simulation_path(
                   customer_id.to_s,
                   sprintf(
@@ -235,14 +272,18 @@ module Google
             end
 
             def campaign_draft(customer_id, campaign_id, draft_id)
-              @proto_lookup_util.service(:CampaignDraft).campaign_draft_path(
+              require 'google/ads/google_ads/v1/services/campaign_draft_service_client'
+              CampaignDraftServiceClient
+                .campaign_draft_path(
                 customer_id.to_s,
                 "#{campaign_id}~#{draft_id}"
               )
             end
 
             def campaign_experiment(customer_id, experiment_id)
-              @proto_lookup_util.service(:CampaignExperiment).campaign_experiment_path(
+              require 'google/ads/google_ads/v1/services/campaign_experiment_service_client'
+              CampaignExperimentServiceClient
+                .campaign_experiment_path(
                 customer_id.to_s,
                 experiment_id.to_s,
               )
@@ -250,7 +291,8 @@ module Google
 
             def campaign_extension_setting(customer_id, campaign_id,
                 extension_type)
-              @proto_lookup_util.service(:CampaignExtensionSetting).
+              require 'google/ads/google_ads/v1/services/campaign_extension_setting_service_client'
+              CampaignExtensionSettingServiceClient.
                   campaign_extension_setting_path(
                     customer_id.to_s,
                     sprintf('%s~%s', campaign_id.to_s, extension_type.to_s)
@@ -258,21 +300,26 @@ module Google
             end
 
             def campaign_feed(customer_id, campaign_id, feed_id)
-              @proto_lookup_util.service(:CampaignFeed).campaign_feed_path(
+              require 'google/ads/google_ads/v1/services/campaign_feed_service_client'
+              CampaignFeedServiceClient
+                .campaign_feed_path(
                 customer_id.to_s,
                 sprintf('%s~%s', campaign_id.to_s, feed_id.to_s)
               )
             end
 
             def campaign_label(customer_id, campaign_id, label_id)
-              @proto_lookup_util.service(:CampaignLabel).campaign_label_path(
+              require 'google/ads/google_ads/v1/services/campaign_label_service_client'
+              CampaignLabelServiceClient
+                .campaign_label_path(
                 customer_id.to_s,
                 sprintf('%s~%s', campaign_id.to_s, label_id.to_s)
               )
             end
 
             def campaign_shared_set(customer_id, campaign_id, shared_set_id)
-              @proto_lookup_util.service(:CampaignSharedSet).
+              require 'google/ads/google_ads/v1/services/campaign_shared_set_service_client'
+              CampaignSharedSetServiceClient.
                   campaign_shared_set_path(
                     customer_id.to_s,
                     sprintf('%s~%s', campaign_id.to_s, shared_set_id.to_s)
@@ -280,30 +327,38 @@ module Google
             end
 
             def campaign(customer_id, campaign_id)
-              @proto_lookup_util.service(:Campaign).campaign_path(
+              require 'google/ads/google_ads/v1/services/campaign_service_client'
+              CampaignServiceClient
+                .campaign_path(
                   customer_id.to_s, campaign_id.to_s)
             end
 
             def carrier_constant(criterion_id)
-              @proto_lookup_util.service(:CarrierConstant).
+              require 'google/ads/google_ads/v1/services/carrier_constant_service_client'
+              CarrierConstantServiceClient.
                   carrier_constant_path(criterion_id.to_s)
             end
 
             def change_status(customer_id, change_status_id)
-              @proto_lookup_util.service(:ChangeStatus).change_status_path(
+              require 'google/ads/google_ads/v1/services/change_status_service_client'
+              ChangeStatusServiceClient
+                .change_status_path(
                   customer_id.to_s, change_status_id.to_s)
             end
 
             # Date is expected in format 'yyyy-MM-dd'
             def click_view(customer_id, date, gclid)
-              @proto_lookup_util.service(:ClickView).click_view_path(
+              require 'google/ads/google_ads/v1/services/click_view_service_client'
+              ClickViewServiceClient
+                .click_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', date.to_s, gclid.to_s)
               )
             end
 
             def conversion_action(customer_id, conversion_action_id)
-              @proto_lookup_util.service(:ConversionAction).
+              require 'google/ads/google_ads/v1/services/conversion_action_service_client'
+              ConversionActionServiceClient.
                   conversion_action_path(
                     customer_id.to_s,
                     conversion_action_id.to_s
@@ -311,7 +366,9 @@ module Google
             end
 
             def custom_interest(customer_id, custom_interest_id)
-              @proto_lookup_util.service(:CustomInterest).custom_interest_path(
+              require 'google/ads/google_ads/v1/services/custom_interest_service_client'
+              CustomInterestServiceClient
+                .custom_interest_path(
                 customer_id.to_s,
                 custom_interest_id.to_s
               )
@@ -319,7 +376,8 @@ module Google
 
             def customer_client_link(
                 customer_id, client_customer_id, manager_link_id)
-              @proto_lookup_util.service(:CustomerClientLink).
+              require 'google/ads/google_ads/v1/services/customer_client_link_service_client'
+              CustomerClientLinkServiceClient.
                   customer_client_link_path(
                     customer_id.to_s,
                     sprintf('%s~%s', client_customer_id.to_s,
@@ -328,12 +386,15 @@ module Google
             end
 
             def customer_client(customer_id, client_customer_id)
-              @proto_lookup_util.service(:CustomerClient).customer_client_path(
+              require 'google/ads/google_ads/v1/services/customer_client_service_client'
+              CustomerClientServiceClient
+                .customer_client_path(
                   customer_id.to_s, client_customer_id.to_s)
             end
 
             def customer_extension_setting(customer_id, extension_type)
-              @proto_lookup_util.service(:CustomerExtensionSetting).
+              require 'google/ads/google_ads/v1/services/customer_extension_setting_service_client'
+              CustomerExtensionSettingServiceClient.
                   customer_extension_setting_path(
                     customer_id.to_s,
                     extension_type.to_s
@@ -341,18 +402,23 @@ module Google
             end
 
             def customer_feed(customer_id, feed_id)
-              @proto_lookup_util.service(:CustomerFeed).customer_feed_path(
+              require 'google/ads/google_ads/v1/services/customer_feed_service_client'
+              CustomerFeedServiceClient
+                .customer_feed_path(
                   customer_id.to_s, feed_id.to_s)
             end
 
             def customer_label(customer_id, label_id)
-              @proto_lookup_util.service(:CustomerLabel).customer_label_path(
+              require 'google/ads/google_ads/v1/services/customer_label_service_client'
+              CustomerLabelServiceClient
+                .customer_label_path(
                   customer_id.to_s, label_id.to_s)
             end
 
             def customer_manager_link(
                 customer_id, manager_customer_id, manager_link_id)
-              @proto_lookup_util.service(:CustomerManagerLink).
+              require 'google/ads/google_ads/v1/services/customer_manager_link_service_client'
+              CustomerManagerLinkServiceClient.
                   customer_manager_link_path(
                     customer_id.to_s,
                     sprintf('%s~%s', manager_customer_id.to_s,
@@ -361,7 +427,8 @@ module Google
             end
 
             def customer_negative_criterion(customer_id, criterion_id)
-              @proto_lookup_util.service(:CustomerNegativeCriterion).
+              require 'google/ads/google_ads/v1/services/customer_negative_criterion_service_client'
+              CustomerNegativeCriterionServiceClient.
                   customer_negative_criteria_path(
                     customer_id.to_s,
                     criterion_id.to_s
@@ -369,13 +436,15 @@ module Google
             end
 
             def customer(customer_id)
-              @proto_lookup_util.service(:Customer).
+              require 'google/ads/google_ads/v1/services/customer_service_client'
+              CustomerServiceClient.
                   customer_path(customer_id.to_s)
             end
 
             def detail_placement_view(customer_id, ad_group_id,
                 base64_placement)
-              @proto_lookup_util.service(:DetailPlacementView).
+              require 'google/ads/google_ads/v1/services/detail_placement_view_service_client'
+              DetailPlacementViewServiceClient.
                   detail_placement_view_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, base64_placement.to_s)
@@ -383,7 +452,8 @@ module Google
             end
 
             def display_keyword_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:DisplayKeywordView).
+              require 'google/ads/google_ads/v1/services/display_keyword_view_service_client'
+              DisplayKeywordViewServiceClient.
                   display_keyword_view_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
@@ -392,7 +462,9 @@ module Google
 
             def domain_category(customer_id, campaign_id, category_base64,
                 language_code)
-              @proto_lookup_util.service(:DomainCategory).domain_category_path(
+              require 'google/ads/google_ads/v1/services/domain_category_service_client'
+              DomainCategoryServiceClient
+                .domain_category_path(
                 customer_id.to_s,
                 sprintf('%s~%s~%s', campaign_id.to_s, category_base64.to_s,
                     language_code.to_s)
@@ -401,7 +473,8 @@ module Google
 
             def dynamic_search_ads_search_term_view(customer_id, ad_group_id,
                 search_term, headline, landing_page, page_url)
-              @proto_lookup_util.service(:DynamicSearchAdsSearchTermView).
+              require 'google/ads/google_ads/v1/services/dynamic_search_ads_search_term_view_service_client'
+              DynamicSearchAdsSearchTermViewServiceClient.
                   dynamic_search_ads_search_term_view_path(
                     customer_id.to_s,
                     sprintf(
@@ -416,7 +489,8 @@ module Google
             end
 
             def expanded_landing_page_view(customer_id, expanded_final_url_fingerprint)
-              @proto_lookup_util.service(:ExpandedLandingPageView).
+              require 'google/ads/google_ads/v1/services/expanded_landing_page_view_service_client'
+              ExpandedLandingPageViewServiceClient.
                 expanded_landing_page_view_path(
                   customer_id.to_s,
                   expanded_final_url_fingerprint.to_s,
@@ -424,7 +498,8 @@ module Google
             end
 
             def extension_feed_item(customer_id, feed_item_id)
-              @proto_lookup_util.service(:ExtensionFeedItem).
+              require 'google/ads/google_ads/v1/services/extension_feed_item_service_client'
+              ExtensionFeedItemServiceClient.
                   extension_feed_item_path(
                     customer_id.to_s,
                     feed_item_id.to_s
@@ -432,7 +507,9 @@ module Google
             end
 
             def feed_item(customer_id, feed_id, feed_item_id)
-              @proto_lookup_util.service(:FeedItem).feed_item_path(
+              require 'google/ads/google_ads/v1/services/feed_item_service_client'
+              FeedItemServiceClient
+                .feed_item_path(
                 customer_id.to_s,
                 sprintf('%s~%s', feed_id.to_s, feed_item_id.to_s)
               )
@@ -440,7 +517,9 @@ module Google
 
             def feed_item_target(customer_id, feed_id, feed_item_id,
                 feed_item_target_type, feed_item_target_id)
-              @proto_lookup_util.service(:FeedItemTarget).feed_item_target_path(
+              require 'google/ads/google_ads/v1/services/feed_item_target_service_client'
+              FeedItemTargetServiceClient
+                .feed_item_target_path(
                 customer_id.to_s,
                 sprintf(
                   '%s~%s~%s~%s',
@@ -453,14 +532,17 @@ module Google
             end
 
             def feed_mapping(customer_id, feed_id, feed_mapping_id)
-              @proto_lookup_util.service(:FeedMapping).feed_mapping_path(
+              require 'google/ads/google_ads/v1/services/feed_mapping_service_client'
+              FeedMappingServiceClient
+              .feed_mapping_path(
                 customer_id.to_s,
                 sprintf('%s~%s', feed_id.to_s, feed_mapping_id.to_s)
               )
             end
 
             def feed_placeholder_view(customer_id, placeholder_type)
-              @proto_lookup_util.service(:FeedPlaceholderView).
+              require 'google/ads/google_ads/v1/services/feed_placeholder_view_service_client'
+              FeedPlaceholderViewServiceClient.
                   feed_placeholder_view_path(
                     customer_id.to_s,
                     placeholder_type.to_s
@@ -468,37 +550,47 @@ module Google
             end
 
             def feed(customer_id, feed_id)
-              @proto_lookup_util.service(:Feed).feed_path(
+              require 'google/ads/google_ads/v1/services/feed_service_client'
+              FeedServiceClient
+                .feed_path(
                   customer_id.to_s, feed_id.to_s)
             end
 
             def gender_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:GenderView).gender_view_path(
+              require 'google/ads/google_ads/v1/services/gender_view_service_client'
+              GenderViewServiceClient
+                .gender_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
               )
             end
 
             def geo_target_constant(geo_target_constant_id)
-              @proto_lookup_util.service(:GeoTargetConstant).
+              require 'google/ads/google_ads/v1/services/geo_target_constant_service_client'
+              GeoTargetConstantServiceClient.
                   geo_target_constant_path(geo_target_constant_id.to_s)
             end
 
             def geographic_view(customer_id, country_criterion_id,
                 location_type)
-              @proto_lookup_util.service(:GeographicView).geographic_view_path(
+              require 'google/ads/google_ads/v1/services/geographic_view_service_client'
+              GeographicViewServiceClient
+                .geographic_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', country_criterion_id.to_s, location_type.to_s)
               )
             end
 
             def google_ads_field(google_ads_field)
-              @proto_lookup_util.service(:GoogleAdsField).google_ads_field_path(
+              require 'google/ads/google_ads/v1/services/google_ads_field_service_client'
+              GoogleAdsFieldServiceClient
+                .google_ads_field_path(
                   google_ads_field.to_s)
             end
 
             def group_placement_view(customer_id, ad_group_id, base64_placement)
-              @proto_lookup_util.service(:GroupPlacementView).
+              require 'google/ads/google_ads/v1/services/group_placement_view_service_client'
+              GroupPlacementViewServiceClient.
                   group_placement_view_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, base64_placement.to_s)
@@ -506,19 +598,23 @@ module Google
             end
 
             def hotel_group_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:HotelGroupView).hotel_group_view_path(
+              require 'google/ads/google_ads/v1/services/hotel_group_view_service_client'
+              HotelGroupViewServiceClient
+                .hotel_group_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
               )
             end
 
             def hotel_performance_view(customer_id)
-              @proto_lookup_util.service(:HotelPerformanceView).
+              require 'google/ads/google_ads/v1/services/hotel_performance_view_service_client'
+              HotelPerformanceViewServiceClient.
                   hotel_performance_view_path(customer_id.to_s)
             end
 
             def keyword_plan_ad_group(customer_id, kp_ad_group_id)
-              @proto_lookup_util.service(:KeywordPlanAdGroup).
+              require 'google/ads/google_ads/v1/services/keyword_plan_ad_group_service_client'
+              KeywordPlanAdGroupServiceClient.
                   keyword_plan_ad_group_path(
                     customer_id.to_s,
                     kp_ad_group_id.to_s
@@ -526,7 +622,8 @@ module Google
             end
 
             def keyword_plan_campaign(customer_id, kp_campaign_id)
-              @proto_lookup_util.service(:KeywordPlanCampaign).
+              require 'google/ads/google_ads/v1/services/keyword_plan_campaign_service_client'
+              KeywordPlanCampaignServiceClient.
                   keyword_plan_campaign_path(
                     customer_id.to_s,
                     kp_campaign_id.to_s
@@ -534,7 +631,8 @@ module Google
             end
 
             def keyword_plan_keyword(customer_id, kp_ad_group_keyword_id)
-              @proto_lookup_util.service(:KeywordPlanKeyword).
+              require 'google/ads/google_ads/v1/services/keyword_plan_keyword_service_client'
+              KeywordPlanKeywordServiceClient.
                   keyword_plan_keyword_path(
                     customer_id.to_s,
                     kp_ad_group_keyword_id.to_s
@@ -543,7 +641,8 @@ module Google
 
             def keyword_plan_negative_keyword(customer_id,
                 kp_negative_keyword_id)
-              @proto_lookup_util.service(:KeywordPlanNegativeKeyword).
+              require 'google/ads/google_ads/v1/services/keyword_plan_negative_keyword_service_client'
+              KeywordPlanNegativeKeywordServiceClient.
                   keyword_plan_negative_keyword_path(
                     customer_id.to_s,
                     kp_negative_keyword_id.to_s
@@ -551,38 +650,48 @@ module Google
             end
 
             def keyword_plan(customer_id, kp_plan_id)
-              @proto_lookup_util.service(:KeywordPlan).keyword_plan_path(
+              require 'google/ads/google_ads/v1/services/keyword_plan_service_client'
+              KeywordPlanServiceClient
+                .keyword_plan_path(
                   customer_id.to_s, kp_plan_id.to_s)
             end
 
             def keyword_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:KeywordView).keyword_view_path(
+              require 'google/ads/google_ads/v1/services/keyword_view_service_client'
+              KeywordViewServiceClient
+                .keyword_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
               )
             end
 
             def label(customer_id, label_id)
-              @proto_lookup_util.service(:Label).label_path(
+              require 'google/ads/google_ads/v1/services/label_service_client'
+              LabelServiceClient
+                .label_path(
                 customer_id.to_s,
                 label_id.to_s
               )
             end
 
             def language_constant(criterion_id)
-              @proto_lookup_util.service(:LanguageConstant).
+              require 'google/ads/google_ads/v1/services/language_constant_service_client'
+              LanguageConstantServiceClient.
                   language_constant_path(criterion_id.to_s)
             end
 
             def location_view(customer_id, campaign_id, criterion_id)
-              @proto_lookup_util.service(:LocationView).location_view_path(
+              require 'google/ads/google_ads/v1/services/location_view_service_client'
+              LocationViewServiceClient
+                .location_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', campaign_id.to_s, criterion_id.to_s)
               )
             end
 
             def managed_placement_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:ManagedPlacementView).
+              require 'google/ads/google_ads/v1/services/managed_placement_view_service_client'
+              ManagedPlacementViewServiceClient.
                   managed_placement_view_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
@@ -590,12 +699,15 @@ module Google
             end
 
             def media_file(customer_id, media_file_id)
-              @proto_lookup_util.service(:MediaFile).media_file_path(
+              require 'google/ads/google_ads/v1/services/media_file_service_client'
+              MediaFileServiceClient
+                .media_file_path(
                   customer_id.to_s, media_file_id.to_s)
             end
 
             def merchant_center_link(customer_id, merchant_center_id)
-              @proto_lookup_util.service(:MerchantCenterLink).
+              require 'google/ads/google_ads/v1/services/merchant_center_link_service_client'
+              MerchantCenterLinkServiceClient.
                   merchant_center_link_path(
                     customer_id.to_s,
                     merchant_center_id.to_s
@@ -603,29 +715,35 @@ module Google
             end
 
             def mobile_app_category_constant(mobile_app_category_id)
-              @proto_lookup_util.service(:MobileAppCategoryConstant).
+              require 'google/ads/google_ads/v1/services/mobile_app_category_constant_service_client'
+              MobileAppCategoryConstantServiceClient.
                   mobile_app_category_constant_path(mobile_app_category_id.to_s)
             end
 
             def mobile_device_constant(criterion_id)
-              @proto_lookup_util.service(:MobileDeviceConstant).
+              require 'google/ads/google_ads/v1/services/mobile_device_constant_service_client'
+              MobileDeviceConstantServiceClient.
                   mobile_device_constant_path(criterion_id.to_s)
             end
 
             def mutate_job(customer_id, mutate_job_id)
-              @proto_lookup_util.service(:MutateJob).mutate_job_path(
+              require 'google/ads/google_ads/v1/services/mutate_job_service_client'
+              MutateJobServiceClient
+                .mutate_job_path(
                 customer_id.to_s,
                 mutate_job_id.to_s
               )
             end
 
             def operating_system_version_constant(criterion_id)
-              @proto_lookup_util.service(:OperatingSystemVersionConstant).
+              require 'google/ads/google_ads/v1/services/operating_system_version_constant_service_client'
+              OperatingSystemVersionConstantServiceClient.
                   operating_system_version_constant_path(criterion_id.to_s)
             end
 
             def parental_status_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:ParentalStatusView).
+              require 'google/ads/google_ads/v1/services/parental_status_view_service_client'
+              ParentalStatusViewServiceClient.
                   parental_status_view_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
@@ -633,14 +751,16 @@ module Google
             end
 
             def product_bidding_category_constant(country_code, level, id)
-              @proto_lookup_util.service(:ProductBiddingCategoryConstant).
+              require 'google/ads/google_ads/v1/services/product_bidding_category_constant_service_client'
+              ProductBiddingCategoryConstantServiceClient.
                   product_bidding_category_constant_path(
                     sprintf('%s~%s~%s', country_code.to_s, level.to_s, id.to_s)
                   )
             end
 
             def product_group_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:ProductGroupView).
+              require 'google/ads/google_ads/v1/services/product_group_view_service_client'
+              ProductGroupViewServiceClient.
                   product_group_view_path(
                     customer_id.to_s,
                     sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
@@ -648,12 +768,15 @@ module Google
             end
 
             def recommendation(customer_id, recommendation_id)
-              @proto_lookup_util.service(:Recommendation).recommendation_path(
+              require 'google/ads/google_ads/v1/services/recommendation_service_client'
+              RecommendationServiceClient
+                .recommendation_path(
                 customer_id.to_s, recommendation_id.to_s)
             end
 
             def remarketing_action(customer_id, remarketing_action_id)
-              @proto_lookup_util.service(:RemarketingAction).
+              require 'google/ads/google_ads/v1/services/remarketing_action_service_client'
+              RemarketingActionServiceClient.
                   remarketing_action_path(
                     customer_id.to_s,
                     remarketing_action_id.to_s
@@ -662,7 +785,9 @@ module Google
 
             def search_term_view(customer_id, campaign_id, ad_group_id,
                 search_term)
-              @proto_lookup_util.service(:SearchTermView).search_term_view_path(
+              require 'google/ads/google_ads/v1/services/search_term_view_service_client'
+              SearchTermViewServiceClient
+                .search_term_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s~%s',
                     campaign_id.to_s, ad_group_id.to_s, search_term.to_s)
@@ -670,48 +795,63 @@ module Google
             end
 
             def shared_criterion(customer_id, shared_set_id, criterion_id)
-              @proto_lookup_util.service(:SharedCriterion).shared_criteria_path(
+              require 'google/ads/google_ads/v1/services/shared_criterion_service_client'
+              SharedCriterionServiceClient
+                .shared_criteria_path(
                 customer_id.to_s,
                 sprintf('%s~%s', shared_set_id.to_s, criterion_id.to_s)
               )
             end
 
             def shared_set(customer_id, shared_set_id)
-              @proto_lookup_util.service(:SharedSet).shared_set_path(
+              require 'google/ads/google_ads/v1/services/shared_set_service_client'
+              SharedSetServiceClient
+                .shared_set_path(
                   customer_id.to_s, shared_set_id.to_s)
             end
 
             def shopping_performance_view(customer_id)
-              @proto_lookup_util.service(:ShoppingPerformanceView).
+              require 'google/ads/google_ads/v1/services/shopping_performance_view_service_client'
+              ShoppingPerformanceViewServiceClient.
                   shopping_performance_view_path(
                     customer_id.to_s
                   )
             end
 
             def topic_constant(vertical_id)
-              @proto_lookup_util.service(:TopicConstant).topic_constant_path(
+              require 'google/ads/google_ads/v1/services/topic_constant_service_client'
+              TopicConstantServiceClient
+                .topic_constant_path(
                   vertical_id.to_s)
             end
 
             def topic_view(customer_id, ad_group_id, criterion_id)
-              @proto_lookup_util.service(:TopicView).topic_view_path(
+              require 'google/ads/google_ads/v1/services/topic_view_service_client'
+              TopicViewServiceClient
+                .topic_view_path(
                 customer_id.to_s,
                 sprintf('%s~%s', ad_group_id.to_s, criterion_id.to_s)
               )
             end
 
             def user_interest(customer_id, user_interest_id)
-              @proto_lookup_util.service(:UserInterest).user_interest_path(
+              require 'google/ads/google_ads/v1/services/user_interest_service_client'
+              UserInterestServiceClient
+                .user_interest_path(
                   customer_id.to_s, user_interest_id.to_s)
             end
 
             def user_list(customer_id, user_list_id)
-              @proto_lookup_util.service(:UserList).user_list_path(
+              require 'google/ads/google_ads/v1/services/user_list_service_client'
+              UserListServiceClient
+                .user_list_path(
                 customer_id.to_s, user_list_id.to_s)
             end
 
             def video(customer_id, video_id)
-              @proto_lookup_util.service(:Video).video_path(
+              require 'google/ads/google_ads/v1/services/video_service_client'
+              VideoServiceClient
+                .video_path(
                   customer_id.to_s, video_id.to_s)
             end
           end