Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove GetUnsignedPipeline helper function and use var in each file #6800

Merged
merged 1 commit into from
Sep 7, 2023
Merged

remove GetUnsignedPipeline helper function and use var in each file #6800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 deletions pkg/reconciler/pipelinerun/resources/pipelineref_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,23 @@ var (
},
EntryPoint: "foo/bar",
}
unsignedV1beta1Pipeline = &v1beta1.Pipeline{
TypeMeta: metav1.TypeMeta{
APIVersion: "tekton.dev/v1beta1",
Kind: "Pipeline"},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: format (and same for below)😝

ObjectMeta: metav1.ObjectMeta{
Name: "test-pipeline",
Namespace: "trusted-resources",
Annotations: map[string]string{"foo": "bar"},
},
Spec: v1beta1.PipelineSpec{
Tasks: []v1beta1.PipelineTask{
{
Name: "task",
},
},
},
}

unsignedV1Pipeline = &v1.Pipeline{
TypeMeta: metav1.TypeMeta{
Expand Down Expand Up @@ -485,7 +502,7 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyNoError(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
tektonclient := fake.NewSimpleClientset()

unsignedPipeline := test.GetUnsignedPipeline("test-pipeline")
unsignedPipeline := unsignedV1beta1Pipeline
unsignedV1Pipeline := &v1.Pipeline{}
unsignedPipeline.ConvertTo(ctx, unsignedV1Pipeline)
unsignedV1Pipeline.APIVersion = "tekton.dev/v1"
Expand Down Expand Up @@ -688,7 +705,7 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyError(t *testing.T) {
tektonclient := fake.NewSimpleClientset()
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)

unsignedPipeline := test.GetUnsignedPipeline("test-pipeline")
unsignedPipeline := unsignedV1beta1Pipeline
unsignedPipelineBytes, err := json.Marshal(unsignedPipeline)
if err != nil {
t.Fatal("fail to marshal pipeline", err)
Expand Down Expand Up @@ -1134,7 +1151,7 @@ func TestGetPipelineFunc_GetFuncError(t *testing.T) {
tektonclient := fake.NewSimpleClientset()
_, k8sclient, vps := test.SetupMatchAllVerificationPolicies(t, "trusted-resources")

unsignedPipeline := test.GetUnsignedPipeline("test-pipeline")
unsignedPipeline := unsignedV1beta1Pipeline
unsignedPipelineBytes, err := json.Marshal(unsignedPipeline)
if err != nil {
t.Fatal("fail to marshal pipeline", err)
Expand Down
90 changes: 54 additions & 36 deletions pkg/trustedresources/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,38 +46,56 @@ const (
namespace = "trusted-resources"
)

var unsignedTask = v1.Task{
TypeMeta: metav1.TypeMeta{
APIVersion: "tekton.dev/v1",
Kind: "Task"},
ObjectMeta: metav1.ObjectMeta{
Name: "task",
Annotations: map[string]string{"foo": "bar"},
},
Spec: v1.TaskSpec{
Steps: []v1.Step{{
Image: "ubuntu",
Name: "echo",
}},
},
}

var unsignedPipeline = v1.Pipeline{
TypeMeta: metav1.TypeMeta{
APIVersion: "tekton.dev/v1",
Kind: "Pipeline"},
ObjectMeta: metav1.ObjectMeta{
Name: "pipeline",
Annotations: map[string]string{"foo": "bar"},
},
Spec: v1.PipelineSpec{
Tasks: []v1.PipelineTask{
{
Name: "task",
var (
unsignedV1Task = v1.Task{
TypeMeta: metav1.TypeMeta{
APIVersion: "tekton.dev/v1",
Kind: "Task"},
ObjectMeta: metav1.ObjectMeta{
Name: "task",
Annotations: map[string]string{"foo": "bar"},
},
Spec: v1.TaskSpec{
Steps: []v1.Step{{
Image: "ubuntu",
Name: "echo",
}},
},
}
unsignedV1beta1Pipeline = &v1beta1.Pipeline{
TypeMeta: metav1.TypeMeta{
APIVersion: "tekton.dev/v1beta1",
Kind: "Pipeline"},
ObjectMeta: metav1.ObjectMeta{
Name: "test-pipeline",
Namespace: "trusted-resources",
Annotations: map[string]string{"foo": "bar"},
},
Spec: v1beta1.PipelineSpec{
Tasks: []v1beta1.PipelineTask{
{
Name: "task",
},
},
},
},
}
}
unsignedV1Pipeline = v1.Pipeline{
TypeMeta: metav1.TypeMeta{
APIVersion: "tekton.dev/v1",
Kind: "Pipeline"},
ObjectMeta: metav1.ObjectMeta{
Name: "pipeline",
Annotations: map[string]string{"foo": "bar"},
},
Spec: v1.PipelineSpec{
Tasks: []v1.PipelineTask{
{
Name: "task",
},
},
},
}
)

func TestVerifyInterface_Task_Success(t *testing.T) {
sv, _, err := signature.NewDefaultECDSASignerVerifier()
Expand Down Expand Up @@ -429,7 +447,7 @@ func TestVerifyResource_Task_Error(t *testing.T) {

func TestVerifyResource_Pipeline_Success(t *testing.T) {
sv, _, k8sclient, vps := test.SetupVerificationPolicies(t)
unsignedPipeline := test.GetUnsignedPipeline("test-pipeline")
unsignedPipeline := unsignedV1beta1Pipeline
signedPipeline, err := test.GetSignedV1beta1Pipeline(unsignedPipeline, sv, "signed")
if err != nil {
t.Fatal("fail to sign task", err)
Expand Down Expand Up @@ -483,7 +501,7 @@ func TestVerifyResource_Pipeline_Error(t *testing.T) {
ctx = test.SetupTrustedResourceConfig(ctx, config.FailNoMatchPolicy)
sv, _, k8sclient, vps := test.SetupVerificationPolicies(t)

unsignedPipeline := test.GetUnsignedPipeline("test-pipeline")
unsignedPipeline := unsignedV1beta1Pipeline

signedPipeline, err := test.GetSignedV1beta1Pipeline(unsignedPipeline, sv, "signed")
if err != nil {
Expand Down Expand Up @@ -542,7 +560,7 @@ func TestVerifyResource_Pipeline_Error(t *testing.T) {

func TestVerifyResource_V1Task_Success(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
signedTask, err := getSignedV1Task(unsignedTask.DeepCopy(), signer, "signed")
signedTask, err := getSignedV1Task(unsignedV1Task.DeepCopy(), signer, "signed")
if err != nil {
t.Error(err)
}
Expand All @@ -553,7 +571,7 @@ func TestVerifyResource_V1Task_Success(t *testing.T) {
}
func TestVerifyResource_V1Task_Error(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
signedTask, err := getSignedV1Task(unsignedTask.DeepCopy(), signer, "signed")
signedTask, err := getSignedV1Task(unsignedV1Task.DeepCopy(), signer, "signed")
if err != nil {
t.Error(err)
}
Expand All @@ -567,7 +585,7 @@ func TestVerifyResource_V1Task_Error(t *testing.T) {

func TestVerifyResource_V1Pipeline_Success(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
signed, err := getSignedV1Pipeline(unsignedPipeline.DeepCopy(), signer, "signed")
signed, err := getSignedV1Pipeline(unsignedV1Pipeline.DeepCopy(), signer, "signed")
if err != nil {
t.Error(err)
}
Expand All @@ -579,7 +597,7 @@ func TestVerifyResource_V1Pipeline_Success(t *testing.T) {

func TestVerifyResource_V1Pipeline_Error(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
signed, err := getSignedV1Pipeline(unsignedPipeline.DeepCopy(), signer, "signed")
signed, err := getSignedV1Pipeline(unsignedV1Pipeline.DeepCopy(), signer, "signed")
if err != nil {
t.Error(err)
}
Expand Down
21 changes: 0 additions & 21 deletions test/trustedresources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,27 +74,6 @@ func GetUnsignedTask(name string) *v1beta1.Task {
}
}

// GetUnsignedPipeline returns unsigned pipeline with given name
func GetUnsignedPipeline(name string) *v1beta1.Pipeline {
return &v1beta1.Pipeline{
TypeMeta: metav1.TypeMeta{
APIVersion: "tekton.dev/v1beta1",
Kind: "Pipeline"},
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
Annotations: map[string]string{"foo": "bar"},
},
Spec: v1beta1.PipelineSpec{
Tasks: []v1beta1.PipelineTask{
{
Name: "task",
},
},
},
}
}

// SetupTrustedResourceConfig configures the trusted-resources-verification-no-match-policy feature flag with the given mode for testing
func SetupTrustedResourceConfig(ctx context.Context, verificationNoMatchPolicy string) context.Context {
store := config.NewStore(logging.FromContext(ctx).Named("config-store"))
Expand Down