openshift-pipelines
diff --git a/‎head‎
Lines changed: 1 addition & 1 deletion b/‎head‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎upstream/.github/workflows/lint.yaml‎
Lines changed: 4 additions & 2 deletions b/‎upstream/.github/workflows/lint.yaml‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎upstream/go.mod‎
Lines changed: 112 additions & 119 deletions b/‎upstream/go.mod‎
Lines changed: 112 additions & 119 deletions
diff --git a/‎upstream/go.sum‎
Lines changed: 244 additions & 1069 deletions b/‎upstream/go.sum‎
Lines changed: 244 additions & 1069 deletions
diff --git a/‎upstream/pkg/artifacts/signable.go‎
Lines changed: 1 addition & 1 deletion b/‎upstream/pkg/artifacts/signable.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎upstream/pkg/chains/formats/slsa/attest/attest.go‎
Lines changed: 1 addition & 1 deletion b/‎upstream/pkg/chains/formats/slsa/attest/attest.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎upstream/pkg/chains/formats/slsa/internal/material/material.go‎
Lines changed: 7 additions & 2 deletions b/‎upstream/pkg/chains/formats/slsa/internal/material/material.go‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎upstream/pkg/chains/formats/slsa/v1/intotoite6_test.go‎
Lines changed: 2 additions & 4 deletions b/‎upstream/pkg/chains/formats/slsa/v1/intotoite6_test.go‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎upstream/pkg/chains/formats/slsa/v1/pipelinerun/pipelinerun.go‎
Lines changed: 3 additions & 1 deletion b/‎upstream/pkg/chains/formats/slsa/v1/pipelinerun/pipelinerun.go‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎upstream/pkg/chains/objects/objects_test.go‎
Lines changed: 3 additions & 3 deletions b/‎upstream/pkg/chains/objects/objects_test.go‎
Lines changed: 3 additions & 3 deletions
@@ -1 +1 @@
-0c9284f740d672930274efbe75033df55dc78515
+bee7519eb20a587f8e063ff2016725970c1d1b7c
@@ -27,20 +27,22 @@ jobs:
           go-version: "1.23"
 
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
+        with:
+          fetch-depth: 0
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: latest
-
+          args: --new-from-merge-base=origin/${{ github.base_ref }} --timeout=10m
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 
           # Optional: golangci-lint command line arguments.
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
-          only-new-issues: true
+          # only-new-issues: true
 
           # Optional: if set to true then the all caching functionality will be complete disabled,
           #           takes precedence over all other caching options.
 
@@ -326,7 +326,7 @@ func isValidArtifactOutput(res objects.Result) (bool, error) {
 		return false, fmt.Errorf("%s should have digest field: %v", res.Name, res.Value.ObjectVal)
 	}
 	if _, _, err := ParseDigest(res.Value.ObjectVal["digest"]); err != nil {
-		return false, fmt.Errorf("error getting digest %s: %v", res.Value.ObjectVal["digest"], err)
+		return false, fmt.Errorf("error getting digest %s: %w", res.Value.ObjectVal["digest"], err)
 	}
 	return true, nil
 }
 
