feat: add support for universe domain (#4675)

generator/src/googleapis/codegen/api.py

@@ -331,8 +331,11 @@ def _NormalizeUrlComponents(self):
     scheme = url_parts.scheme or 'https'
     service_host = url_parts.netloc or _DEFAULT_SERVICE_HOST
     base_path = url_parts.path
-    if not root_url:
+    if root_url:
+      self._api.SetTemplateValue('rootUrlTemplate', root_url.replace('googleapis.com', 'UNIVERSE_DOMAIN'))
+    else:
       self._api.SetTemplateValue('rootUrl', '%s://%s/' % (scheme, service_host))
+      self._api.SetTemplateValue('rootUrlTemplate', '%s://%s/' % (scheme, service_host.replace('googleapis.com', 'UNIVERSE_DOMAIN')))
     if service_path is None:
       self._api.SetTemplateValue('servicePath', base_path[1:])
 

generator/src/googleapis/codegen/languages/php/default/templates/___api_className___.php.tmpl

@@ -30,6 +30,7 @@ const {{ authscope.name }} =
 {% endfor %}{% endindent %}{% endfilter %}{% endif %}
 
 {% call_template _resource_var resource=api %}
+  public $rootUrlTemplate;
 {% if api.methods %}  private $base_methods;{% endif %}
   /**{% filter block_comment %}
    * Constructs the internal representation of the {{ api.className }} service.
@@ -45,6 +46,7 @@ const {{ authscope.name }} =
 {% indent 2 %}
 parent::__construct($clientOrConfig);
 $this->rootUrl = $rootUrl ?: {% literal api.rootUrl %};
+$this->rootUrlTemplate = $rootUrl ?: {% literal api.rootUrlTemplate %};
 $this->servicePath = {% literal api.servicePath %};
 {% if api.batchPath %}$this->batchPath = {% literal api.batchPath %};{% endif %}
 $this->version = {% literal api.version %};

generator/tests/testdata/golden/php/default/endpoints_google_owned.golden

@@ -40,6 +40,7 @@ class EccoDomaniIeri extends \Google\Service
       "https://www.googleapis.com/auth/userinfo.email";
 
   public $greetings;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the EccoDomaniIeri service.
@@ -52,6 +53,7 @@ class EccoDomaniIeri extends \Google\Service
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://peer-pontus.appspot.com/_ah/api/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://peer-pontus.appspot.com/_ah/api/';
     $this->servicePath = 'helloworld/v1/';
     $this->batchPath = 'batch';
     $this->version = 'v1';

generator/tests/testdata/golden/php/default/endpoints_third_party.golden

@@ -40,6 +40,7 @@ class EccoDomaniIeri extends \Google\Service
       "https://www.googleapis.com/auth/userinfo.email";
 
   public $greetings;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the EccoDomaniIeri service.
@@ -52,6 +53,7 @@ class EccoDomaniIeri extends \Google\Service
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://peer-pontus.appspot.com/_ah/api/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://peer-pontus.appspot.com/_ah/api/';
     $this->servicePath = 'helloworld/v1/';
     $this->batchPath = 'batch';
     $this->version = 'v1';

generator/tests/testdata/golden/php/default/kitchen_sink.golden

@@ -60,6 +60,7 @@ class KitchSink extends \Google\Service
   public $topics;
   public $topics_submissions;
   public $votes;
+  public $rootUrlTemplate;
   private $base_methods;
   /**
    * Constructs the internal representation of the KitchSink service.
@@ -72,6 +73,7 @@ class KitchSink extends \Google\Service
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://www.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://www.UNIVERSE_DOMAIN/';
     $this->servicePath = 'sink/v1/';
     $this->version = 'v1';
     $this->serviceName = 'kitch_sink';

generator/tests/testdata/golden/php/default/php_array_scalars.golden

@@ -46,6 +46,7 @@ class PhpArrayScalars extends \Google\Service
       "https://www.googleapis.com/auth/userinfo.email";
 
   public $getwitharrays;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the PhpArrayScalars service.
@@ -58,6 +59,7 @@ class PhpArrayScalars extends \Google\Service
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://www.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://www.UNIVERSE_DOMAIN/';
     $this->servicePath = 'php_float_type/v1/';
     $this->version = 'v1';
     $this->serviceName = 'php_array_scalars';

generator/tests/testdata/golden/php/default/php_float_type.golden

@@ -46,6 +46,7 @@ class PhpFloatType extends \Google\Service
       "https://www.googleapis.com/auth/userinfo.email";
 
   public $getwithfloat;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the PhpFloatType service.
@@ -58,6 +59,7 @@ class PhpFloatType extends \Google\Service
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://www.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://www.UNIVERSE_DOMAIN/';
     $this->servicePath = 'php_float_type/v1/';
     $this->version = 'v1';
     $this->serviceName = 'php_float_type';

src/AIPlatformNotebooks.php

@@ -41,6 +41,7 @@ class AIPlatformNotebooks extends \Google\Service
   public $projects_locations;
   public $projects_locations_instances;
   public $projects_locations_operations;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AIPlatformNotebooks service.
@@ -53,6 +54,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://notebooks.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://notebooks.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v2';

src/AbusiveExperienceReport.php

@@ -39,6 +39,7 @@ class AbusiveExperienceReport extends \Google\Service
 
   public $sites;
   public $violatingSites;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AbusiveExperienceReport
@@ -52,6 +53,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://abusiveexperiencereport.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://abusiveexperiencereport.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/Acceleratedmobilepageurl.php

@@ -38,6 +38,7 @@ class Acceleratedmobilepageurl extends \Google\Service
 
 
   public $ampUrls;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the Acceleratedmobilepageurl
@@ -51,6 +52,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://acceleratedmobilepageurl.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://acceleratedmobilepageurl.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/AccessApproval.php

@@ -44,6 +44,7 @@ class AccessApproval extends \Google\Service
   public $organizations_approvalRequests;
   public $projects;
   public $projects_approvalRequests;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AccessApproval service.
@@ -56,6 +57,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://accessapproval.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://accessapproval.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/AccessContextManager.php

@@ -54,6 +54,7 @@ class AccessContextManager extends \Google\Service
   public $operations;
   public $organizations_gcpUserAccessBindings;
   public $services;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AccessContextManager service.
@@ -66,6 +67,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://accesscontextmanager.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://accesscontextmanager.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/AdExchangeBuyerII.php

@@ -82,6 +82,7 @@ class AdExchangeBuyerII extends \Google\Service
   public $buyers_filterSets_impressionMetrics;
   public $buyers_filterSets_losingBids;
   public $buyers_filterSets_nonBillableWinningBids;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AdExchangeBuyerII service.
@@ -94,6 +95,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://adexchangebuyer.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://adexchangebuyer.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v2beta1';

src/AdExperienceReport.php

@@ -39,6 +39,7 @@ class AdExperienceReport extends \Google\Service
 
   public $sites;
   public $violatingSites;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AdExperienceReport service.
@@ -51,6 +52,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://adexperiencereport.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://adexperiencereport.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/AdMob.php

@@ -47,6 +47,7 @@ class AdMob extends \Google\Service
   public $accounts_apps;
   public $accounts_mediationReport;
   public $accounts_networkReport;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AdMob service.
@@ -59,6 +60,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://admob.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://admob.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/AdSenseHost.php

@@ -48,6 +48,7 @@ class AdSenseHost extends \Google\Service
   public $customchannels;
   public $reports;
   public $urlchannels;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AdSenseHost service.
@@ -60,6 +61,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://www.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://www.UNIVERSE_DOMAIN/';
     $this->servicePath = 'adsensehost/v4.1/';
     $this->batchPath = 'batch/adsensehost/v4.1';
     $this->version = 'v4.1';

src/Adsense.php

@@ -53,6 +53,7 @@ class Adsense extends \Google\Service
   public $accounts_reports;
   public $accounts_reports_saved;
   public $accounts_sites;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the Adsense service.
@@ -65,6 +66,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://adsense.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://adsense.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v2';

src/AlertCenter.php

@@ -42,6 +42,7 @@ class AlertCenter extends \Google\Service
   public $alerts;
   public $alerts_feedback;
   public $v1beta1;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AlertCenter service.
@@ -54,6 +55,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://alertcenter.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://alertcenter.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1beta1';

src/Analytics.php

@@ -82,6 +82,7 @@ class Analytics extends \Google\Service
   public $metadata_columns;
   public $provisioning;
   public $userDeletion_userDeletionRequest;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the Analytics service.
@@ -94,6 +95,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://analytics.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://analytics.UNIVERSE_DOMAIN/';
     $this->servicePath = 'analytics/v3/';
     $this->batchPath = 'batch/analytics/v3';
     $this->version = 'v3';

src/AnalyticsData.php

@@ -49,6 +49,7 @@ class AnalyticsData extends \Google\Service
 
   public $properties;
   public $properties_audienceExports;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AnalyticsData service.
@@ -61,6 +62,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://analyticsdata.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://analyticsdata.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1beta';

src/AnalyticsHub.php

@@ -45,6 +45,7 @@ class AnalyticsHub extends \Google\Service
   public $projects_locations_dataExchanges;
   public $projects_locations_dataExchanges_listings;
   public $projects_locations_subscriptions;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AnalyticsHub service.
@@ -57,6 +58,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://analyticshub.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://analyticshub.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/AnalyticsReporting.php

@@ -43,6 +43,7 @@ class AnalyticsReporting extends \Google\Service
 
   public $reports;
   public $userActivity;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AnalyticsReporting service.
@@ -55,6 +56,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://analyticsreporting.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://analyticsreporting.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v4';

src/AndroidEnterprise.php

@@ -54,6 +54,7 @@ class AndroidEnterprise extends \Google\Service
   public $storelayoutpages;
   public $users;
   public $webapps;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AndroidEnterprise service.
@@ -66,6 +67,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://androidenterprise.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://androidenterprise.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/AndroidManagement.php

@@ -50,6 +50,7 @@ class AndroidManagement extends \Google\Service
   public $enterprises_webTokens;
   public $provisioningInfo;
   public $signupUrls;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AndroidManagement service.
@@ -62,6 +63,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://androidmanagement.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://androidmanagement.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';

src/AndroidProvisioningPartner.php

@@ -46,6 +46,7 @@ class AndroidProvisioningPartner extends \Google\Service
   public $partners_devices;
   public $partners_vendors;
   public $partners_vendors_customers;
+  public $rootUrlTemplate;
 
   /**
    * Constructs the internal representation of the AndroidProvisioningPartner
@@ -59,6 +60,7 @@ public function __construct($clientOrConfig = [], $rootUrl = null)
   {
     parent::__construct($clientOrConfig);
     $this->rootUrl = $rootUrl ?: 'https://androiddeviceprovisioning.googleapis.com/';
+    $this->rootUrlTemplate = $rootUrl ?: 'https://androiddeviceprovisioning.UNIVERSE_DOMAIN/';
     $this->servicePath = '';
     $this->batchPath = 'batch';
     $this->version = 'v1';