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
googleapis · Apr 19, 2024 · 3b41408 · 3b41408
1 parent ba31ed5
commit 3b41408
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 5 deletions.
diff --git a/batch/apiv1/iam_policy_client.go b/batch/apiv1/iam_policy_client.go
diff --git a/bigtable/internal/option/option.go b/bigtable/internal/option/option.go
@@ -115,7 +115,7 @@ func DefaultClientOptions(endpoint, mtlsEndpoint, scope, userAgent string) ([]op
 		o = []option.ClientOption{option.WithGRPCConn(conn)}
 	} else {
 		o = []option.ClientOption{
-			internaloption.WithDefaultEndpoint(endpoint),
+			internaloption.WithDefaultEndpointTemplate(endpoint),
 			internaloption.WithDefaultMTLSEndpoint(mtlsEndpoint),
 			option.WithScopes(scope),
 			option.WithUserAgent(userAgent),

diff --git a/datacatalog/apiv1/iam_policy_client.go b/datacatalog/apiv1/iam_policy_client.go
diff --git a/datastream/apiv1/iam_policy_client.go b/datastream/apiv1/iam_policy_client.go
diff --git a/debugger/apiv2/controller2_client.go b/debugger/apiv2/controller2_client.go
diff --git a/debugger/apiv2/debugger2_client.go b/debugger/apiv2/debugger2_client.go
diff --git a/errorreporting/apiv1beta1/error_group_client.go b/errorreporting/apiv1beta1/error_group_client.go
diff --git a/errorreporting/apiv1beta1/error_stats_client.go b/errorreporting/apiv1beta1/error_stats_client.go
diff --git a/errorreporting/apiv1beta1/report_errors_client.go b/errorreporting/apiv1beta1/report_errors_client.go
diff --git a/run/apiv2/locations_client.go b/run/apiv2/locations_client.go
diff --git a/storage/http_client.go b/storage/http_client.go
@@ -107,12 +107,12 @@ func newHTTPStorageClient(ctx context.Context, opts ...storageOption) (storageCl
 		// Append the emulator host as default endpoint for the user
 		o = append([]option.ClientOption{option.WithoutAuthentication()}, o...)
 
-		o = append(o, internaloption.WithDefaultEndpoint(endpoint))
+		o = append(o, internaloption.WithDefaultEndpointTemplate(endpoint))
 		o = append(o, internaloption.WithDefaultMTLSEndpoint(endpoint))
 	}
 	s.clientOption = o
 
-	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpoint, and WithDefaultMTLSEndpoint.
+	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpointTemplate, and WithDefaultMTLSEndpoint.
 	hc, ep, err := htransport.NewClient(ctx, s.clientOption...)
 	if err != nil {
 		return nil, fmt.Errorf("dialing: %w", err)

diff --git a/storage/storage.go b/storage/storage.go
@@ -180,12 +180,12 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
 		opts = append([]option.ClientOption{
 			option.WithoutAuthentication(),
 			internaloption.SkipDialSettingsValidation(),
-			internaloption.WithDefaultEndpoint(endpoint),
+			internaloption.WithDefaultEndpointTemplate(endpoint),
 			internaloption.WithDefaultMTLSEndpoint(endpoint),
 		}, opts...)
 	}
 
-	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpoint, and WithDefaultMTLSEndpoint.
+	// htransport selects the correct endpoint among WithEndpoint (user override), WithDefaultEndpointTemplate, and WithDefaultMTLSEndpoint.
 	hc, ep, err := htransport.NewClient(ctx, opts...)
 	if err != nil {
 		return nil, fmt.Errorf("dialing: %w", err)

diff --git a/vmmigration/apiv1/iam_policy_client.go b/vmmigration/apiv1/iam_policy_client.go