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

Deprecate v1 Packages #151

Merged
merged 1 commit into from
Sep 14, 2021
Merged

Deprecate v1 Packages #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/siftool/modif.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"strconv"

"github.com/sylabs/sif/internal/app/siftool"
"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/siftool/siftool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"os"
"runtime"

"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

var usageMessage = `siftool is a utility program for manipulating SIF files.
Expand Down
2 changes: 1 addition & 1 deletion internal/app/siftool/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package siftool

import (
"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

// withFileImage calls fn with a FileImage loaded from path.
Expand Down
2 changes: 1 addition & 1 deletion internal/app/siftool/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"os"
"time"

"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

// Header displays a SIF file global header.
Expand Down
2 changes: 1 addition & 1 deletion internal/app/siftool/modif.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"io"

uuid "github.com/satori/go.uuid"
"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

// New creates a new empty SIF file.
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/digest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"io"
"strings"

"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/digest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"testing"

"github.com/sebdah/goldie/v2"
"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

func TestNewLegacyDigest(t *testing.T) {
Expand Down
5 changes: 5 additions & 0 deletions pkg/integrity/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,10 @@ on object group 1 only:
Finally, to perform cryptographic verification:

err := v.Verify()

Deprecated: this package is deprecated. Users should migrate applications to package
github.com/sylabs/sif/v2/pkg/integrity.

This package is frozen and no new functionality will be added.
*/
package integrity
2 changes: 1 addition & 1 deletion pkg/integrity/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"fmt"
"io"

"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/metadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

uuid "github.com/satori/go.uuid"
"github.com/sebdah/goldie/v2"
"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

func TestWriteHeader(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package integrity

import (
"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
"golang.org/x/crypto/openpgp"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/select.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"io"
"sort"

"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"fmt"
"sort"

"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/sign_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"testing"

"github.com/sebdah/goldie/v2"
"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
"golang.org/x/crypto/openpgp"
"golang.org/x/crypto/openpgp/packet"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sort"
"strings"

"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
"golang.org/x/crypto/openpgp"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/integrity/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"reflect"
"testing"

"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
"golang.org/x/crypto/openpgp"
pgperrors "golang.org/x/crypto/openpgp/errors"
)
Expand Down
4 changes: 4 additions & 0 deletions pkg/sif/sif.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@
// | . |
// `================================================'
//
// Deprecated: this package is deprecated. Users should migrate applications to package
// github.com/sylabs/sif/v2/pkg/sif.
//
// This package is frozen and no new functionality will be added.
package sif

import (
Expand Down
2 changes: 1 addition & 1 deletion pkg/siftool/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/spf13/cobra"
"github.com/sylabs/sif/internal/app/siftool"
"github.com/sylabs/sif/pkg/sif"
"github.com/sylabs/sif/pkg/sif" //nolint:staticcheck // In use until v2 API
)

// Add implements 'siftool add' sub-command.
Expand Down
5 changes: 5 additions & 0 deletions pkg/siftool/siftool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@

// Package siftool implements cobra.Command structs for the siftool functionality. This
// allows for easy inclusion of siftool functions in the singularity cli.
//
// Deprecated: this package is deprecated. Users should migrate applications to package
// github.com/sylabs/sif/v2/pkg/siftool.
//
// This package is frozen and no new functionality will be added.
package siftool

import (
Expand Down