From d11bd65f85976a1520f9da1079331167c5635857 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Thu, 1 Aug 2024 13:35:46 +0800 Subject: [PATCH 1/9] updated verifier Signed-off-by: Patrick Zheng --- cmd/notation/verify.go | 36 +++++++++++++++++++++++++++++++++++- cmd/notation/verify_test.go | 14 ++++++++++++++ go.mod | 4 ++++ go.sum | 8 ++++---- 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/cmd/notation/verify.go b/cmd/notation/verify.go index 6417b10c6..808e89552 100644 --- a/cmd/notation/verify.go +++ b/cmd/notation/verify.go @@ -14,18 +14,26 @@ package main import ( + "context" + "crypto/x509" "errors" "fmt" "io/fs" + "net/http" "os" "reflect" + "time" + "github.com/notaryproject/notation-core-go/revocation" "github.com/notaryproject/notation-go" + "github.com/notaryproject/notation-go/dir" + "github.com/notaryproject/notation-go/plugin" "github.com/notaryproject/notation-go/verifier" "github.com/notaryproject/notation-go/verifier/trustpolicy" "github.com/notaryproject/notation-go/verifier/truststore" "github.com/notaryproject/notation/cmd/notation/internal/experimental" "github.com/notaryproject/notation/internal/cmd" + "github.com/notaryproject/notation/internal/httputil" "github.com/notaryproject/notation/internal/ioutil" "github.com/spf13/cobra" ) @@ -111,7 +119,7 @@ func runVerify(command *cobra.Command, opts *verifyOpts) error { ctx := opts.LoggingFlagOpts.InitializeLogger(command.Context()) // initialize - sigVerifier, err := verifier.NewFromConfig() + sigVerifier, err := getVerifier(ctx) if err != nil { return err } @@ -219,3 +227,29 @@ func printMetadataIfPresent(outcome *notation.VerificationOutcome) { ioutil.PrintMetadataMap(os.Stdout, metadata) } } + +func getVerifier(ctx context.Context) (notation.Verifier, error) { + policyDocument, err := trustpolicy.LoadOCIDocument() + if err != nil { + return nil, err + } + x509TrustStore := truststore.NewX509TrustStore(dir.ConfigFS()) + revocationCodeSigningValidator, err := revocation.NewWithOptions(revocation.Options{ + OCSPHTTPClient: httputil.NewClient(ctx, &http.Client{Timeout: 2 * time.Second}), + CertChainPurpose: x509.ExtKeyUsageCodeSigning, + }) + if err != nil { + return nil, err + } + revocationTimestampingValidator, err := revocation.NewWithOptions(revocation.Options{ + OCSPHTTPClient: httputil.NewClient(ctx, &http.Client{Timeout: 2 * time.Second}), + CertChainPurpose: x509.ExtKeyUsageTimeStamping, + }) + if err != nil { + return nil, err + } + return verifier.NewVerifierWithOptions(policyDocument, nil, x509TrustStore, plugin.NewCLIManager(dir.PluginFS()), verifier.VerifierOptions{ + RevocationCodeSigningValidator: revocationCodeSigningValidator, + RevocationTimestampingValidator: revocationTimestampingValidator, + }) +} diff --git a/cmd/notation/verify_test.go b/cmd/notation/verify_test.go index 6ae49b8c8..e554ae2ee 100644 --- a/cmd/notation/verify_test.go +++ b/cmd/notation/verify_test.go @@ -14,8 +14,11 @@ package main import ( + "context" "reflect" "testing" + + "github.com/notaryproject/notation-go/dir" ) func TestVerifyCommand_BasicArgs(t *testing.T) { @@ -80,3 +83,14 @@ func TestVerifyCommand_MissingArgs(t *testing.T) { t.Fatal("Parse Args expected error, but ok") } } + +func TestGetVerifier(t *testing.T) { + t.Run("non-existing trust policy", func(t *testing.T) { + dir.UserConfigDir = "/" + expectedErrMsg := "trust policy is not present. To create a trust policy, see: https://notaryproject.dev/docs/quickstart/#create-a-trust-policy" + _, err := getVerifier(context.Background()) + if err == nil || err.Error() != expectedErrMsg { + t.Fatalf("expected %s, but got %s", expectedErrMsg, err) + } + }) +} diff --git a/go.mod b/go.mod index d83f8ac2c..e94ffcf5d 100644 --- a/go.mod +++ b/go.mod @@ -32,3 +32,7 @@ require ( golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.22.0 // indirect ) + +replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240731081640-5354b7c7bef5 + +replace github.com/notaryproject/notation-core-go => github.com/Two-Hearts/notation-core-go v0.0.0-20240731063103-74357d901612 diff --git a/go.sum b/go.sum index be1d39fb3..dcd2481e2 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,9 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= +github.com/Two-Hearts/notation-core-go v0.0.0-20240731063103-74357d901612 h1:M/QbcNnsTqwuQp0/EhDS+CU89SvbdH2jFfMzg6YIDhI= +github.com/Two-Hearts/notation-core-go v0.0.0-20240731063103-74357d901612/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= +github.com/Two-Hearts/notation-go v0.0.0-20240731081640-5354b7c7bef5 h1:Lg+nN4Pzm14GBPWzoIRjcrS6fanXTkP+ruRQX0yHxE0= +github.com/Two-Hearts/notation-go v0.0.0-20240731081640-5354b7c7bef5/go.mod h1:NAgPwigeAiE0CueVS3EB0WcH9RfpQX/jn6xpgid2+9A= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -35,10 +39,6 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/notaryproject/notation-core-go v1.1.0-beta.1 h1:Rpg8qhoEo4nIdiAWz597lbEcvEmjKwJLUtvJqXa8M4c= -github.com/notaryproject/notation-core-go v1.1.0-beta.1/go.mod h1:MdxSbL9F5h63EmtXWfYMWy7hEmGmOmsfN4B6KM2WyhY= -github.com/notaryproject/notation-go v1.2.0-beta.1 h1:xSDkmdZ5j7kLrVs2ae8MyowdN7kEzwlV0EIhHjKfF90= -github.com/notaryproject/notation-go v1.2.0-beta.1/go.mod h1:RypdKUKCUZ8QgJAqaaesgUkTRHQIB+puCPdH3/3dVGE= github.com/notaryproject/notation-plugin-framework-go v1.0.0 h1:6Qzr7DGXoCgXEQN+1gTZWuJAZvxh3p8Lryjn5FaLzi4= github.com/notaryproject/notation-plugin-framework-go v1.0.0/go.mod h1:RqWSrTOtEASCrGOEffq0n8pSg2KOgKYiWqFWczRSics= github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172 h1:Q8UsmeFMzyFuMMq4dlbIRJUi7khEKXKUe2H2Hm3W92Y= From 62436a6ad6be62a5bfa5b2dc64edb33d237e6a99 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Thu, 1 Aug 2024 13:57:57 +0800 Subject: [PATCH 2/9] update Signed-off-by: Patrick Zheng --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index e94ffcf5d..aa267c0ef 100644 --- a/go.mod +++ b/go.mod @@ -33,6 +33,6 @@ require ( golang.org/x/sys v0.22.0 // indirect ) -replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240731081640-5354b7c7bef5 +replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240801055637-02ac12ec085f -replace github.com/notaryproject/notation-core-go => github.com/Two-Hearts/notation-core-go v0.0.0-20240731063103-74357d901612 +replace github.com/notaryproject/notation-core-go => github.com/Two-Hearts/notation-core-go v0.0.0-20240801005628-17703be86fe1 diff --git a/go.sum b/go.sum index dcd2481e2..a7e47efe3 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= -github.com/Two-Hearts/notation-core-go v0.0.0-20240731063103-74357d901612 h1:M/QbcNnsTqwuQp0/EhDS+CU89SvbdH2jFfMzg6YIDhI= -github.com/Two-Hearts/notation-core-go v0.0.0-20240731063103-74357d901612/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= -github.com/Two-Hearts/notation-go v0.0.0-20240731081640-5354b7c7bef5 h1:Lg+nN4Pzm14GBPWzoIRjcrS6fanXTkP+ruRQX0yHxE0= -github.com/Two-Hearts/notation-go v0.0.0-20240731081640-5354b7c7bef5/go.mod h1:NAgPwigeAiE0CueVS3EB0WcH9RfpQX/jn6xpgid2+9A= +github.com/Two-Hearts/notation-core-go v0.0.0-20240801005628-17703be86fe1 h1:BSSLhg7pNcaxaWgPg47G6oIMIcgNOY00haRwi+pky3g= +github.com/Two-Hearts/notation-core-go v0.0.0-20240801005628-17703be86fe1/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= +github.com/Two-Hearts/notation-go v0.0.0-20240801055637-02ac12ec085f h1:Ll7/z4iFo8bp1Y/+hfFCKhYpFHvlJUP7CtDrJyz3FVc= +github.com/Two-Hearts/notation-go v0.0.0-20240801055637-02ac12ec085f/go.mod h1:T9cJ0Mbp0s5FqTcfktZAA6ERT+XQuQJ51aMC7DppAmw= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= From b3bd6e2807523f8d065c8691cd45938aa2c270d1 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Tue, 6 Aug 2024 16:55:54 +0800 Subject: [PATCH 3/9] updated per code review Signed-off-by: Patrick Zheng --- cmd/notation/verify.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/notation/verify.go b/cmd/notation/verify.go index 808e89552..f3b118854 100644 --- a/cmd/notation/verify.go +++ b/cmd/notation/verify.go @@ -234,15 +234,16 @@ func getVerifier(ctx context.Context) (notation.Verifier, error) { return nil, err } x509TrustStore := truststore.NewX509TrustStore(dir.ConfigFS()) + ocspHttpClient := httputil.NewClient(ctx, &http.Client{Timeout: 2 * time.Second}) revocationCodeSigningValidator, err := revocation.NewWithOptions(revocation.Options{ - OCSPHTTPClient: httputil.NewClient(ctx, &http.Client{Timeout: 2 * time.Second}), + OCSPHTTPClient: ocspHttpClient, CertChainPurpose: x509.ExtKeyUsageCodeSigning, }) if err != nil { return nil, err } revocationTimestampingValidator, err := revocation.NewWithOptions(revocation.Options{ - OCSPHTTPClient: httputil.NewClient(ctx, &http.Client{Timeout: 2 * time.Second}), + OCSPHTTPClient: ocspHttpClient, CertChainPurpose: x509.ExtKeyUsageTimeStamping, }) if err != nil { From 76c92c8fdcf7a136a0c63e86209b65176ebb4f86 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Wed, 7 Aug 2024 13:19:29 +0800 Subject: [PATCH 4/9] update Signed-off-by: Patrick Zheng --- cmd/notation/verify.go | 6 +++--- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/notation/verify.go b/cmd/notation/verify.go index f3b118854..536f3d898 100644 --- a/cmd/notation/verify.go +++ b/cmd/notation/verify.go @@ -15,7 +15,6 @@ package main import ( "context" - "crypto/x509" "errors" "fmt" "io/fs" @@ -25,6 +24,7 @@ import ( "time" "github.com/notaryproject/notation-core-go/revocation" + "github.com/notaryproject/notation-core-go/revocation/purpose" "github.com/notaryproject/notation-go" "github.com/notaryproject/notation-go/dir" "github.com/notaryproject/notation-go/plugin" @@ -237,14 +237,14 @@ func getVerifier(ctx context.Context) (notation.Verifier, error) { ocspHttpClient := httputil.NewClient(ctx, &http.Client{Timeout: 2 * time.Second}) revocationCodeSigningValidator, err := revocation.NewWithOptions(revocation.Options{ OCSPHTTPClient: ocspHttpClient, - CertChainPurpose: x509.ExtKeyUsageCodeSigning, + CertChainPurpose: purpose.CodeSigning, }) if err != nil { return nil, err } revocationTimestampingValidator, err := revocation.NewWithOptions(revocation.Options{ OCSPHTTPClient: ocspHttpClient, - CertChainPurpose: x509.ExtKeyUsageTimeStamping, + CertChainPurpose: purpose.Timestamping, }) if err != nil { return nil, err diff --git a/go.mod b/go.mod index aa267c0ef..e3b79d069 100644 --- a/go.mod +++ b/go.mod @@ -33,6 +33,6 @@ require ( golang.org/x/sys v0.22.0 // indirect ) -replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240801055637-02ac12ec085f +replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240807050412-d598573c2252 -replace github.com/notaryproject/notation-core-go => github.com/Two-Hearts/notation-core-go v0.0.0-20240801005628-17703be86fe1 +replace github.com/notaryproject/notation-core-go => github.com/Two-Hearts/notation-core-go v0.0.0-20240807034940-02ab652946b1 diff --git a/go.sum b/go.sum index a7e47efe3..dda0734a2 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= -github.com/Two-Hearts/notation-core-go v0.0.0-20240801005628-17703be86fe1 h1:BSSLhg7pNcaxaWgPg47G6oIMIcgNOY00haRwi+pky3g= -github.com/Two-Hearts/notation-core-go v0.0.0-20240801005628-17703be86fe1/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= -github.com/Two-Hearts/notation-go v0.0.0-20240801055637-02ac12ec085f h1:Ll7/z4iFo8bp1Y/+hfFCKhYpFHvlJUP7CtDrJyz3FVc= -github.com/Two-Hearts/notation-go v0.0.0-20240801055637-02ac12ec085f/go.mod h1:T9cJ0Mbp0s5FqTcfktZAA6ERT+XQuQJ51aMC7DppAmw= +github.com/Two-Hearts/notation-core-go v0.0.0-20240807034940-02ab652946b1 h1:sSVw1vW299sn+FufiSWe3lImhbHwE/LhTuO+0NMBTnk= +github.com/Two-Hearts/notation-core-go v0.0.0-20240807034940-02ab652946b1/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= +github.com/Two-Hearts/notation-go v0.0.0-20240807050412-d598573c2252 h1:84GvYkT0sk8fIopPq3dsdJ+8gAESddt/z0SuPeXaABI= +github.com/Two-Hearts/notation-go v0.0.0-20240807050412-d598573c2252/go.mod h1:Lp7dpAnmRUVphFjG8pUPFJPVw3L+ldRPb+5+M4MU0Lg= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= From 080ff3a6699ba8b3648863033b4eb9004c9b7441 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Wed, 7 Aug 2024 13:43:22 +0800 Subject: [PATCH 5/9] fixed e2e tests Signed-off-by: Patrick Zheng --- test/e2e/suite/trustpolicy/trusted_identity.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/suite/trustpolicy/trusted_identity.go b/test/e2e/suite/trustpolicy/trusted_identity.go index 2f276a2b4..80ca06214 100644 --- a/test/e2e/suite/trustpolicy/trusted_identity.go +++ b/test/e2e/suite/trustpolicy/trusted_identity.go @@ -125,7 +125,7 @@ var _ = Describe("notation trust policy trusted identity test", func() { artifact := GenerateArtifact("e2e-valid-signature", "") notation.ExpectFailure().Exec("verify", artifact.ReferenceWithDigest(), "-v"). - MatchErrKeyWords(`distinguished name (DN) " CN=e2e,L=Seattle,ST=WA,C=US" has no mandatory RDN attribute for "O", it must contain 'C', 'ST', and 'O' RDN attributes at a minimum`) + MatchErrKeyWords(`distinguished name (DN) " CN=e2e,L=Seattle,ST=WA,C=US" has no mandatory RDN attribute for "O", it must contain 'C', 'ST' or 'S', and 'O' RDN attributes at a minimum`) }) }) @@ -135,7 +135,7 @@ var _ = Describe("notation trust policy trusted identity test", func() { artifact := GenerateArtifact("e2e-valid-signature", "") notation.ExpectFailure().Exec("verify", artifact.ReferenceWithDigest(), "-v"). - MatchErrKeyWords(`distinguished name (DN) " CN=e2e,O=Notary,L=Seattle,C=US" has no mandatory RDN attribute for "ST", it must contain 'C', 'ST', and 'O' RDN attributes at a minimum`) + MatchErrKeyWords(`distinguished name (DN) " CN=e2e,O=Notary,L=Seattle,C=US" has no mandatory RDN attribute for "ST", it must contain 'C', 'ST' or 'S', and 'O' RDN attributes at a minimum`) }) }) @@ -145,7 +145,7 @@ var _ = Describe("notation trust policy trusted identity test", func() { artifact := GenerateArtifact("e2e-valid-signature", "") notation.ExpectFailure().Exec("verify", artifact.ReferenceWithDigest(), "-v"). - MatchErrKeyWords(`distinguished name (DN) " CN=e2e,O=Notary,L=Seattle,ST=WA" has no mandatory RDN attribute for "C", it must contain 'C', 'ST', and 'O' RDN attributes at a minimum`) + MatchErrKeyWords(`distinguished name (DN) " CN=e2e,O=Notary,L=Seattle,ST=WA" has no mandatory RDN attribute for "C", it must contain 'C', 'ST' or 'S', and 'O' RDN attributes at a minimum`) }) }) }) From 366ceac30ea849066cf22d68b19bb32621f5ada5 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Thu, 8 Aug 2024 11:08:49 +0800 Subject: [PATCH 6/9] updated dependencies Signed-off-by: Patrick Zheng --- go.mod | 8 +++----- go.sum | 12 ++++++------ test/e2e/go.mod | 4 ++-- test/e2e/go.sum | 8 ++++---- test/e2e/plugin/go.mod | 4 ++-- test/e2e/plugin/go.sum | 8 ++++---- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index e3b79d069..3170ecbb2 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/notaryproject/notation go 1.22 require ( - github.com/notaryproject/notation-core-go v1.1.0-beta.1 + github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 github.com/notaryproject/notation-go v1.2.0-beta.1 - github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172 + github.com/notaryproject/tspclient-go v0.2.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0 github.com/sirupsen/logrus v1.9.3 @@ -33,6 +33,4 @@ require ( golang.org/x/sys v0.22.0 // indirect ) -replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240807050412-d598573c2252 - -replace github.com/notaryproject/notation-core-go => github.com/Two-Hearts/notation-core-go v0.0.0-20240807034940-02ab652946b1 +replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb diff --git a/go.sum b/go.sum index dda0734a2..d1c3daff2 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,7 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= -github.com/Two-Hearts/notation-core-go v0.0.0-20240807034940-02ab652946b1 h1:sSVw1vW299sn+FufiSWe3lImhbHwE/LhTuO+0NMBTnk= -github.com/Two-Hearts/notation-core-go v0.0.0-20240807034940-02ab652946b1/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= -github.com/Two-Hearts/notation-go v0.0.0-20240807050412-d598573c2252 h1:84GvYkT0sk8fIopPq3dsdJ+8gAESddt/z0SuPeXaABI= -github.com/Two-Hearts/notation-go v0.0.0-20240807050412-d598573c2252/go.mod h1:Lp7dpAnmRUVphFjG8pUPFJPVw3L+ldRPb+5+M4MU0Lg= +github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb h1:5/4EbwIYRtGLp6j8VH/6iAdJIdcm6Bglzq1JKbLvwcE= +github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb/go.mod h1:4+wL/sqAFVhn/cJScK+Ks3mIKkvS4MhtSSaxrPQR+gk= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -39,10 +37,12 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 h1:/g5Ax507BDKBRXkCXKVCnSMXfSsoO/HsuvH4yJnOXAE= +github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= github.com/notaryproject/notation-plugin-framework-go v1.0.0 h1:6Qzr7DGXoCgXEQN+1gTZWuJAZvxh3p8Lryjn5FaLzi4= github.com/notaryproject/notation-plugin-framework-go v1.0.0/go.mod h1:RqWSrTOtEASCrGOEffq0n8pSg2KOgKYiWqFWczRSics= -github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172 h1:Q8UsmeFMzyFuMMq4dlbIRJUi7khEKXKUe2H2Hm3W92Y= -github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172/go.mod h1:LGyA/6Kwd2FlM0uk8Vc5il3j0CddbWSHBj/4kxQDbjs= +github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ= +github.com/notaryproject/tspclient-go v0.2.0/go.mod h1:LGyA/6Kwd2FlM0uk8Vc5il3j0CddbWSHBj/4kxQDbjs= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= diff --git a/test/e2e/go.mod b/test/e2e/go.mod index 326aab3b4..f89d032b5 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -3,7 +3,7 @@ module github.com/notaryproject/notation/test/e2e go 1.21 require ( - github.com/notaryproject/notation-core-go v1.1.0-beta.1 + github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 github.com/onsi/ginkgo/v2 v2.11.0 github.com/onsi/gomega v1.27.10 github.com/opencontainers/image-spec v1.1.0 @@ -16,7 +16,7 @@ require ( github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect - github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172 // indirect + github.com/notaryproject/tspclient-go v0.2.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/veraison/go-cose v1.1.0 // indirect github.com/x448/float16 v0.8.4 // indirect diff --git a/test/e2e/go.sum b/test/e2e/go.sum index 11dc8dee5..fa04e4b5f 100644 --- a/test/e2e/go.sum +++ b/test/e2e/go.sum @@ -13,10 +13,10 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 h1:2XF1Vzq06X+inNqgJ9tRnGuw+ZVCB3FazXODD6JE1R8= github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk= -github.com/notaryproject/notation-core-go v1.1.0-beta.1 h1:Rpg8qhoEo4nIdiAWz597lbEcvEmjKwJLUtvJqXa8M4c= -github.com/notaryproject/notation-core-go v1.1.0-beta.1/go.mod h1:MdxSbL9F5h63EmtXWfYMWy7hEmGmOmsfN4B6KM2WyhY= -github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172 h1:Q8UsmeFMzyFuMMq4dlbIRJUi7khEKXKUe2H2Hm3W92Y= -github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172/go.mod h1:LGyA/6Kwd2FlM0uk8Vc5il3j0CddbWSHBj/4kxQDbjs= +github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 h1:/g5Ax507BDKBRXkCXKVCnSMXfSsoO/HsuvH4yJnOXAE= +github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= +github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ= +github.com/notaryproject/tspclient-go v0.2.0/go.mod h1:LGyA/6Kwd2FlM0uk8Vc5il3j0CddbWSHBj/4kxQDbjs= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= diff --git a/test/e2e/plugin/go.mod b/test/e2e/plugin/go.mod index 79a26745c..34b203adc 100644 --- a/test/e2e/plugin/go.mod +++ b/test/e2e/plugin/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/golang-jwt/jwt v3.2.2+incompatible - github.com/notaryproject/notation-core-go v1.1.0-beta.1 + github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 github.com/notaryproject/notation-go v1.2.0-beta.1 github.com/notaryproject/notation-plugin-framework-go v1.0.0 github.com/spf13/cobra v1.7.0 @@ -18,7 +18,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172 // indirect + github.com/notaryproject/tspclient-go v0.2.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect diff --git a/test/e2e/plugin/go.sum b/test/e2e/plugin/go.sum index 43feafd68..b2cfcbac3 100644 --- a/test/e2e/plugin/go.sum +++ b/test/e2e/plugin/go.sum @@ -37,14 +37,14 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/notaryproject/notation-core-go v1.1.0-beta.1 h1:Rpg8qhoEo4nIdiAWz597lbEcvEmjKwJLUtvJqXa8M4c= -github.com/notaryproject/notation-core-go v1.1.0-beta.1/go.mod h1:MdxSbL9F5h63EmtXWfYMWy7hEmGmOmsfN4B6KM2WyhY= +github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 h1:/g5Ax507BDKBRXkCXKVCnSMXfSsoO/HsuvH4yJnOXAE= +github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= github.com/notaryproject/notation-go v1.2.0-beta.1 h1:xSDkmdZ5j7kLrVs2ae8MyowdN7kEzwlV0EIhHjKfF90= github.com/notaryproject/notation-go v1.2.0-beta.1/go.mod h1:RypdKUKCUZ8QgJAqaaesgUkTRHQIB+puCPdH3/3dVGE= github.com/notaryproject/notation-plugin-framework-go v1.0.0 h1:6Qzr7DGXoCgXEQN+1gTZWuJAZvxh3p8Lryjn5FaLzi4= github.com/notaryproject/notation-plugin-framework-go v1.0.0/go.mod h1:RqWSrTOtEASCrGOEffq0n8pSg2KOgKYiWqFWczRSics= -github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172 h1:Q8UsmeFMzyFuMMq4dlbIRJUi7khEKXKUe2H2Hm3W92Y= -github.com/notaryproject/tspclient-go v0.1.1-0.20240715235637-df25ef8d2172/go.mod h1:LGyA/6Kwd2FlM0uk8Vc5il3j0CddbWSHBj/4kxQDbjs= +github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ= +github.com/notaryproject/tspclient-go v0.2.0/go.mod h1:LGyA/6Kwd2FlM0uk8Vc5il3j0CddbWSHBj/4kxQDbjs= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= From ab05d64af2787f31949a4dafdaab9f3832f3a794 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Thu, 8 Aug 2024 11:12:12 +0800 Subject: [PATCH 7/9] updated dependencies Signed-off-by: Patrick Zheng --- test/e2e/plugin/go.mod | 2 ++ test/e2e/plugin/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/e2e/plugin/go.mod b/test/e2e/plugin/go.mod index 34b203adc..746402a36 100644 --- a/test/e2e/plugin/go.mod +++ b/test/e2e/plugin/go.mod @@ -29,3 +29,5 @@ require ( golang.org/x/sync v0.6.0 // indirect oras.land/oras-go/v2 v2.5.0 // indirect ) + +replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb diff --git a/test/e2e/plugin/go.sum b/test/e2e/plugin/go.sum index b2cfcbac3..d67f6a81e 100644 --- a/test/e2e/plugin/go.sum +++ b/test/e2e/plugin/go.sum @@ -1,5 +1,7 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= +github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb h1:5/4EbwIYRtGLp6j8VH/6iAdJIdcm6Bglzq1JKbLvwcE= +github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb/go.mod h1:4+wL/sqAFVhn/cJScK+Ks3mIKkvS4MhtSSaxrPQR+gk= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -39,8 +41,6 @@ github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZ github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 h1:/g5Ax507BDKBRXkCXKVCnSMXfSsoO/HsuvH4yJnOXAE= github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= -github.com/notaryproject/notation-go v1.2.0-beta.1 h1:xSDkmdZ5j7kLrVs2ae8MyowdN7kEzwlV0EIhHjKfF90= -github.com/notaryproject/notation-go v1.2.0-beta.1/go.mod h1:RypdKUKCUZ8QgJAqaaesgUkTRHQIB+puCPdH3/3dVGE= github.com/notaryproject/notation-plugin-framework-go v1.0.0 h1:6Qzr7DGXoCgXEQN+1gTZWuJAZvxh3p8Lryjn5FaLzi4= github.com/notaryproject/notation-plugin-framework-go v1.0.0/go.mod h1:RqWSrTOtEASCrGOEffq0n8pSg2KOgKYiWqFWczRSics= github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ= From 782f16c86c7a7a05ca2e50c53b01fff837ab858f Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Mon, 12 Aug 2024 09:47:29 +0800 Subject: [PATCH 8/9] updated to notation-core-go v1.1.0-rc.1 Signed-off-by: Patrick Zheng --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/go.mod | 2 +- test/e2e/go.sum | 4 ++-- test/e2e/plugin/go.mod | 2 +- test/e2e/plugin/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 3170ecbb2..27dbf7b0c 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/notaryproject/notation go 1.22 require ( - github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 + github.com/notaryproject/notation-core-go v1.1.0-rc.1 github.com/notaryproject/notation-go v1.2.0-beta.1 github.com/notaryproject/tspclient-go v0.2.0 github.com/opencontainers/go-digest v1.0.0 diff --git a/go.sum b/go.sum index d1c3daff2..27c8e368c 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 h1:/g5Ax507BDKBRXkCXKVCnSMXfSsoO/HsuvH4yJnOXAE= -github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= +github.com/notaryproject/notation-core-go v1.1.0-rc.1 h1:6cxfVUuc4rTqYu0u7vOmgXfqw1zZabSLJNo8KvkDEzU= +github.com/notaryproject/notation-core-go v1.1.0-rc.1/go.mod h1:j6NELapik2bE1DcrL5otTfXWuW5PR/JLLfREZ4ggmYY= github.com/notaryproject/notation-plugin-framework-go v1.0.0 h1:6Qzr7DGXoCgXEQN+1gTZWuJAZvxh3p8Lryjn5FaLzi4= github.com/notaryproject/notation-plugin-framework-go v1.0.0/go.mod h1:RqWSrTOtEASCrGOEffq0n8pSg2KOgKYiWqFWczRSics= github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ= diff --git a/test/e2e/go.mod b/test/e2e/go.mod index f89d032b5..6ca597d2e 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -3,7 +3,7 @@ module github.com/notaryproject/notation/test/e2e go 1.21 require ( - github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 + github.com/notaryproject/notation-core-go v1.1.0-rc.1 github.com/onsi/ginkgo/v2 v2.11.0 github.com/onsi/gomega v1.27.10 github.com/opencontainers/image-spec v1.1.0 diff --git a/test/e2e/go.sum b/test/e2e/go.sum index fa04e4b5f..755867647 100644 --- a/test/e2e/go.sum +++ b/test/e2e/go.sum @@ -13,8 +13,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 h1:2XF1Vzq06X+inNqgJ9tRnGuw+ZVCB3FazXODD6JE1R8= github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk= -github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 h1:/g5Ax507BDKBRXkCXKVCnSMXfSsoO/HsuvH4yJnOXAE= -github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= +github.com/notaryproject/notation-core-go v1.1.0-rc.1 h1:6cxfVUuc4rTqYu0u7vOmgXfqw1zZabSLJNo8KvkDEzU= +github.com/notaryproject/notation-core-go v1.1.0-rc.1/go.mod h1:j6NELapik2bE1DcrL5otTfXWuW5PR/JLLfREZ4ggmYY= github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ= github.com/notaryproject/tspclient-go v0.2.0/go.mod h1:LGyA/6Kwd2FlM0uk8Vc5il3j0CddbWSHBj/4kxQDbjs= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= diff --git a/test/e2e/plugin/go.mod b/test/e2e/plugin/go.mod index 746402a36..ee788a7b6 100644 --- a/test/e2e/plugin/go.mod +++ b/test/e2e/plugin/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/golang-jwt/jwt v3.2.2+incompatible - github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 + github.com/notaryproject/notation-core-go v1.1.0-rc.1 github.com/notaryproject/notation-go v1.2.0-beta.1 github.com/notaryproject/notation-plugin-framework-go v1.0.0 github.com/spf13/cobra v1.7.0 diff --git a/test/e2e/plugin/go.sum b/test/e2e/plugin/go.sum index d67f6a81e..22530a5a7 100644 --- a/test/e2e/plugin/go.sum +++ b/test/e2e/plugin/go.sum @@ -39,8 +39,8 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= -github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289 h1:/g5Ax507BDKBRXkCXKVCnSMXfSsoO/HsuvH4yJnOXAE= -github.com/notaryproject/notation-core-go v1.1.0-beta.1.0.20240808015012-004b86dbf289/go.mod h1:t57m88CEK1g1EkZ96vGLOPPDB6mSh/YZXD/aR2mSnRg= +github.com/notaryproject/notation-core-go v1.1.0-rc.1 h1:6cxfVUuc4rTqYu0u7vOmgXfqw1zZabSLJNo8KvkDEzU= +github.com/notaryproject/notation-core-go v1.1.0-rc.1/go.mod h1:j6NELapik2bE1DcrL5otTfXWuW5PR/JLLfREZ4ggmYY= github.com/notaryproject/notation-plugin-framework-go v1.0.0 h1:6Qzr7DGXoCgXEQN+1gTZWuJAZvxh3p8Lryjn5FaLzi4= github.com/notaryproject/notation-plugin-framework-go v1.0.0/go.mod h1:RqWSrTOtEASCrGOEffq0n8pSg2KOgKYiWqFWczRSics= github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ= From c1121037b41dffbcaf13a602fa78bf86cdda8f10 Mon Sep 17 00:00:00 2001 From: Patrick Zheng Date: Wed, 14 Aug 2024 08:58:09 +0800 Subject: [PATCH 9/9] updated notation-go dependency Signed-off-by: Patrick Zheng --- go.mod | 4 +--- go.sum | 4 ++-- test/e2e/plugin/go.mod | 4 +--- test/e2e/plugin/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 27dbf7b0c..2e4eb2603 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( github.com/notaryproject/notation-core-go v1.1.0-rc.1 - github.com/notaryproject/notation-go v1.2.0-beta.1 + github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240814004621-3c5a659c1d1d github.com/notaryproject/tspclient-go v0.2.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.0 @@ -32,5 +32,3 @@ require ( golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.22.0 // indirect ) - -replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb diff --git a/go.sum b/go.sum index 27c8e368c..6d0bccf2d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= -github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb h1:5/4EbwIYRtGLp6j8VH/6iAdJIdcm6Bglzq1JKbLvwcE= -github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb/go.mod h1:4+wL/sqAFVhn/cJScK+Ks3mIKkvS4MhtSSaxrPQR+gk= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -39,6 +37,8 @@ github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZ github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/notaryproject/notation-core-go v1.1.0-rc.1 h1:6cxfVUuc4rTqYu0u7vOmgXfqw1zZabSLJNo8KvkDEzU= github.com/notaryproject/notation-core-go v1.1.0-rc.1/go.mod h1:j6NELapik2bE1DcrL5otTfXWuW5PR/JLLfREZ4ggmYY= +github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240814004621-3c5a659c1d1d h1:7/lNsNkauXRhFuQ7TXTBuJA9PjrLhVraaAHuoDisK5Q= +github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240814004621-3c5a659c1d1d/go.mod h1:YpPRyhvDtpYVYGtRJ1PGZJhigT3mnl9jwqYj7tTBYVM= github.com/notaryproject/notation-plugin-framework-go v1.0.0 h1:6Qzr7DGXoCgXEQN+1gTZWuJAZvxh3p8Lryjn5FaLzi4= github.com/notaryproject/notation-plugin-framework-go v1.0.0/go.mod h1:RqWSrTOtEASCrGOEffq0n8pSg2KOgKYiWqFWczRSics= github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ= diff --git a/test/e2e/plugin/go.mod b/test/e2e/plugin/go.mod index ee788a7b6..76f2cd502 100644 --- a/test/e2e/plugin/go.mod +++ b/test/e2e/plugin/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/golang-jwt/jwt v3.2.2+incompatible github.com/notaryproject/notation-core-go v1.1.0-rc.1 - github.com/notaryproject/notation-go v1.2.0-beta.1 + github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240814004621-3c5a659c1d1d github.com/notaryproject/notation-plugin-framework-go v1.0.0 github.com/spf13/cobra v1.7.0 ) @@ -29,5 +29,3 @@ require ( golang.org/x/sync v0.6.0 // indirect oras.land/oras-go/v2 v2.5.0 // indirect ) - -replace github.com/notaryproject/notation-go => github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb diff --git a/test/e2e/plugin/go.sum b/test/e2e/plugin/go.sum index 22530a5a7..13a2a0b74 100644 --- a/test/e2e/plugin/go.sum +++ b/test/e2e/plugin/go.sum @@ -1,7 +1,5 @@ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= -github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb h1:5/4EbwIYRtGLp6j8VH/6iAdJIdcm6Bglzq1JKbLvwcE= -github.com/Two-Hearts/notation-go v0.0.0-20240808023431-8b4ecbed15bb/go.mod h1:4+wL/sqAFVhn/cJScK+Ks3mIKkvS4MhtSSaxrPQR+gk= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI= github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -41,6 +39,8 @@ github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZ github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/notaryproject/notation-core-go v1.1.0-rc.1 h1:6cxfVUuc4rTqYu0u7vOmgXfqw1zZabSLJNo8KvkDEzU= github.com/notaryproject/notation-core-go v1.1.0-rc.1/go.mod h1:j6NELapik2bE1DcrL5otTfXWuW5PR/JLLfREZ4ggmYY= +github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240814004621-3c5a659c1d1d h1:7/lNsNkauXRhFuQ7TXTBuJA9PjrLhVraaAHuoDisK5Q= +github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240814004621-3c5a659c1d1d/go.mod h1:YpPRyhvDtpYVYGtRJ1PGZJhigT3mnl9jwqYj7tTBYVM= github.com/notaryproject/notation-plugin-framework-go v1.0.0 h1:6Qzr7DGXoCgXEQN+1gTZWuJAZvxh3p8Lryjn5FaLzi4= github.com/notaryproject/notation-plugin-framework-go v1.0.0/go.mod h1:RqWSrTOtEASCrGOEffq0n8pSg2KOgKYiWqFWczRSics= github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ=