Merge pull request #1561 from BernardMC/fix/session-manager-not-getting-tags

k8s-ci-robot · web-flow · commit bc9094c8429f · 2025-08-18T09:49:08.000-07:00
Fix: Tags client not returning tags when session manager is used
diff --git a/pkg/common/connectionmanager/zones.go b/pkg/common/connectionmanager/zones.go
@@ -294,7 +294,7 @@ func withTagsClient(ctx context.Context, connection *vclib.VSphereConnection, f
 	c := rest.NewClient(connection.Client)
 	if connection.SessionManagerURL != "" {
 		c.SessionID(connection.Client.SessionCookie().Value)
-		return nil
+		return f(c)
 	}
 
 	signer, err := connection.Signer(ctx, connection.Client)
@@ -312,11 +312,6 @@ func withTagsClient(ctx context.Context, connection *vclib.VSphereConnection, f
 	}
 
 	defer func() {
-		// When using shared session manager we don't need to logout
-		if connection.SessionManagerURL != "" {
-			return
-		}
-
 		if err := c.Logout(ctx); err != nil {
 			klog.Errorf("failed to logout: %v", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ func withTagsClient(ctx context.Context, connection *vclib.VSphereConnection, f`
`294`	`294`	`c := rest.NewClient(connection.Client)`
`295`	`295`	`if connection.SessionManagerURL != "" {`
`296`	`296`	`c.SessionID(connection.Client.SessionCookie().Value)`
`297`		`- return nil`
	`297`	`+ return f(c)`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`signer, err := connection.Signer(ctx, connection.Client)`
`@@ -312,11 +312,6 @@ func withTagsClient(ctx context.Context, connection *vclib.VSphereConnection, f`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`defer func() {`
`315`		`- // When using shared session manager we don't need to logout`
`316`		`- if connection.SessionManagerURL != "" {`
`317`		`- return`
`318`		`- }`
`319`		`-`
`320`	`315`	`if err := c.Logout(ctx); err != nil {`
`321`	`316`	`klog.Errorf("failed to logout: %v", err)`
`322`	`317`	`}`