Merge pull request #97 from venkataanil/fix_ocm_options

fix broken cli option
cloud-bulldozer · Dec 7, 2022 · 0806969 · 0806969
2 parents d59fe06 + 0ca40dd
commit 0806969
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/cmd/ocm-load-test.go b/cmd/ocm-load-test.go
@@ -176,8 +176,8 @@ func run(cmd *cobra.Command, args []string) error {
                 os.Exit(1)
         }
 
-	if viper.Sub("ocm") == nil {
-		logger.Fatal(cmd.Context(), "ocm is a necessary configuration")
+	if viper.Sub("ocm") == nil && viper.GetString("ocm-token") == "" {
+		logger.Fatal(cmd.Context(), "ocm section or ocm-token is necessary configuration")
 	}
 	err = helpers.CreateFolder(cmd.Context(), viper.GetString("output-path"), logger)
 	if err != nil {

diff --git a/pkg/ocm/connection.go b/pkg/ocm/connection.go
@@ -47,7 +47,18 @@ func BuildConnection(gateway, clientID, clientSecret, token string, logger loggi
 
 func BuildConnections(ctx context.Context, logger logging.Logger) ([]*sdk.Connection, error) {
 	connections := make([]*sdk.Connection, 0)
-	auths := viper.GetStringMap("ocm")["auths"].([]interface{})
+
+	var auths []interface{}
+	if viper.Sub("ocm") != nil {
+		auths = viper.GetStringMap("ocm")["auths"].([]interface{})
+	} else if viper.GetString("ocm-token") != "" {
+		auth := map[string]interface{}{
+				"token": viper.GetString("ocm-token"),
+				"client-id": viper.GetString("client.id"),
+				"client-secret": viper.GetString("client.secret"),
+			}
+		auths = append(auths, auth)
+	}
 	for _, a := range auths {
 		m := a.(map[string]interface{})
 		token, ok := m["token"]