Bump github.com/sigstore/cosign/v2 from 2.1.1 to 2.2.1 (#118)

* Bump github.com/sigstore/cosign/v2 from 2.1.1 to 2.2.1 Bumps [github.com/sigstore/cosign/v2](https://github.com/sigstore/cosign) from 2.1.1 to 2.2.1. - [Release notes](https://github.com/sigstore/cosign/releases) - [Changelog](https://github.com/sigstore/cosign/blob/main/CHANGELOG.md) - [Commits](sigstore/cosign@v2.1.1...v2.2.1) --- updated-dependencies: - dependency-name: github.com/sigstore/cosign/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * fix inconsist codes after updating some dependency versions Signed-off-by: hirokuni-kitahara <[email protected]> * update go version to 1.21 Signed-off-by: hirokuni-kitahara <[email protected]> * replace a deprecated encrypted package with a new one Signed-off-by: hirokuni-kitahara <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: hirokuni-kitahara <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hirokuni-kitahara <[email protected]>
sigstore · Jan 10, 2024 · 7e62ec8 · 7e62ec8
1 parent b45210e
commit 7e62ec8
Show file tree

Hide file tree

Showing 8 changed files with 638 additions and 503 deletions.
diff --git a/.github/workflows/cross.yaml b/.github/workflows/cross.yaml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.19.x'
+          go-version: '1.21.x'
       - name: compile
         run: |
           make build
@@ -37,7 +37,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.19.x'
+          go-version: '1.21.x'
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Build

diff --git a/.github/workflows/slsa-goreleaser.yml b/.github/workflows/slsa-goreleaser.yml
@@ -40,7 +40,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
     with:
       config-file: .slsa-goreleaser-linux-amd64.yml
-      go-version: 1.19
+      go-version: 1.21
       evaluated-envs: "COMMIT_DATE:${{needs.args.outputs.commit-date}}, COMMIT:${{needs.args.outputs.commit}}, VERSION:${{needs.args.outputs.version}}, TREE_STATE:${{needs.args.outputs.tree-state}}"
 
   build-darwin-amd64:
@@ -52,7 +52,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
     with:
       config-file: .slsa-goreleaser-darwin-amd64.yml
-      go-version: 1.19
+      go-version: 1.21
       evaluated-envs: "COMMIT_DATE:${{needs.args.outputs.commit-date}}, COMMIT:${{needs.args.outputs.commit}}, VERSION:${{needs.args.outputs.version}}, TREE_STATE:${{needs.args.outputs.tree-state}}"
 
   build-windows-amd64:
@@ -64,6 +64,6 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
     with:
       config-file: .slsa-goreleaser-windows-amd64.yml
-      go-version: 1.19
+      go-version: 1.21
       evaluated-envs: "COMMIT_DATE:${{needs.args.outputs.commit-date}}, COMMIT:${{needs.args.outputs.commit}}, VERSION:${{needs.args.outputs.version}}, TREE_STATE:${{needs.args.outputs.tree-state}}"
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -42,7 +42,7 @@ jobs:
             ${{ runner.os }}-go-
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.19.x'
+          go-version: '1.21.x'
       # - name: install ko
       #   run: |
       #     curl -L https://github.com/google/ko/releases/download/v0.8.3/ko_0.8.3_Linux_x86_64.tar.gz | tar xzf - ko && \
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.19.x'
+          go-version: '1.21.x'
       - name: Install addlicense
         run: go install github.com/google/addlicense@latest
       - name: Check license headers

diff --git a/cmd/kubectl-sigstore/cli/kubectl_options.go b/cmd/kubectl-sigstore/cli/kubectl_options.go
@@ -121,7 +121,7 @@ func (o *KubectlOptions) InitApply(cmd *cobra.Command, filename string) error {
 	matchVersionKubeConfigFlags := cmdutil.NewMatchVersionFlags(o.ConfigFlags.WithDeprecatedPasswordFlag())
 	f := cmdutil.NewFactory(matchVersionKubeConfigFlags)
 
-	options, err := cmdapply.NewApplyFlags(f, ioStreams).ToOptions(cmd, "kubectl sigstore", []string{})
+	options, err := cmdapply.NewApplyFlags(ioStreams).ToOptions(f, cmd, "kubectl sigstore", []string{})
 	if err != nil {
 		return err
 	}
@@ -137,7 +137,6 @@ func (o *KubectlOptions) InitApply(cmd *cobra.Command, filename string) error {
 	if err != nil {
 		return err
 	}
-	o.ApplyOptions.DryRunVerifier = resource.NewQueryParamVerifier(o.ApplyOptions.DynamicClient, f.OpenAPIGetter(), resource.QueryParamDryRun)
 	o.ApplyOptions.FieldManager = cmdapply.GetApplyFieldManagerFlag(cmd, o.ApplyOptions.ServerSideApply)
 
 	if o.ApplyOptions.ForceConflicts && !o.ApplyOptions.ServerSideApply {
@@ -161,12 +160,11 @@ func (o *KubectlOptions) InitApply(cmd *cobra.Command, filename string) error {
 	o.ApplyOptions.DeleteOptions = &delete.DeleteOptions{FilenameOptions: resource.FilenameOptions{Filenames: []string{filename}}}
 
 	o.ApplyOptions.OpenAPISchema, _ = f.OpenAPISchema()
-	fieldValidationVerifier := resource.NewQueryParamVerifier(o.ApplyOptions.DynamicClient, f.OpenAPIGetter(), resource.QueryParamFieldValidation)
 	validationDirective, err := cmdutil.GetValidationDirective(cmd)
 	if err != nil {
 		return err
 	}
-	o.ApplyOptions.Validator, err = f.Validator(validationDirective, fieldValidationVerifier)
+	o.ApplyOptions.Validator, err = f.Validator(validationDirective)
 	if err != nil {
 		return err
 	}

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/util/manifestbuild/kustomize/kustomize.go b/pkg/util/manifestbuild/kustomize/kustomize.go
@@ -90,7 +90,7 @@ func LoadKustomization(fpath, baseDir, gitURL, gitRevision string, inRemoteRepo
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to unmarshal a content of %s into %T", fpath, k)
 	}
-	k.FixKustomizationPostUnmarshalling()
+	k.FixKustomization()
 
 	// these resources are used as "provenance materials" later
 	// files in a local filesystem --> File resource

diff --git a/pkg/util/manifestbuild/kustomize/provenance.go b/pkg/util/manifestbuild/kustomize/provenance.go
@@ -35,7 +35,7 @@ import (
 
 	intoto "github.com/in-toto/in-toto-golang/in_toto"
 	intotoprov02 "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2"
-	"github.com/theupdateframework/go-tuf/encrypted"
+	"github.com/secure-systems-lab/go-securesystemslib/encrypted"
 
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"