fix(compute/metadata): set subClient for UseDefaultClient case (#12911)

codyoss · web-flow · commit 9e2646b18212 · 2025-09-17T15:45:32.000-06:00
Caught in an internal review. Verified all constructors have been
updated now.
diff --git a/compute/metadata/metadata.go b/compute/metadata/metadata.go
@@ -409,7 +409,7 @@ func NewWithOptions(opts *Options) *Client {
 		if logger == nil {
 			logger = slog.New(noOpHandler{})
 		}
-		return &Client{hc: defaultClient.hc, logger: logger}
+		return &Client{hc: defaultClient.hc, subClient: defaultClient.subClient, logger: logger}
 	}
 
 	// Handle isolated client creation.
diff --git a/compute/metadata/metadata_test.go b/compute/metadata/metadata_test.go
@@ -458,6 +458,16 @@ func TestNewWithOptions(t *testing.T) {
 	}
 }
 
+func TestNewWithOptions_UseDefaultClient(t *testing.T) {
+	client := NewWithOptions(&Options{UseDefaultClient: true})
+	if client.hc != defaultClient.hc {
+		t.Errorf("NewWithOptions(UseDefaultClient: true).hc = %p, want %p", client.hc, defaultClient.hc)
+	}
+	if client.subClient != defaultClient.subClient {
+		t.Errorf("NewWithOptions(UseDefaultClient: true).subClient = %p, want %p", client.subClient, defaultClient.subClient)
+	}
+}
+
 func TestSubscribeUsesSubscribeClient(t *testing.T) {
 	subscribeClientUsed := make(chan bool, 1)
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ func NewWithOptions(opts Options) Client {`
`409`	`409`	`if logger == nil {`
`410`	`410`	`logger = slog.New(noOpHandler{})`
`411`	`411`	`}`
`412`		`- return &Client{hc: defaultClient.hc, logger: logger}`
	`412`	`+ return &Client{hc: defaultClient.hc, subClient: defaultClient.subClient, logger: logger}`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`// Handle isolated client creation.`