yaml/json format added

Author: Jan Sternagel

internal/cmd/beta/kms/key/delete/delete.go

@@ -2,8 +2,11 @@ package delete
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"time"
 
+	"github.com/goccy/go-yaml"
 	"github.com/spf13/cobra"
 	"github.com/stackitcloud/stackit-cli/internal/cmd/params"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/args"
@@ -82,8 +85,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				return err
 			}
 
-			params.Printer.Info("Deletion of KMS Key %q scheduled successfully for the deletion date: %q\n", keyName, deletionDate)
-			return nil
+			return outputResult(params.Printer, model.OutputFormat, model.KeyId, keyName, deletionDate)
 		},
 	}
 
@@ -138,3 +140,49 @@ func configureFlags(cmd *cobra.Command) {
 	err := flags.MarkFlagsRequired(cmd, keyRingIdFlag, keyIdFlag)
 	cobra.CheckErr(err)
 }
+
+func outputResult(p *print.Printer, outputFormat, keyId, keyName string, deletionDate time.Time) error {
+	switch outputFormat {
+	case print.JSONOutputFormat:
+		details := struct {
+			KeyId        string    `json:"keyId"`
+			KeyName      string    `json:"keyName"`
+			Status       string    `json:"status"`
+			DeletionDate time.Time `json:"deletionDate"`
+		}{
+			KeyId:        keyId,
+			KeyName:      keyName,
+			Status:       "Deletion Scheduled",
+			DeletionDate: deletionDate,
+		}
+		b, err := json.MarshalIndent(details, "", "  ")
+		if err != nil {
+			return fmt.Errorf("marshal output to JSON: %w", err)
+		}
+		p.Outputln(string(b))
+		return nil
+
+	case print.YAMLOutputFormat:
+		details := struct {
+			KeyId        string    `yaml:"keyId"`
+			KeyName      string    `yaml:"keyName"`
+			Status       string    `yaml:"status"`
+			DeletionDate time.Time `yaml:"deletionDate"`
+		}{
+			KeyId:        keyId,
+			KeyName:      keyName,
+			Status:       "Deletion Scheduled",
+			DeletionDate: deletionDate,
+		}
+		b, err := yaml.Marshal(details)
+		if err != nil {
+			return fmt.Errorf("marshal output to YAML: %w", err)
+		}
+		p.Outputln(string(b))
+		return nil
+
+	default:
+		p.Outputf("Deletion of KMS Key %q scheduled successfully for the deletion date: %q\n", keyName, deletionDate)
+		return nil
+	}
+}

internal/cmd/beta/kms/key/delete/delete_test.go

@@ -3,11 +3,13 @@ package delete
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
 	"github.com/spf13/cobra"
+	"github.com/stackitcloud/stackit-cli/internal/cmd/params"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 	"github.com/stackitcloud/stackit-sdk-go/services/kms"
@@ -225,3 +227,49 @@ func TestBuildRequest(t *testing.T) {
 		})
 	}
 }
+
+func TestOutputResult(t *testing.T) {
+	tests := []struct {
+		description  string
+		wantErr      bool
+		outputFormat string
+		keyId        string
+		keyName      string
+		deltionDate  time.Time
+	}{
+		{
+			description: "default output",
+			keyId:       uuid.NewString(),
+			keyName:     uuid.NewString(),
+			deltionDate: time.Now(),
+			wantErr:     false,
+		},
+		{
+			description:  "json output",
+			outputFormat: print.JSONOutputFormat,
+			keyId:        uuid.NewString(),
+			keyName:      uuid.NewString(),
+			deltionDate:  time.Now(),
+			wantErr:      false,
+		},
+		{
+			description:  "yaml output",
+			outputFormat: print.YAMLOutputFormat,
+			keyId:        uuid.NewString(),
+			keyName:      uuid.NewString(),
+			deltionDate:  time.Now(),
+			wantErr:      false,
+		},
+	}
+
+	p := print.NewPrinter()
+	p.Cmd = NewCmd(&params.CmdParams{Printer: p})
+	for _, tt := range tests {
+		t.Run(tt.description, func(t *testing.T) {
+			err := outputResult(p, tt.outputFormat, tt.keyId, tt.keyName, tt.deltionDate)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}

internal/cmd/beta/kms/version/restore/restore.go

@@ -69,7 +69,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 				return fmt.Errorf("restore Key Version: %w", err)
 			}
 
-			params.Printer.Info("Restored version %d of Key %q\n", *model.VersionNumber, keyName)
+			params.Printer.Outputf("Restored version %d of Key %q\n", *model.VersionNumber, keyName)
 			return nil
 		},
 	}