Skip to content

Commit 9e45101

Browse files
quartzmoquartzmo
authored
feat(google-api-go-generator): add universe domain support (#2335)
* replace GDU (googleapis.com) in the baseURL
1 parent 3f90b98 commit 9e45101

25 files changed

+143
-1
lines changed

‎google-api-go-generator/gen.go

+19-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ import (
2929
)
3030

3131
const (
32-
googleDiscoveryURL = "https://www.googleapis.com/discovery/v1/apis"
32+
googleDiscoveryURL = "https://www.googleapis.com/discovery/v1/apis"
33+
googleDefaultUniverse = "googleapis.com"
34+
universeDomainPlaceholder = "UNIVERSE_DOMAIN"
3335
)
3436

3537
var (
@@ -498,6 +500,14 @@ func (a *API) apiBaseURL() string {
498500
return resolveRelative(base, rel)
499501
}
500502

503+
// apiBaseURLTemplate returns the value returned by apiBaseURL with the
504+
// Google Default Universe (googleapis.com) replaced with the placeholder
505+
// UNIVERSE_DOMAIN for universe domain substitution.
506+
func (a *API) apiBaseURLTemplate() (string, error) {
507+
base := a.apiBaseURL()
508+
return strings.Replace(base, googleDefaultUniverse, universeDomainPlaceholder, 1), nil
509+
}
510+
501511
func (a *API) mtlsAPIBaseURL() string {
502512
if a.doc.MTLSRootURL != "" {
503513
return resolveRelative(a.doc.MTLSRootURL, a.doc.ServicePath)
@@ -760,9 +770,15 @@ func (a *API) GenerateCode() ([]byte, error) {
760770
pn("const apiName = %q", a.doc.Name)
761771
pn("const apiVersion = %q", a.doc.Version)
762772
pn("const basePath = %q", a.apiBaseURL())
773+
basePathTemplate, err := a.apiBaseURLTemplate()
774+
if err != nil {
775+
return buf.Bytes(), err
776+
}
777+
pn("const basePathTemplate = %q", basePathTemplate)
763778
if mtlsBase := a.mtlsAPIBaseURL(); mtlsBase != "" {
764779
pn("const mtlsBasePath = %q", mtlsBase)
765780
}
781+
pn("const defaultUniverseDomain = \"googleapis.com\"")
766782

767783
a.generateScopeConstants()
768784
a.PopulateSchemas()
@@ -785,9 +801,11 @@ func (a *API) GenerateCode() ([]byte, error) {
785801
pn("opts = append([]option.ClientOption{scopesOption}, opts...)")
786802
}
787803
pn("opts = append(opts, internaloption.WithDefaultEndpoint(basePath))")
804+
pn("opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))")
788805
if a.mtlsAPIBaseURL() != "" {
789806
pn("opts = append(opts, internaloption.WithDefaultMTLSEndpoint(mtlsBasePath))")
790807
}
808+
pn("opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))")
791809
pn("client, endpoint, err := htransport.NewClient(ctx, opts...)")
792810
pn("if err != nil { return nil, err }")
793811
pn("s, err := New(client)")

‎google-api-go-generator/gen_test.go

+32
Original file line numberDiff line numberDiff line change
@@ -285,3 +285,35 @@ func TestAsComment_LongLink(t *testing.T) {
285285
t.Errorf("got %q, want %q", got, want)
286286
}
287287
}
288+
289+
func TestApiBaseURLTemplate(t *testing.T) {
290+
tests := []struct {
291+
name, want string
292+
}{
293+
{
294+
name: "any.json",
295+
want: "https://logging.UNIVERSE_DOMAIN/",
296+
},
297+
{
298+
name: "blogger-3.json",
299+
want: "https://www.UNIVERSE_DOMAIN/blogger/v3/",
300+
},
301+
{
302+
name: "required-query.json",
303+
want: "https://www.UNIVERSE_DOMAIN/_ah/api/tshealth/v1/",
304+
},
305+
}
306+
for _, tt := range tests {
307+
api, err := apiFromFile(filepath.Join("testdata", tt.name))
308+
if err != nil {
309+
t.Fatalf("Error loading API testdata/%s: %v", tt.name, err)
310+
}
311+
got, err := api.apiBaseURLTemplate()
312+
if err != nil {
313+
t.Fatalf("%s: apiBaseURLTemplate(): %v", tt.name, err)
314+
}
315+
if got != tt.want {
316+
t.Errorf("%s: apiBaseURLTemplate() = %q; want %q", tt.name, got, tt.want)
317+
}
318+
}
319+
}

‎google-api-go-generator/testdata/any.want

+4
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ const apiId = "logging:v1beta3"
9090
const apiName = "logging"
9191
const apiVersion = "v1beta3"
9292
const basePath = "https://logging.googleapis.com/"
93+
const basePathTemplate = "https://logging.UNIVERSE_DOMAIN/"
9394
const mtlsBasePath = "https://logging.mtls.googleapis.com/"
95+
const defaultUniverseDomain = "googleapis.com"
9496

9597
// OAuth2 scopes used by this API.
9698
const (
@@ -106,7 +108,9 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
106108
// NOTE: prepend, so we don't override user-specified scopes.
107109
opts = append([]option.ClientOption{scopesOption}, opts...)
108110
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
111+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
109112
opts = append(opts, internaloption.WithDefaultMTLSEndpoint(mtlsBasePath))
113+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
110114
client, endpoint, err := htransport.NewClient(ctx, opts...)
111115
if err != nil {
112116
return nil, err

‎google-api-go-generator/testdata/arrayofarray-1.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "arrayofarray:v1"
8888
const apiName = "arrayofarray"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/arrayofenum.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "arrayofenum:v1"
8888
const apiName = "arrayofenum"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/arrayofmapofobjects.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "arrayofmapofstrings:v1"
8888
const apiName = "arrayofmapofstrings"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/arrayofmapofstrings.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "arrayofmapofstrings:v1"
8888
const apiName = "arrayofmapofstrings"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/blogger-3.want

+4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ const apiId = "blogger:v3"
9595
const apiName = "blogger"
9696
const apiVersion = "v3"
9797
const basePath = "https://www.googleapis.com/blogger/v3/"
98+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/blogger/v3/"
9899
const mtlsBasePath = "https://www.mtls.googleapis.com/blogger/v3/"
100+
const defaultUniverseDomain = "googleapis.com"
99101

100102
// OAuth2 scopes used by this API.
101103
const (
@@ -115,7 +117,9 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
115117
// NOTE: prepend, so we don't override user-specified scopes.
116118
opts = append([]option.ClientOption{scopesOption}, opts...)
117119
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
120+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
118121
opts = append(opts, internaloption.WithDefaultMTLSEndpoint(mtlsBasePath))
122+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
119123
client, endpoint, err := htransport.NewClient(ctx, opts...)
120124
if err != nil {
121125
return nil, err

‎google-api-go-generator/testdata/floats.want

+4
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,16 @@ const apiId = "X:v1"
9090
const apiName = "X"
9191
const apiVersion = "v1"
9292
const basePath = "https://appengine.googleapis.com/"
93+
const basePathTemplate = "https://appengine.UNIVERSE_DOMAIN/"
9394
const mtlsBasePath = "https://appengine.mtls.googleapis.com/"
95+
const defaultUniverseDomain = "googleapis.com"
9496

9597
// NewService creates a new Service.
9698
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9799
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
100+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98101
opts = append(opts, internaloption.WithDefaultMTLSEndpoint(mtlsBasePath))
102+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
99103
client, endpoint, err := htransport.NewClient(ctx, opts...)
100104
if err != nil {
101105
return nil, err

‎google-api-go-generator/testdata/getwithoutbody.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "getwithoutbody:v1"
8888
const apiName = "getwithoutbody"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/http-body.want

+4
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ const apiId = "healthcare:v1beta1"
9090
const apiName = "healthcare"
9191
const apiVersion = "v1beta1"
9292
const basePath = "https://healthcare.googleapis.com/"
93+
const basePathTemplate = "https://healthcare.UNIVERSE_DOMAIN/"
9394
const mtlsBasePath = "https://healthcare.mtls.googleapis.com/"
95+
const defaultUniverseDomain = "googleapis.com"
9496

9597
// OAuth2 scopes used by this API.
9698
const (
@@ -106,7 +108,9 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
106108
// NOTE: prepend, so we don't override user-specified scopes.
107109
opts = append([]option.ClientOption{scopesOption}, opts...)
108110
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
111+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
109112
opts = append(opts, internaloption.WithDefaultMTLSEndpoint(mtlsBasePath))
113+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
110114
client, endpoint, err := htransport.NewClient(ctx, opts...)
111115
if err != nil {
112116
return nil, err

‎google-api-go-generator/testdata/json-body.want

+4
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ const apiId = "ml:v1"
9090
const apiName = "ml"
9191
const apiVersion = "v1"
9292
const basePath = "https://ml.googleapis.com/"
93+
const basePathTemplate = "https://ml.UNIVERSE_DOMAIN/"
9394
const mtlsBasePath = "https://ml.mtls.googleapis.com/"
95+
const defaultUniverseDomain = "googleapis.com"
9496

9597
// OAuth2 scopes used by this API.
9698
const (
@@ -106,7 +108,9 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
106108
// NOTE: prepend, so we don't override user-specified scopes.
107109
opts = append([]option.ClientOption{scopesOption}, opts...)
108110
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
111+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
109112
opts = append(opts, internaloption.WithDefaultMTLSEndpoint(mtlsBasePath))
113+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
110114
client, endpoint, err := htransport.NewClient(ctx, opts...)
111115
if err != nil {
112116
return nil, err

‎google-api-go-generator/testdata/mapofany.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "mapofany:v1"
8888
const apiName = "mapofany"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/mapofarrayofobjects.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "additionalprops:v1"
8888
const apiName = "additionalprops"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/mapofint64strings.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "androidbuildinternal:v1"
8888
const apiName = "androidbuildinternal"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/mapofobjects.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "additionalpropsobjs:v1"
8888
const apiName = "additionalpropsobjs"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/mapofstrings-1.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "additionalprops:v1"
8888
const apiName = "additionalprops"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/param-rename.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "paramrename:v1"
8888
const apiName = "paramrename"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

‎google-api-go-generator/testdata/quotednum.want

+4
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ const apiId = "adexchangebuyer:v1.1"
9090
const apiName = "adexchangebuyer"
9191
const apiVersion = "v1.1"
9292
const basePath = "https://www.googleapis.com/adexchangebuyer/v1.1/"
93+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/adexchangebuyer/v1.1/"
9394
const mtlsBasePath = "https://www.mtls.googleapis.com/adexchangebuyer/v1.1/"
95+
const defaultUniverseDomain = "googleapis.com"
9496

9597
// OAuth2 scopes used by this API.
9698
const (
@@ -106,7 +108,9 @@ func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, err
106108
// NOTE: prepend, so we don't override user-specified scopes.
107109
opts = append([]option.ClientOption{scopesOption}, opts...)
108110
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
111+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
109112
opts = append(opts, internaloption.WithDefaultMTLSEndpoint(mtlsBasePath))
113+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
110114
client, endpoint, err := htransport.NewClient(ctx, opts...)
111115
if err != nil {
112116
return nil, err

‎google-api-go-generator/testdata/repeated.want

+4
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ const apiId = "repeated:v1"
8888
const apiName = "repeated"
8989
const apiVersion = "v1"
9090
const basePath = "https://www.googleapis.com/discovery/v1/apis"
91+
const basePathTemplate = "https://www.UNIVERSE_DOMAIN/discovery/v1/apis"
92+
const defaultUniverseDomain = "googleapis.com"
9193

9294
// NewService creates a new Service.
9395
func NewService(ctx context.Context, opts ...option.ClientOption) (*Service, error) {
9496
opts = append(opts, internaloption.WithDefaultEndpoint(basePath))
97+
opts = append(opts, internaloption.WithDefaultEndpointTemplate(basePathTemplate))
98+
opts = append(opts, internaloption.WithDefaultUniverseDomain(defaultUniverseDomain))
9599
client, endpoint, err := htransport.NewClient(ctx, opts...)
96100
if err != nil {
97101
return nil, err

0 commit comments

Comments
 (0)