Skip to content

Commit 3b41408

Browse files
quartzmoquartzmo
authored
chore: add internaloption.WithDefaultEndpointTemplate (#10003)
BEGIN_NESTED_COMMIT fix(batch):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(bigtable):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(datacatalog):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(datastream):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(debugger):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(errorreporting):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(run):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(storage):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT BEGIN_NESTED_COMMIT fix(vmmigration):add internaloption.WithDefaultEndpointTemplate END_NESTED_COMMIT
1 parent ba31ed5 commit 3b41408

File tree

13 files changed

+25
-5
lines changed

13 files changed

+25
-5
lines changed

‎batch/apiv1/iam_policy_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bigtable/internal/option/option.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func DefaultClientOptions(endpoint, mtlsEndpoint, scope, userAgent string) ([]op
115115
o = []option.ClientOption{option.WithGRPCConn(conn)}
116116
} else {
117117
o = []option.ClientOption{
118-
internaloption.WithDefaultEndpoint(endpoint),
118+
internaloption.WithDefaultEndpointTemplate(endpoint),
119119
internaloption.WithDefaultMTLSEndpoint(mtlsEndpoint),
120120
option.WithScopes(scope),
121121
option.WithUserAgent(userAgent),

‎datacatalog/apiv1/iam_policy_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎datastream/apiv1/iam_policy_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎debugger/apiv2/controller2_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎debugger/apiv2/debugger2_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎errorreporting/apiv1beta1/error_group_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎errorreporting/apiv1beta1/error_stats_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎errorreporting/apiv1beta1/report_errors_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎run/apiv2/locations_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎storage/http_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ func newHTTPStorageClient(ctx context.Context, opts ...storageOption) (storageCl
107107
// Append the emulator host as default endpoint for the user
108108
o = append([]option.ClientOption{option.WithoutAuthentication()}, o...)
109109

110-
o = append(o, internaloption.WithDefaultEndpoint(endpoint))
110+
o = append(o, internaloption.WithDefaultEndpointTemplate(endpoint))
111111
o = append(o, internaloption.WithDefaultMTLSEndpoint(endpoint))
112112
}
113113
s.clientOption = o
114114

115-
// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpoint, and WithDefaultMTLSEndpoint.
115+
// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpointTemplate, and WithDefaultMTLSEndpoint.
116116
hc, ep, err := htransport.NewClient(ctx, s.clientOption...)
117117
if err != nil {
118118
return nil, fmt.Errorf("dialing: %w", err)

‎storage/storage.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,12 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
180180
opts = append([]option.ClientOption{
181181
option.WithoutAuthentication(),
182182
internaloption.SkipDialSettingsValidation(),
183-
internaloption.WithDefaultEndpoint(endpoint),
183+
internaloption.WithDefaultEndpointTemplate(endpoint),
184184
internaloption.WithDefaultMTLSEndpoint(endpoint),
185185
}, opts...)
186186
}
187187

188-
// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpoint, and WithDefaultMTLSEndpoint.
188+
// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpointTemplate, and WithDefaultMTLSEndpoint.
189189
hc, ep, err := htransport.NewClient(ctx, opts...)
190190
if err != nil {
191191
return nil, fmt.Errorf("dialing: %w", err)

‎vmmigration/apiv1/iam_policy_client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)