chore(opensearch): adjust outputResult to accept inputModel

relates to STACKITTCLI-372

Author: SerseusWasTaken

internal/cmd/opensearch/credentials/create/create.go

@@ -76,7 +76,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return fmt.Errorf("create OpenSearch credentials: %w", err)
 			}
 
-			return outputResult(params.Printer, model.OutputFormat, model.ShowPassword, instanceLabel, resp)
+			return outputResult(params.Printer, *model, instanceLabel, resp)
 		},
 	}
 	configureFlags(cmd)
@@ -112,23 +112,26 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *opensearch.
 	return req
 }
 
-func outputResult(p *print.Printer, outputFormat string, showPassword bool, instanceLabel string, resp *opensearch.CredentialsResponse) error {
+func outputResult(p *print.Printer, model inputModel, instanceLabel string, resp *opensearch.CredentialsResponse) error {
+	if model.GlobalFlagModel == nil {
+		return fmt.Errorf("no global flags defined")
+	}
 	if resp == nil || resp.Raw == nil {
 		return fmt.Errorf("response or response content is nil")
 	}
 
-	if !showPassword {
+	if !model.ShowPassword {
 		resp.Raw.Credentials.Password = "hidden"
 	}
 
-	return p.OutputResult(outputFormat, resp, func() error {
+	return p.OutputResult(model.OutputFormat, resp, func() error {
 		p.Outputf("Created credentials for instance %q. Credentials ID: %s\n\n", instanceLabel, resp.Id)
 		// The username field cannot be set by the user so we only display it if it's not returned empty
 		if resp.HasRaw() {
 			if username := resp.Raw.Credentials.Username; username != "" {
 				p.Outputf("Username: %s\n", username)
 			}
-			if !showPassword {
+			if !model.ShowPassword {
 				p.Outputf("Password: <hidden>\n")
 			} else {
 				p.Outputf("Password: %s\n", resp.Raw.Credentials.Password)

internal/cmd/opensearch/credentials/create/create_test.go

@@ -169,8 +169,7 @@ func TestBuildRequest(t *testing.T) {
 
 func TestOutputResult(t *testing.T) {
 	type args struct {
-		outputFormat  string
-		showPassword  bool
+		model         inputModel
 		instanceLabel string
 		resp          *opensearch.CredentialsResponse
 	}
@@ -196,7 +195,10 @@ func TestOutputResult(t *testing.T) {
 		{
 			name: "empty response should not cause panic when password should be hidden",
 			args: args{
-				showPassword: false,
+				model: inputModel{
+					GlobalFlagModel: &globalflags.GlobalFlagModel{},
+					ShowPassword:    false,
+				},
 			},
 			wantErr: true,
 		},
@@ -209,14 +211,17 @@ func TestOutputResult(t *testing.T) {
 					},
 					Uri: "https://opensearch.example.com",
 				},
+				model: inputModel{
+					GlobalFlagModel: &globalflags.GlobalFlagModel{},
+				},
 			},
 			wantErr: false,
 		},
 	}
 	params := testparams.NewTestParams()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := outputResult(params.Printer, tt.args.outputFormat, tt.args.showPassword, tt.args.instanceLabel, tt.args.resp); (err != nil) != tt.wantErr {
+			if err := outputResult(params.Printer, tt.args.model, tt.args.instanceLabel, tt.args.resp); (err != nil) != tt.wantErr {
 				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})