feat(secret): handle bytes data (#2849)

Author: Monitob

cmd/scw/testdata/test-all-usage-secret-version-create-usage.golden

@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   secret-id         ID of the Secret
-  [data]            The base64-encoded secret payload of the SecretVersion
+  data              Content of the secret version. Base64 is handled by the SDK (Support file loading with @/path/to/file)
   [description]     Description of the SecretVersion
   [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par)
 

docs/commands/secret.md

@@ -198,7 +198,7 @@ scw secret version create [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | secret-id | Required | ID of the Secret |
-| data |  | The base64-encoded secret payload of the SecretVersion |
+| data | Required | Content of the secret version. Base64 is handled by the SDK |
 | description |  | Description of the SecretVersion |
 | region | Default: `fr-par`<br />One of: `fr-par` | Region to target. If none is passed will use default region from the config |
 

internal/args/unmarshal.go

@@ -107,6 +107,10 @@ var unmarshalFuncs = map[reflect.Type]UnmarshalFunc{
 		*(dest.(*scw.JSONObject)) = jsonObject
 		return nil
 	},
+	reflect.TypeOf((*[]byte)(nil)).Elem(): func(value string, dest interface{}) error {
+		*(dest.(*[]byte)) = []byte(value)
+		return nil
+	},
 }
 
 // UnmarshalStruct parses args like ["arg1=1", "arg2=2"] to a Go structure using reflection.

internal/core/arg_file_content.go

@@ -56,6 +56,14 @@ func loadArgsFileContent(cmd *Command, cmdArgs interface{}) error {
 					}
 					v.SetString(string(content))
 				}
+			case []byte:
+				if strings.HasPrefix(string(i), "@") {
+					content, err := os.ReadFile(string(i)[1:])
+					if err != nil {
+						return fmt.Errorf("could not open requested file: %s", err)
+					}
+					v.SetBytes(content)
+				}
 			case nil:
 				continue
 			default:

internal/human/marshal_func.go

@@ -125,6 +125,13 @@ func init() {
 		}
 		return string(data), nil
 	})
+	registerMarshaler(func(i []byte, opt *MarshalOpt) (string, error) {
+		data, err := json.Marshal(i)
+		if err != nil {
+			return "", err
+		}
+		return strings.Trim(string(data), "\""), nil
+	})
 }
 
 func registerMarshaler[T any](marshalFunc func(i T, opt *MarshalOpt) (string, error)) {

internal/human/marshal_test.go

@@ -24,6 +24,7 @@ type Struct struct {
 	Stringer    Stringer
 	StringerPtr *Stringer
 	Size        *scw.Size
+	Bytes       []byte
 }
 
 type StructAny struct {
@@ -113,6 +114,7 @@ func TestMarshal(t *testing.T) {
 			Stringer:    Stringer{},
 			StringerPtr: &Stringer{},
 			Size:        scw.SizePtr(13200),
+			Bytes:       []byte{0, 1},
 		},
 		result: `
 			String              This is a string
@@ -136,6 +138,7 @@ func TestMarshal(t *testing.T) {
 			Stringer            a stringer
 			StringerPtr         a stringer
 			Size                13 kB
+			Bytes               AAE=
 		`,
 	}))
 
@@ -242,7 +245,7 @@ func Test_getStructFieldsIndex(t *testing.T) {
 					Strings: []string{"aa", "ab"}},
 				),
 			},
-			want: [][]int{{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}},
+			want: [][]int{{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}, {12}},
 		},
 	}
 	for _, tt := range tests {

internal/namespaces/secret/v1alpha1/custom.go

@@ -7,5 +7,16 @@ import (
 func GetCommands() *core.Commands {
 	cmds := GetGeneratedCommands()
 
+	cmds.MustFind("secret", "version", "create").Override(dataCreateVersion)
 	return cmds
 }
+
+func dataCreateVersion(c *core.Command) *core.Command {
+	*c.ArgSpecs.GetByName("data") = core.ArgSpec{
+		Name:        "data",
+		Short:       "Content of the secret version. Base64 is handled by the SDK",
+		Required:    true,
+		CanLoadFile: true,
+	}
+	return c
+}