Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pick #98 / #111 (SIF adjacent) to release-3.8 #155

Merged
merged 2 commits into from
Jul 16, 2021
Merged

Pick #98 / #111 (SIF adjacent) to release-3.8 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f61aa1
test: fix (*sifFormat).initializer unit test
Jun 10, 2021
c289b1f
fix: partially replace UUID module
Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e2e/imgbuild/regressions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"testing"
"text/template"

uuid "github.com/satori/go.uuid"
"github.com/google/uuid"
"github.com/sylabs/singularity/e2e/internal/e2e"
"github.com/sylabs/singularity/internal/pkg/test/tool/require"
"github.com/sylabs/singularity/internal/pkg/util/fs"
Expand Down Expand Up @@ -177,7 +177,7 @@ func (c *imgBuildTests) issue4583(t *testing.T) {
}

func (c imgBuildTests) issue4837(t *testing.T) {
id, err := uuid.NewV4()
id, err := uuid.NewRandom()
if err != nil {
t.Fatal(err)
}
Expand Down
10 changes: 4 additions & 6 deletions e2e/instance/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,19 @@ import (
"syscall"
"testing"

"github.com/sylabs/singularity/internal/pkg/test/tool/require"
"github.com/sylabs/singularity/pkg/util/fs/proc"

uuid "github.com/satori/go.uuid"

"github.com/google/uuid"
"github.com/pkg/errors"
"github.com/sylabs/singularity/e2e/internal/e2e"
"github.com/sylabs/singularity/e2e/internal/testhelper"
"github.com/sylabs/singularity/internal/pkg/test/tool/require"
"github.com/sylabs/singularity/pkg/util/fs/proc"
)

// randomName generates a random name based on a UUID.
func randomName(t *testing.T) string {
t.Helper()

id, err := uuid.NewV4()
id, err := uuid.NewRandom()
if err != nil {
t.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions e2e/oci/oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"runtime"
"testing"

"github.com/google/uuid"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"
"github.com/sylabs/singularity/e2e/internal/e2e"
"github.com/sylabs/singularity/e2e/internal/testhelper"
"github.com/sylabs/singularity/internal/pkg/runtime/engine/config/oci"
Expand All @@ -25,7 +25,7 @@ import (
func randomContainerID(t *testing.T) string {
t.Helper()

id, err := uuid.NewV4()
id, err := uuid.NewRandom()
if err != nil {
t.Fatal(err)
}
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ require (
github.com/godbus/dbus v4.1.0+incompatible // indirect
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/uuid v1.2.0
github.com/gorilla/handlers v1.4.0 // indirect
github.com/gorilla/websocket v1.4.2
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
Expand Down
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ github.com/google/renameio v1.0.1-0.20210406141108-81588dbe0453/go.mod h1:t/HQoY
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/crypt/crypt_dev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"syscall"
"time"

uuid "github.com/satori/go.uuid"
"github.com/google/uuid"
"github.com/sylabs/singularity/internal/pkg/util/bin"
"github.com/sylabs/singularity/pkg/sylog"
"github.com/sylabs/singularity/pkg/util/fs/lock"
Expand Down Expand Up @@ -247,7 +247,7 @@ func copyDeviceContents(source, dest string, size int64) error {
}

func getNextAvailableCryptDevice() (string, error) {
id, err := uuid.NewV4()
id, err := uuid.NewRandom()
if err != nil {
return "", err
}
Expand Down