fix: fix secrets commands

Author: inessebz

cmd/okms/secrets/secrets.go

@@ -21,15 +21,15 @@ import (
 
 func kvGetCmd() *cobra.Command {
 	var (
-		version int32
+		version uint32
 	)
 
 	cmd := &cobra.Command{
 		Use:   "get PATH",
 		Short: "Retrieves the value from KMS's key-value store at the given key name",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			var v *int32
+			var v *uint32
 			if version != 0 {
 				v = &version
 			}
@@ -56,7 +56,7 @@ func kvGetCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().Int32Var(&version, "version", 0, "If passed, the value at the version number will be returned")
+	cmd.Flags().Uint32Var(&version, "version", 0, "If passed, the value at the version number will be returned")
 	return cmd
 }
 
@@ -78,14 +78,14 @@ func kvPutCmd() *cobra.Command {
 				os.Exit(1)
 			}
 
-			var c *int32
+			var c uint32
 			if cas != -1 {
-				c = &cas
+				c = utils.ToUint32(c)
 			}
 			body := types.PostSecretRequest{
 				Data: new(any),
 				Options: &types.PostSecretOptions{
-					Cas: c,
+					Cas: &c,
 				},
 			}
 
@@ -122,14 +122,14 @@ func kvPatchCmd() *cobra.Command {
 				os.Exit(1)
 			}
 
-			var c *int32
+			var c uint32
 			if cas != -1 {
-				c = &cas
+				c = utils.ToUint32(cas)
 			}
 			body := types.PostSecretRequest{
 				Data: new(any),
 				Options: &types.PostSecretOptions{
-					Cas: c,
+					Cas: &c,
 				},
 			}
 
@@ -150,7 +150,7 @@ func kvPatchCmd() *cobra.Command {
 
 func kvDeleteCmd() *cobra.Command {
 	var (
-		versions []int32
+		versions []uint
 	)
 
 	cmd := &cobra.Command{
@@ -161,70 +161,82 @@ func kvDeleteCmd() *cobra.Command {
 			if len(versions) == 0 {
 				exit.OnErr(common.Client().DeleteSecretRequest(cmd.Context(), args[0]))
 			} else {
-				exit.OnErr(common.Client().DeleteSecretVersions(cmd.Context(), args[0], versions))
+				var v []uint32
+				for _, val := range versions {
+					v = append(v, utils.ToUint32(val))
+				}
+				exit.OnErr(common.Client().DeleteSecretVersions(cmd.Context(), args[0], v))
 			}
 		},
 	}
 
-	cmd.Flags().Int32SliceVar(&versions, "versions", []int32{}, "Specifies the version numbers to delete. (Comma separated list of versions)")
+	cmd.Flags().UintSliceVar(&versions, "versions", []uint{}, "Specifies the version numbers to delete. (Comma separated list of versions)")
 	return cmd
 }
 
 func kvUndeleteCmd() *cobra.Command {
 	var (
-		versions []int32
+		versions []uint
 	)
 
 	cmd := &cobra.Command{
 		Use:   "undelete PATH",
 		Short: "Undeletes the data for the provided version and path in the key-value store.",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			exit.OnErr(common.Client().PostSecretUndelete(cmd.Context(), args[0], versions))
+			var v []uint32
+			for _, val := range versions {
+				v = append(v, utils.ToUint32(val))
+			}
+			exit.OnErr(common.Client().PostSecretUndelete(cmd.Context(), args[0], v))
 		},
 	}
 
-	cmd.Flags().Int32SliceVar(&versions, "versions", []int32{}, "Specifies the version numbers to delete. (Comma separated list of versions)")
+	cmd.Flags().UintSliceVar(&versions, "versions", []uint{}, "Specifies the version numbers to delete. (Comma separated list of versions)")
 	_ = cmd.MarkFlagRequired("versions")
 	return cmd
 }
 
 func kvDestroyCmd() *cobra.Command {
 	var (
-		versions []int32
+		versions []uint
 	)
 
 	cmd := &cobra.Command{
 		Use:   "destroy PATH",
 		Short: "Permanently removes the specified versions' data from the key-value store.",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			exit.OnErr(common.Client().PostSecretDestroy(cmd.Context(), args[0], versions))
+			var v []uint32
+			for _, val := range versions {
+				v = append(v, utils.ToUint32(val))
+			}
+			exit.OnErr(common.Client().PostSecretDestroy(cmd.Context(), args[0], v))
 		},
 	}
 
-	cmd.Flags().Int32SliceVar(&versions, "versions", []int32{}, "Specifies the version numbers to delete. (Comma separated list of versions)")
+	cmd.Flags().UintSliceVar(&versions, "versions", []uint{}, "Specifies the version numbers to delete. (Comma separated list of versions)")
 	_ = cmd.MarkFlagRequired("versions")
 	return cmd
 }
 
 func kvSubkeysCmd() *cobra.Command {
 	var (
-		version int32
-		depth   int32
+		version uint32
+		depth   uint32
 	)
 
 	cmd := &cobra.Command{
 		Use:   "subkeys PATH",
 		Short: "Provides the subkeys within a secret entry that exists at the requested path.",
 		Args:  cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			var v *int32
+			var v *uint32
 			if cmd.Flag("version").Changed {
 				v = &version
 			}
 
-			var d *int32
+			var d *uint32
 			if cmd.Flag("depth").Changed {
 				d = &depth
 			}
@@ -251,8 +263,8 @@ func kvSubkeysCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().Int32Var(&version, "version", 0, "The version to return")
-	cmd.Flags().Int32Var(&depth, "depth", 0, "Deepest nesting level to provide in the output")
+	cmd.Flags().Uint32Var(&version, "version", 0, "The version to return")
+	cmd.Flags().Uint32Var(&depth, "depth", 0, "Deepest nesting level to provide in the output")
 	return cmd
 }
 

common/utils/int.go

@@ -28,12 +28,12 @@ func ToUint64[N Integer](n N) uint64 {
 	return uint64(n)
 }
 
-// func ToUint32[N Integer](n N) uint32 {
-// 	if n < 0 || uint64(n) > math.MaxUint32 {
-// 		panic("Integer overflow")
-// 	}
-// 	return uint32(n)
-// }
+func ToUint32[N Integer](n N) uint32 {
+	if n < 0 || uint64(n) > math.MaxUint32 {
+		panic("Integer overflow")
+	}
+	return uint32(n)
+}
 
 // func ToUint16[N Integer](n N) uint16 {
 // 	if n < 0 || uint64(n) > math.MaxUint16 {