Fix resource manager client (#72)

* Fix resource manager client

* Add extra prefix check to fix test

---------

Co-authored-by: Yeshwanth Gunasekaran <yesh@google.com>

Author: yeshwanth1993

devops-mcp-server/cloudbuild/cloudbuild.go

@@ -95,6 +95,9 @@ var createTriggerToolFunc func(ctx context.Context, req *mcp.CallToolRequest, ar
 
 func addCreateTriggerTool(server *mcp.Server, cbClient cloudbuildclient.CloudBuildClient, iamClient iamclient.IAMClient, rmClient resourcemanagerclient.ResourcemanagerClient) {
 	createTriggerToolFunc = func(ctx context.Context, req *mcp.CallToolRequest, args CreateTriggerArgs) (*mcp.CallToolResult, any, error) {
+		if args.ServiceAccount != "" && !strings.HasPrefix(args.ServiceAccount, "serviceAccount:") {
+			args.ServiceAccount = fmt.Sprintf("serviceAccount:%s", args.ServiceAccount)
+		}
 		if args.ServiceAccount != "" && !IsValidServiceAccount(args.ServiceAccount) {
 			return &mcp.CallToolResult{}, nil, fmt.Errorf("service account needs to be of the form serviceAccount:name@project-id.iam.gserviceaccount.com")
 		}
@@ -140,6 +143,6 @@ func setPermissionsForCloudBuildSA(ctx context.Context, projectID, serviceAccoun
 
 // IsValidServiceAccount checks if the string follows the specific GCP service account format.
 func IsValidServiceAccount(sa string) bool {
-	var saRegex = regexp.MustCompile(`^[a-z]([-a-z0-9]*[a-z0-9])@[a-z0-9-]+\.iam\.gserviceaccount\.com$`)
+	var saRegex = regexp.MustCompile(`^serviceAccount:[a-z0-9-]+@[a-z0-9-]+\.iam\.gserviceaccount\.com$`)
 	return saRegex.MatchString(sa)
 }

devops-mcp-server/resourcemanager/client/resourcemanagerclient.go

@@ -40,8 +40,6 @@ func NewClient(ctx context.Context) (ResourcemanagerClient, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to create resource manager client: %v", err)
 	}
-	defer rmClient.Close()
-
 	return &ResourcemanagerClientImpl{projectsClient: rmClient}, nil
 }