Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

MODULE = github.com/notaryproject/notation
MODULE = github.com/notaryproject/notation/v2
COMMANDS = notation
GIT_TAG = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null)
GIT_COMMIT = $(shell git rev-parse HEAD)
Expand All @@ -22,7 +22,7 @@ ifndef BUILD_METADATA
endif

ifneq ($(GIT_TAG),)
BUILD_METADATA :=
BUILD_METADATA :=
endif

# set flags
Expand Down Expand Up @@ -68,7 +68,7 @@ e2e-covdata:
export GOCOVERDIR=$(CURDIR)/test/e2e/.cover; \
rm -rf $$GOCOVERDIR; \
mkdir -p $$GOCOVERDIR; \
export GO_INSTRUMENT_FLAGS='-coverpkg "github.com/notaryproject/notation/internal/...,github.com/notaryproject/notation/pkg/...,github.com/notaryproject/notation/cmd/..."'; \
export GO_INSTRUMENT_FLAGS='-coverpkg "github.com/notaryproject/notation/v2/internal/...,github.com/notaryproject/notation/v2/cmd/..."'; \
$(MAKE) e2e && go tool covdata textfmt -i=$$GOCOVERDIR -o "$(CURDIR)/test/e2e/coverage.txt"

.PHONY: clean
Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/blob/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package blob

