Merge pull request #603 from mrWinston/OSD-24926-update-osdctl-wif-generation-to-polish-the-template

[OSD-24926] wif template generation fixes

Author: openshift-merge-bot[bot]

cmd/cmd.go

@@ -26,6 +26,7 @@ import (
 	"github.com/openshift/osdctl/cmd/cost"
 	"github.com/openshift/osdctl/cmd/env"
 	"github.com/openshift/osdctl/cmd/hive"
+	"github.com/openshift/osdctl/cmd/iampermissions"
 	"github.com/openshift/osdctl/cmd/jira"
 	"github.com/openshift/osdctl/cmd/jumphost"
 	"github.com/openshift/osdctl/cmd/mc"
@@ -101,6 +102,7 @@ func NewCmdRoot(streams genericclioptions.IOStreams) *cobra.Command {
 	rootCmd.AddCommand(servicelog.NewCmdServiceLog())
 	rootCmd.AddCommand(setup.NewCmdSetup())
 	rootCmd.AddCommand(swarm.Cmd)
+	rootCmd.AddCommand(iampermissions.NewCmdIamPermissions())
 
 	// Add cost command to use AWS Cost Manager
 	rootCmd.AddCommand(cost.NewCmdCost(streams, globalOpts))

pkg/policies/gcp.go

@@ -1,6 +1,7 @@
 package policies
 
 import (
+	"slices"
 	"strings"
 
 	cco "github.com/openshift/cloud-credential-operator/pkg/apis/cloudcredential/v1"
@@ -51,8 +52,11 @@ func CredentialsRequestToWifServiceAccount(credReq *cco.CredentialsRequest) (*Se
 	}
 
 	if len(gcpSpec.Permissions) > 0 {
+		roleId := strings.ReplaceAll(credReq.Name, "-", "_")
+		roleId = roleId[:min(64, len(roleId))]
+		slices.Sort(gcpSpec.Permissions)
 		sa.Roles = append(sa.Roles, Role{
-			Id:          credReq.Name,
+			Id:          roleId,
 			Kind:        "Role",
 			Permissions: gcpSpec.Permissions,
 			Predefined:  false,

pkg/policies/gcp_models.go

@@ -23,13 +23,13 @@ type ServiceAccount struct {
 }
 
 type CredentialRequest struct {
-	SecretRef           SecretRef
-	ServiceAccountNames []string
+	SecretRef           SecretRef `json:"secret_ref,omitempty"`
+	ServiceAccountNames []string  `json:"service_account_names,omitempty"`
 }
 
 type SecretRef struct {
-	Name      string
-	Namespace string
+	Name      string `json:"name,omitempty"`
+	Namespace string `json:"namespace,omitempty"`
 }
 
 func (s ServiceAccount) GetId() string {