Remove tekton as a provenance format

This PR removes tekton as a provenance format since it was deprecated in an earlier release.
tektoncd · Jan 19, 2023 · c21f2f9 · c21f2f9
1 parent b4e5b53
commit c21f2f9
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 180 deletions.
diff --git a/docs/tutorials/getting-started-tutorial.md b/docs/tutorials/getting-started-tutorial.md
@@ -41,7 +41,7 @@ storage and format is set to `tekton`.
 You can set these fields by running the following command:
 
 ```shell
-kubectl patch configmap chains-config -n tekton-chains -p='{"data":{"artifacts.oci.storage": "", "artifacts.taskrun.format":"tekton", "artifacts.taskrun.storage": "tekton"}}'
+kubectl patch configmap chains-config -n tekton-chains -p='{"data":{"artifacts.oci.storage": "", "artifacts.taskrun.format":"in-toto", "artifacts.taskrun.storage": "tekton"}}'
 ```
 
 Then restart the controller to ensure it picks up the changes:

diff --git a/pkg/chains/formats/all/all.go b/pkg/chains/formats/all/all.go
@@ -17,5 +17,4 @@ package all
 import (
  _ "github.com/tektoncd/chains/pkg/chains/formats/intotoite6"
  _ "github.com/tektoncd/chains/pkg/chains/formats/simple"
- _ "github.com/tektoncd/chains/pkg/chains/formats/tekton"
 )
diff --git a/pkg/chains/formats/tekton/tekton.go b/pkg/chains/formats/tekton/tekton.go
diff --git a/pkg/chains/formats/tekton/tekton_test.go b/pkg/chains/formats/tekton/tekton_test.go
diff --git a/pkg/chains/signing_test.go b/pkg/chains/signing_test.go
@@ -57,7 +57,7 @@ func TestSigner_Sign(t *testing.T) {
  tcfg := &config.Config{
  Artifacts: config.ArtifactConfigs{
  TaskRuns: config.Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("mock"),
  Signer: "x509",
  },
@@ -67,7 +67,7 @@ func TestSigner_Sign(t *testing.T) {
  pcfg := &config.Config{
  Artifacts: config.ArtifactConfigs{
  PipelineRuns: config.Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("mock"),
  Signer: "x509",
  },
@@ -240,22 +240,6 @@ func TestSigner_Transparency(t *testing.T) {
  },
  getNewObject: newTaskRun,
  },
- {
- name: "taskrun tekton",
- cfg: &config.Config{
- Artifacts: config.ArtifactConfigs{
- TaskRuns: config.Artifact{
- Format: "tekton",
- StorageBackend: sets.NewString("mock"),
- Signer: "x509",
- },
- },
- Transparency: config.TransparencyConfig{
- Enabled: false,
- },
- },
- getNewObject: newTaskRun,
- },
  {
  name: "pipelinerun in-toto",
  cfg: &config.Config{
@@ -272,22 +256,6 @@ func TestSigner_Transparency(t *testing.T) {
  },
  getNewObject: newPipelineRun,
  },
- {
- name: "pipelinerun tekton",
- cfg: &config.Config{
- Artifacts: config.ArtifactConfigs{
- PipelineRuns: config.Artifact{
- Format: "tekton",
- StorageBackend: sets.NewString("mock"),
- Signer: "x509",
- },
- },
- Transparency: config.TransparencyConfig{
- Enabled: false,
- },
- },
- getNewObject: newPipelineRun,
- },
  }
  for _, tt := range tests {
  t.Run(tt.name, func(t *testing.T) {
@@ -380,7 +348,7 @@ func TestSigningObjects(t *testing.T) {
  config: config.Config{
  Artifacts: config.ArtifactConfigs{
  TaskRuns: config.Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("mock"),
  Signer: "x509",
  },
@@ -394,12 +362,12 @@ func TestSigningObjects(t *testing.T) {
  config: config.Config{
  Artifacts: config.ArtifactConfigs{
  TaskRuns: config.Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("mock"),
  Signer: "x509",
  },
  OCI: config.Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("mock"),
  Signer: "x509",
  },
@@ -413,11 +381,11 @@ func TestSigningObjects(t *testing.T) {
  config: config.Config{
  Artifacts: config.ArtifactConfigs{
  TaskRuns: config.Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("mock"),
  },
  OCI: config.Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("mock"),
  },
  },

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -208,12 +208,12 @@ func defaultConfig() *Config {
  return &Config{
  Artifacts: ArtifactConfigs{
  TaskRuns: Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("tekton"),
  Signer: "x509",
  },
  PipelineRuns: Artifact{
- Format: "tekton",
+ Format: "in-toto",
  StorageBackend: sets.NewString("tekton"),
  Signer: "x509",
  },
@@ -250,12 +250,12 @@ func NewConfigFromMap(data map[string]string) (*Config, error) {
  if err := cm.Parse(data,
  // Artifact-specific configs
  // TaskRuns
- asString(taskrunFormatKey, &cfg.Artifacts.TaskRuns.Format, "tekton", "in-toto"),
+ asString(taskrunFormatKey, &cfg.Artifacts.TaskRuns.Format, "in-toto"),
  asStringSet(taskrunStorageKey, &cfg.Artifacts.TaskRuns.StorageBackend, sets.NewString("tekton", "oci", "gcs", "docdb", "grafeas", "kafka")),
  asString(taskrunSignerKey, &cfg.Artifacts.TaskRuns.Signer, "x509", "kms"),
 
  // PipelineRuns
- asString(pipelinerunFormatKey, &cfg.Artifacts.PipelineRuns.Format, "tekton", "in-toto"),
+ asString(pipelinerunFormatKey, &cfg.Artifacts.PipelineRuns.Format, "in-toto"),
  asStringSet(pipelinerunStorageKey, &cfg.Artifacts.PipelineRuns.StorageBackend, sets.NewString("tekton", "oci", "grafeas")),
  asString(pipelinerunSignerKey, &cfg.Artifacts.PipelineRuns.Signer, "x509", "kms"),