import (
"github.com/notaryproject/notation/cmd/notation/blob/policy"
"github.com/notaryproject/notation/v2/cmd/notation/blob/policy"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/notation/blob/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"os"

"github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation/cmd/notation/internal/display"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/blob/policy/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation-go/verifier/trustpolicy"
"github.com/notaryproject/notation/cmd/notation/internal/display"
"github.com/notaryproject/notation/internal/osutil"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display"
"github.com/notaryproject/notation/v2/internal/osutil"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/notation/blob/policy/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (

"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation-go/verifier/trustpolicy"
"github.com/notaryproject/notation/cmd/notation/internal/display"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/internal/osutil"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/internal/osutil"
"github.com/spf13/cobra"
)

Expand Down
16 changes: 8 additions & 8 deletions cmd/notation/blob/sign.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ import (
"github.com/notaryproject/notation-core-go/revocation/purpose"
"github.com/notaryproject/notation-go"
"github.com/notaryproject/notation-go/log"
"github.com/notaryproject/notation/cmd/notation/internal/display"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/cmd/notation/internal/sign"
"github.com/notaryproject/notation/internal/envelope"
"github.com/notaryproject/notation/internal/httputil"
"github.com/notaryproject/notation/internal/osutil"
clirev "github.com/notaryproject/notation/internal/revocation"
nx509 "github.com/notaryproject/notation/internal/x509"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/sign"
"github.com/notaryproject/notation/v2/internal/envelope"
"github.com/notaryproject/notation/v2/internal/httputil"
"github.com/notaryproject/notation/v2/internal/osutil"
clirev "github.com/notaryproject/notation/v2/internal/revocation"
nx509 "github.com/notaryproject/notation/v2/internal/x509"
"github.com/notaryproject/tspclient-go"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/blob/sign_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"testing"
"time"

"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/internal/envelope"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/internal/envelope"
)

func TestBlobSignCommand_BasicArgs(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions cmd/notation/blob/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"strings"

"github.com/notaryproject/notation-go"
"github.com/notaryproject/notation/cmd/notation/internal/display"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/cmd/notation/internal/verify"
"github.com/notaryproject/notation/internal/envelope"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/verify"
"github.com/notaryproject/notation/v2/internal/envelope"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/cert/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"errors"
"fmt"

"github.com/notaryproject/notation/cmd/notation/internal/truststore"
"github.com/notaryproject/notation/v2/cmd/notation/internal/truststore"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/cert/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"errors"
"fmt"

"github.com/notaryproject/notation/cmd/notation/internal/truststore"
"github.com/notaryproject/notation/v2/cmd/notation/internal/truststore"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/cert/generateTest.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/notaryproject/notation-core-go/testhelper"
"github.com/notaryproject/notation-go/config"
"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation/cmd/notation/internal/truststore"
"github.com/notaryproject/notation/internal/osutil"
"github.com/notaryproject/notation/v2/cmd/notation/internal/truststore"
"github.com/notaryproject/notation/v2/internal/osutil"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/cert/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation-go/log"
notationgoTruststore "github.com/notaryproject/notation-go/verifier/truststore"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/cmd/notation/internal/truststore"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/truststore"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/cert/show.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
corex509 "github.com/notaryproject/notation-core-go/x509"
"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation-go/log"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/cmd/notation/internal/truststore"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/truststore"
"github.com/spf13/cobra"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/notation/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"os"

"github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation/cmd/notation/internal/display"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
cmderr "github.com/notaryproject/notation/cmd/notation/internal/errors"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
cmderr "github.com/notaryproject/notation/v2/cmd/notation/internal/errors"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/inspect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"reflect"
"testing"

"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
"github.com/spf13/pflag"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/notation/internal/display/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ package display
import (
"fmt"

"github.com/notaryproject/notation/cmd/notation/internal/display/metadata"
"github.com/notaryproject/notation/cmd/notation/internal/display/metadata/json"
"github.com/notaryproject/notation/cmd/notation/internal/display/metadata/text"
"github.com/notaryproject/notation/cmd/notation/internal/display/metadata/tree"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/metadata"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/metadata/json"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/metadata/text"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/metadata/tree"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
)

// NewInspectHandler creates a new metadata InspectHandler based on the output
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package json

import (
coresignature "github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
)

// BlobInspectHandler is a handler for inspecting metadata information and
Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/internal/display/metadata/json/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package json

import (
coresignature "github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"

ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

coresignature "github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation-go/plugin/proto"
envelopeutil "github.com/notaryproject/notation/internal/envelope"
envelopeutil "github.com/notaryproject/notation/v2/internal/envelope"
"github.com/notaryproject/tspclient-go"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package text

import (
"github.com/notaryproject/notation-go"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
)

// BlobVerifyHandler is a handler for rendering output for blob verify command
Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/internal/display/metadata/text/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package text

import (
"github.com/notaryproject/notation-go"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
)

// VerifyHandler is a handler for rendering output for verify command in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/notaryproject/notation-go"
"github.com/notaryproject/notation-go/verifier/trustpolicy"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
)

// printVerificationSuccess prints out messages when verification succeeds
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

"github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation-go"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/internal/envelope"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/internal/envelope"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package tree

import (
"github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
)

// BlobInspectHandler is a handler for inspecting metadata information and
Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/internal/display/metadata/tree/inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package tree
import (
coresignature "github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation-go/registry"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

coresignature "github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation-go/plugin/proto"
envelopeutil "github.com/notaryproject/notation/internal/envelope"
envelopeutil "github.com/notaryproject/notation/v2/internal/envelope"
"github.com/notaryproject/tspclient-go"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"

coresignature "github.com/notaryproject/notation-core-go/signature"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/internal/display/metadata/tree/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package tree

import (
notationregistry "github.com/notaryproject/notation-go/registry"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/internal/flag/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"strings"
"time"

"github.com/notaryproject/notation/internal/config"
"github.com/notaryproject/notation/internal/envelope"
"github.com/notaryproject/notation/v2/internal/config"
"github.com/notaryproject/notation/v2/internal/envelope"
"github.com/spf13/pflag"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/internal/flag/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"

"github.com/notaryproject/notation-go/log"
"github.com/notaryproject/notation/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/internal/trace"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display/output"
"github.com/notaryproject/notation/v2/internal/trace"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/internal/plugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"net/http"
"time"

"github.com/notaryproject/notation/internal/httputil"
"github.com/notaryproject/notation/v2/internal/httputil"
)

// MaxPluginSourceBytes specifies the limit on how many bytes are allowed in the
Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/internal/sign/sign.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation-go/plugin"
"github.com/notaryproject/notation-go/signer"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
)

// Signer is embedded with notation.BlobSigner and notation.Signer.
Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/internal/sign/sign_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/notaryproject/notation-go"
"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation-go/signer"
"github.com/notaryproject/notation/cmd/notation/internal/flag"
"github.com/notaryproject/notation/v2/cmd/notation/internal/flag"
)

func TestGenericSignerImpl(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/internal/truststore/truststore.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
corex509 "github.com/notaryproject/notation-core-go/x509"
"github.com/notaryproject/notation-go/dir"
"github.com/notaryproject/notation-go/verifier/truststore"
"github.com/notaryproject/notation/cmd/notation/internal/display"
"github.com/notaryproject/notation/internal/osutil"
"github.com/notaryproject/notation/v2/cmd/notation/internal/display"
"github.com/notaryproject/notation/v2/internal/osutil"
)

// AddCert adds a single cert file at path to the trust store
Expand Down
2 changes: 1 addition & 1 deletion cmd/notation/internal/verify/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/notaryproject/notation-go/verifier/trustpolicy"
"github.com/notaryproject/notation-go/verifier/truststore"

clirev "github.com/notaryproject/notation/internal/revocation"
clirev "github.com/notaryproject/notation/v2/internal/revocation"
)

// Verifier is embedded with notation.BlobVerifier and notation.Verifier.
Expand Down
Loading
Loading