Merge branch 'main' into cras

Author: github-actions

LICENSE_DEPENDENCIES.md

@@ -1040,7 +1040,7 @@ SOFTWARE.
 ```
 
 
-## github.com/ccoveille/go-safecast
+## github.com/ccoveille/go-safecast/v2
 
 **License:** MIT
 
@@ -1162,37 +1162,7 @@ SOFTWARE.
 ```
 
 
-## github.com/clipperhouse/stringish
-
-**License:** MIT
-
-```
-MIT License
-
-Copyright (c) 2025 Matt Sherman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-```
-
-
-## github.com/clipperhouse/uax29/v2
+## github.com/clipperhouse/uax29/v2/graphemes
 
 **License:** MIT
 
@@ -36104,64 +36074,6 @@ limitations under the License.
 ```
 
 
-## gotest.tools
-
-**License:** Apache-2.0
-
-```
-Copyright 2018 gotest.tools authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-```
-
-
-## gotest.tools/internal/difflib
-
-**License:** BSD-3-Clause
-
-```
-Copyright (c) 2013, Patrick Mezard
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-    The names of its contributors may not be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-```
-
-
 ## gotest.tools/v3
 
 **License:** Apache-2.0

cmd/internal/cli/build_linux.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/ccoveille/go-safecast"
+	"github.com/ccoveille/go-safecast/v2"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/spf13/cobra"
 	keyclient "github.com/sylabs/scs-key-client/client"

cmd/internal/cli/cgroups.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ccoveille/go-safecast"
+	"github.com/ccoveille/go-safecast/v2"
 	"github.com/docker/go-units"
 	"github.com/shopspring/decimal"
 	"github.com/sylabs/singularity/v4/internal/pkg/cgroups"

cmd/internal/cli/inspect.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2025, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2026, Sylabs Inc. All rights reserved.
 // Copyright (c) Contributors to the Apptainer project, established as
 //   Apptainer a Series of LF Projects LLC.
 // This software is licensed under a 3-clause BSD license. Please consult the
@@ -381,8 +381,8 @@ func (c *command) getMetadata() (*inspect.Metadata, error) {
 		}
 		sectionStr := strings.TrimSpace(string(section))
 
-		if strings.HasPrefix(sectionStr, sectionDelim) {
-			sectionStr = strings.TrimSpace(strings.TrimPrefix(sectionStr, sectionDelim))
+		if after, ok := strings.CutPrefix(sectionStr, sectionDelim); ok {
+			sectionStr = strings.TrimSpace(after)
 			parts := strings.SplitN(sectionStr, ":", 2)
 			if len(parts) < 1 {
 				return nil, fmt.Errorf("badly formatted content, can't recover: %v", parts)

cmd/internal/cli/singularity_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2026, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -14,7 +14,7 @@ import (
 func TestCreateConfDir(t *testing.T) {
 	// create a random name for a directory
 	bytes := make([]byte, 8)
-	for i := 0; i < 8; i++ {
+	for i := range 8 {
 		//#nosec G404
 		bytes[i] = byte(65 + rand.Intn(25))
 	}

e2e/actions/oci.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022-2025, Sylabs Inc. All rights reserved.
+// Copyright (c) 2022-2026, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -953,7 +953,8 @@ func (c actionTests) actionOciCdi(t *testing.T) {
 
 					// Generate the command to be executed in the container
 					// Start by printing all environment variables, to test using e2e.ContainMatch conditions later
-					execCmd := "/usr/bin/env"
+					var execCmd strings.Builder
+					execCmd.WriteString("/usr/bin/env")
 
 					// Add commands to test the presence of mapped devices.
 					for _, d := range tt.DeviceNodes {
@@ -962,13 +963,13 @@ func (c actionTests) actionOciCdi(t *testing.T) {
 						case "c":
 							testFlag = "-c"
 						}
-						execCmd += fmt.Sprintf(" && test %s %s", testFlag, d.Path)
+						execCmd.WriteString(fmt.Sprintf(" && test %s %s", testFlag, d.Path))
 					}
 
 					// Add commands to test the presence, and functioning, of mounts.
 					for i, m := range tt.Mounts {
 						// Add a separate teststring echo statement for each mount
-						execCmd += fmt.Sprintf(" && echo %s > %s/testfile_%d", testfileStrings[i], m.ContainerPath, i)
+						execCmd.WriteString(fmt.Sprintf(" && echo %s > %s/testfile_%d", testfileStrings[i], m.ContainerPath, i))
 					}
 
 					// Create a postRun function to check that the testfiles written to the container mounts made their way to the right host temporary directories
@@ -1005,7 +1006,7 @@ func (c actionTests) actionOciCdi(t *testing.T) {
 							"--cdi-dirs",
 							stws.jsonsDir,
 							imageRef,
-							"/bin/sh", "-c", execCmd),
+							"/bin/sh", "-c", execCmd.String()),
 						e2e.WithProfile(profile),
 						e2e.ExpectExit(tt.wantExit, envExpects...),
 						e2e.PostRun(tt.postRun),
@@ -1136,7 +1137,7 @@ func (c actionTests) actionOciOverlay(t *testing.T) {
 		})
 
 		// Create a few writable overlay subdirs under testDir
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			dirName := fmt.Sprintf("my_rw_ol_dir%d", i)
 			fullPath := filepath.Join(testDir, dirName)
 			dirs.MkdirOrFatal(t, fullPath, 0o755)
@@ -1151,7 +1152,7 @@ func (c actionTests) actionOciOverlay(t *testing.T) {
 		}
 
 		// Create a few read-only overlay subdirs under testDir
-		for i := 0; i < 3; i++ {
+		for i := range 3 {
 			dirName := fmt.Sprintf("my_ro_ol_dir%d", i)
 			fullPath := filepath.Join(testDir, dirName)
 			dirs.MkdirOrFatal(t, fullPath, 0o755)
@@ -1165,13 +1166,13 @@ func (c actionTests) actionOciOverlay(t *testing.T) {
 			})
 			if err = os.WriteFile(
 				filepath.Join(upperPath, fmt.Sprintf("testfile.%d", i)),
-				[]byte(fmt.Sprintf("test_string_%d\n", i)),
+				fmt.Appendf(nil, "test_string_%d\n", i),
 				0o644); err != nil {
 				t.Fatal(err)
 			}
 			if err = os.WriteFile(
 				filepath.Join(upperPath, "maskable_testfile"),
-				[]byte(fmt.Sprintf("maskable_string_%d\n", i)),
+				fmt.Appendf(nil, "maskable_string_%d\n", i),
 				0o644); err != nil {
 				t.Fatal(err)
 			}

e2e/docker/docker.go

@@ -32,7 +32,7 @@ import (
 	"github.com/sylabs/singularity/v4/internal/pkg/test/tool/tmpl"
 	"github.com/sylabs/singularity/v4/internal/pkg/util/fs"
 	"golang.org/x/sys/unix"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 type ctx struct {

e2e/env/regressions.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2025, Sylabs Inc. All rights reserved.
+// Copyright (c) 2020-2026, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -73,7 +73,7 @@ func (c ctx) issue5057(t *testing.T) {
 	maxChunkSize := uint64(buildcfg.MAX_CHUNK_SIZE)
 
 	big := make([]byte, maxChunkSize)
-	for i := uint64(0); i < maxChunkSize; i++ {
+	for i := range maxChunkSize {
 		big[i] = 'A'
 	}
 	bigEnv := make([]string, buildcfg.MAX_ENGINE_CONFIG_CHUNK)

e2e/instance/instance.go

@@ -147,7 +147,7 @@ func (c *ctx) testCreateManyInstances(t *testing.T) {
 	const n = 10
 
 	// Start n instances.
-	for i := 0; i < n; i++ {
+	for i := range n {
 		port := instanceStartPort + i
 		instanceName := "echo" + strconv.Itoa(i+1)
 

e2e/internal/e2e/docker.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2020, Control Command Inc. All rights reserved.
-// Copyright (c) 2019-2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2019-2026, Sylabs Inc. All rights reserved.
 // Copyright (c) Contributors to the Apptainer project, established as
 //   Apptainer a Series of LF Projects LLC.
 // This software is licensed under a 3-clause BSD license. Please consult the
@@ -169,7 +169,7 @@ func StartRegistry(t *testing.T, env TestEnv) string {
 
 	addr := net.JoinHostPort("localhost", port)
 
-	for i := 0; i < 30; i++ {
+	for range 30 {
 		resp, err := http.Get(fmt.Sprintf("http://%s/", addr))
 		resp.Body.Close()
 		if err != nil || resp.StatusCode != 200 {