Merge pull request #325 from tri-adam/deprecate-user

feat: deprecate user package
sylabs · Sep 21, 2023 · 445a707 · 445a707
2 parents cac8e77 + 96bf85e
commit 445a707
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 228 deletions.
diff --git a/internal/app/siftool/mount.go b/internal/app/siftool/mount.go
diff --git a/internal/app/siftool/unmount.go b/internal/app/siftool/unmount.go
diff --git a/pkg/siftool/mount.go b/pkg/siftool/mount.go
diff --git a/pkg/siftool/mount_test.go b/pkg/siftool/mount_test.go
diff --git a/pkg/siftool/siftool.go b/pkg/siftool/siftool.go
@@ -76,10 +76,5 @@ func AddCommands(cmd *cobra.Command, opts ...CommandOpt) error {
 		c.getSetPrim(),
 	)
 
-	if c.opts.experimental {
-		cmd.AddCommand(c.getMount())
-		cmd.AddCommand(c.getUnmount())
-	}
-
 	return nil
 }
diff --git a/pkg/siftool/siftool_test.go b/pkg/siftool/siftool_test.go
@@ -49,6 +49,7 @@ func makeTestSIF(t *testing.T, withDataObject bool) string {
 	return tf.Name()
 }
 
+//nolint:unparam
 func runCommand(t *testing.T, cmd *cobra.Command, args []string, wantErr error) {
 	t.Helper()
 
@@ -117,11 +118,6 @@ func TestAddCommands(t *testing.T) {
 			name: "SetPrim",
 			args: []string{"help", "setprim"},
 		},
-		{
-			name: "Mount",
-			opts: []CommandOpt{OptWithExperimental(true)},
-			args: []string{"help", "mount"},
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/pkg/siftool/testdata/TestAddCommands/Mount/err.golden b/pkg/siftool/testdata/TestAddCommands/Mount/err.golden
diff --git a/pkg/siftool/testdata/TestAddCommands/Mount/out.golden b/pkg/siftool/testdata/TestAddCommands/Mount/out.golden
diff --git a/pkg/siftool/testdata/Test_command_getMount/Empty/err.golden b/pkg/siftool/testdata/Test_command_getMount/Empty/err.golden
diff --git a/pkg/siftool/testdata/Test_command_getMount/Empty/out.golden b/pkg/siftool/testdata/Test_command_getMount/Empty/out.golden
diff --git a/pkg/siftool/testdata/Test_command_getMount/OneGroup/err.golden b/pkg/siftool/testdata/Test_command_getMount/OneGroup/err.golden
diff --git a/pkg/siftool/testdata/Test_command_getMount/OneGroup/out.golden b/pkg/siftool/testdata/Test_command_getMount/OneGroup/out.golden
diff --git a/pkg/siftool/testdata/Test_command_getUnmount/err.golden b/pkg/siftool/testdata/Test_command_getUnmount/err.golden
diff --git a/pkg/siftool/testdata/Test_command_getUnmount/out.golden b/pkg/siftool/testdata/Test_command_getUnmount/out.golden
diff --git a/pkg/siftool/unmount.go b/pkg/siftool/unmount.go
diff --git a/pkg/siftool/unmount_test.go b/pkg/siftool/unmount_test.go
diff --git a/pkg/user/mount.go b/pkg/user/mount.go
@@ -1,8 +1,9 @@
-// Copyright (c) 2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2023, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
 
+// Deprecated: this package will be removed in a future version.
 package user
 
 import (