@@ -127,7 +127,7 @@ func SPDXGit(url, revision string) string {
 		url = artifacts.GitSchemePrefix + url
 	}
 	if !strings.HasSuffix(url, ".git") {
-		url = url + ".git"
+		url += ".git"
 	}
 	if revision == "" {
 		return url
 
@@ -27,6 +27,7 @@ import (
 	"github.com/tektoncd/chains/pkg/chains/formats/slsa/internal/artifact"
 	"github.com/tektoncd/chains/pkg/chains/formats/slsa/internal/slsaconfig"
 	"github.com/tektoncd/chains/pkg/chains/objects"
+	v1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	"knative.dev/pkg/logging"
 )
 
@@ -70,7 +71,9 @@ func PipelineMaterials(ctx context.Context, pro *objects.PipelineRunObjectV1, sl
 	}
 	pSpec := pro.Status.PipelineSpec
 	if pSpec != nil {
-		pipelineTasks := append(pSpec.Tasks, pSpec.Finally...)
+		pipelineTasks := make([]v1.PipelineTask, 0, len(pSpec.Tasks)+len(pSpec.Finally))
+		pipelineTasks = append(pipelineTasks, pSpec.Tasks...)
+		pipelineTasks = append(pipelineTasks, pSpec.Finally...)
 		for _, t := range pipelineTasks {
 			taskRuns := pro.GetTaskRunsFromTask(t.Name)
 			if len(taskRuns) == 0 {
@@ -255,7 +258,9 @@ func FromPipelineParamsAndResults(ctx context.Context, pro *objects.PipelineRunO
 		// search type hinting param/results from each individual taskruns
 		if slsaconfig.DeepInspectionEnabled {
 			logger := logging.FromContext(ctx)
-			pipelineTasks := append(pSpec.Tasks, pSpec.Finally...)
+			pipelineTasks := make([]v1.PipelineTask, 0, len(pSpec.Tasks)+len(pSpec.Finally))
+			pipelineTasks = append(pipelineTasks, pSpec.Tasks...)
+			pipelineTasks = append(pipelineTasks, pSpec.Finally...)
 			for _, t := range pipelineTasks {
 				taskRuns := pro.GetTaskRunsFromTask(t.Name)
 				if len(taskRuns) == 0 {
 
@@ -558,10 +558,8 @@ func TestCreatePayloadError(t *testing.T) {
 		}
 		if err == nil {
 			t.Errorf("Expected error")
-		} else {
-			if err.Error() != "intoto does not support type: not a task ref" {
-				t.Errorf("wrong error returned: '%s'", err.Error())
-			}
+		} else if err.Error() != "intoto does not support type: not a task ref" {
+			t.Errorf("wrong error returned: '%s'", err.Error())
 		}
 	})
 
 
@@ -101,7 +101,9 @@ func buildConfig(ctx context.Context, pro *objects.PipelineRunObjectV1) BuildCon
 	if pSpec == nil {
 		return BuildConfig{}
 	}
-	pipelineTasks := append(pSpec.Tasks, pSpec.Finally...)
+	pipelineTasks := make([]v1.PipelineTask, 0, len(pSpec.Tasks)+len(pSpec.Finally))
+	pipelineTasks = append(pipelineTasks, pSpec.Tasks...)
+	pipelineTasks = append(pipelineTasks, pSpec.Finally...)
 
 	var last string
 	for i, t := range pipelineTasks {
 
@@ -178,15 +178,15 @@ func TestPipelineRun_GetResults(t *testing.T) {
 		pr := NewPipelineRunObjectV1(getPipelineRun())
 		got := pr.GetResults()
 		assert.ElementsMatch(t, got, []Result{
-			Result{
+			{
 				Name: "img1_input_ARTIFACT_INPUTS",
 				Value: *v1.NewObject(map[string]string{
 					"uri":    "gcr.io/foo/bar",
 					"digest": "sha256:05f95b26ed10668b7183c1e2da98610e91372fa9f510046d4ce5812addad86b7",
 				}),
 			},
-			Result{Name: "mvn1_ARTIFACT_URI", Value: *v1.NewStructuredValues("projects/test-project/locations/us-west4/repositories/test-repo/mavenArtifacts/com.google.guava:guava:31.0-jre")},
-			Result{Name: "mvn1_ARTIFACT_DIGEST", Value: *v1.NewStructuredValues("sha256:05f95b26ed10668b7183c1e2da98610e91372fa9f510046d4ce5812addad86b5")},
+			{Name: "mvn1_ARTIFACT_URI", Value: *v1.NewStructuredValues("projects/test-project/locations/us-west4/repositories/test-repo/mavenArtifacts/com.google.guava:guava:31.0-jre")},
+			{Name: "mvn1_ARTIFACT_DIGEST", Value: *v1.NewStructuredValues("sha256:05f95b26ed10668b7183c1e2da98610e91372fa9f510046d4ce5812addad86b5")},
 		})
 	})
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0c9284f740d672930274efbe75033df55dc78515`
	`1`	`+bee7519eb20a587f8e063ff2016725970c1d1b7c`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ func isValidArtifactOutput(res objects.Result) (bool, error) {`
`326`	`326`	`return false, fmt.Errorf("%s should have digest field: %v", res.Name, res.Value.ObjectVal)`
`327`	`327`	`}`
`328`	`328`	`if _, _, err := ParseDigest(res.Value.ObjectVal["digest"]); err != nil {`
`329`		`- return false, fmt.Errorf("error getting digest %s: %v", res.Value.ObjectVal["digest"], err)`
	`329`	`+ return false, fmt.Errorf("error getting digest %s: %w", res.Value.ObjectVal["digest"], err)`
`330`	`330`	`}`
`331`	`331`	`return true, nil`
`332`	`332`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func SPDXGit(url, revision string) string {`
`127`	`127`	`url = artifacts.GitSchemePrefix + url`
`128`	`128`	`}`
`129`	`129`	`if !strings.HasSuffix(url, ".git") {`
`130`		`- url = url + ".git"`
	`130`	`+ url += ".git"`
`131`	`131`	`}`
`132`	`132`	`if revision == "" {`
`133`	`133`	`return url`
Original file line number	Diff line number	Diff line change
`@@ -558,10 +558,8 @@ func TestCreatePayloadError(t *testing.T) {`
`558`	`558`	`}`
`559`	`559`	`if err == nil {`
`560`	`560`	`t.Errorf("Expected error")`
`561`		`- } else {`
`562`		`- if err.Error() != "intoto does not support type: not a task ref" {`
`563`		`- t.Errorf("wrong error returned: '%s'", err.Error())`
`564`		`- }`
	`561`	`+ } else if err.Error() != "intoto does not support type: not a task ref" {`
	`562`	`+ t.Errorf("wrong error returned: '%s'", err.Error())`
`565`	`563`	`}`
`566`	`564`	`})`
`567`	`565`