OCM-6419 | feat: fetch OIDC thumbprint from CS

openshift · Apr 24, 2024 · 4fee338 · 4fee338
1 parent 5935b9c
commit 4fee338
Show file tree

Hide file tree

Showing 23 changed files with 39,765 additions and 38,851 deletions.
diff --git a/cmd/create/cluster/cmd.go b/cmd/create/cluster/cmd.go
@@ -3236,7 +3236,14 @@ func run(cmd *cobra.Command, _ []string) {
 			if !output.HasFlag() || r.Reporter.IsTerminal() {
 				r.Reporter.Infof("Preparing to create OIDC Provider.")
 			}
-			oidcprovider.Cmd.Run(oidcprovider.Cmd, []string{clusterName, mode, ""})
+
+			runner := oidcprovider.CreateOidcProviderRunner()
+			err = runner(nil, r, oidcprovider.NewCreateOidcProviderCommand(),
+				[]string{clusterName, mode, ""})
+			if err != nil {
+				r.Reporter.Errorf("%s", err)
+				os.Exit(1)
+			}
 		} else {
 			output := ""
 			if len(operatorRoles) == 0 {
@@ -3353,12 +3360,12 @@ func GenerateContractDisplay(contract *accountsv1.Contract) string {
 	numberOfVCPUs, numberOfClusters := ocm.GetNumsOfVCPUsAndClusters(dimensions)
 
 	contractDisplay := fmt.Sprintf(`
-   +---------------------+----------------+ 
-   | Start Date          |%s    | 
-   | End Date            |%s    | 
-   | Number of vCPUs:    |'%s'             | 
-   | Number of clusters: |'%s'             | 
-   +---------------------+----------------+ 
+   +---------------------+----------------+
+   | Start Date          |%s    |
+   | End Date            |%s    |
+   | Number of vCPUs:    |'%s'             |
+   | Number of clusters: |'%s'             |
+   +---------------------+----------------+
 `,
 		contract.StartDate().Format(format),
 		contract.EndDate().Format(format),

diff --git a/cmd/create/cmd.go b/cmd/create/cmd.go
@@ -54,8 +54,9 @@ func init() {
 	Cmd.AddCommand(cluster.Cmd)
 	Cmd.AddCommand(idp.Cmd)
 	Cmd.AddCommand(machinepool.Cmd)
-	Cmd.AddCommand(oidcconfig.Cmd)
-	Cmd.AddCommand(oidcprovider.Cmd)
+	Cmd.AddCommand(oidcconfig.NewCreateOidcConfigCommand())
+	oidcProviderCmd := oidcprovider.NewCreateOidcProviderCommand()
+	Cmd.AddCommand(oidcProviderCmd)
 	Cmd.AddCommand(operatorroles.Cmd)
 	Cmd.AddCommand(userrole.Cmd)
 	Cmd.AddCommand(ocmrole.Cmd)
@@ -75,7 +76,7 @@ func init() {
 	globallyAvailableCommands := []*cobra.Command{
 		accountroles.Cmd, operatorroles.Cmd,
 		userrole.Cmd, ocmrole.Cmd,
-		oidcprovider.Cmd,
+		oidcProviderCmd,
 	}
 	arguments.MarkRegionHidden(Cmd, globallyAvailableCommands)
 }