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

Use apiVersion declarative naming in pipelineRef and taskRef test for… #6814

Closed
wants to merge 1 commit into from
Closed

Use apiVersion declarative naming in pipelineRef and taskRef test for… #6814

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
16 changes: 8 additions & 8 deletions pkg/reconciler/pipelinerun/pipelinerun_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11783,7 +11783,7 @@ spec:
t.Fatal("fail to marshal task", err)
}

unsignedPipeline := parse.MustParseV1beta1Pipeline(t, fmt.Sprintf(`
unsignedV1beta1Pipeline := parse.MustParseV1beta1Pipeline(t, fmt.Sprintf(`
metadata:
name: test-pipeline
namespace: foo
Expand All @@ -11793,14 +11793,14 @@ spec:
taskRef:
resolver: %s
`, resolverName))
unsignedPipelineBytes, err := yaml.Marshal(unsignedPipeline)
unsignedV1beta1PipelineBytes, err := yaml.Marshal(unsignedV1beta1Pipeline)
if err != nil {
t.Fatal("fail to marshal task", err)
}

// Case2: signed Pipeline refers to unsigned Task
signer, _, vps := test.SetupMatchAllVerificationPolicies(t, unsignedTask.Namespace)
signedPipelineWithUnsignedTask, err := test.GetSignedV1beta1Pipeline(unsignedPipeline, signer, "test-pipeline")
signedPipelineWithUnsignedTask, err := test.GetSignedV1beta1Pipeline(unsignedV1beta1Pipeline, signer, "test-pipeline")
if err != nil {
t.Fatal("fail to sign pipeline", err)
}
Expand Down Expand Up @@ -11901,7 +11901,7 @@ spec:
}{
{
name: "unsigned pipeline fails verification",
pipelineBytes: unsignedPipelineBytes,
pipelineBytes: unsignedV1beta1PipelineBytes,
taskBytes: unsignedTaskBytes,
},
{
Expand Down Expand Up @@ -12118,7 +12118,7 @@ spec:
t.Fatal("fail to marshal task", err)
}

unsignedPipeline := parse.MustParseV1beta1Pipeline(t, fmt.Sprintf(`
unsignedV1beta1Pipeline := parse.MustParseV1beta1Pipeline(t, fmt.Sprintf(`
metadata:
name: test-pipeline
namespace: foo
Expand All @@ -12128,14 +12128,14 @@ spec:
taskRef:
resolver: %s
`, resolverName))
unsignedPipelineBytes, err := yaml.Marshal(unsignedPipeline)
unsignedV1beta1PipelineBytes, err := yaml.Marshal(unsignedV1beta1Pipeline)
if err != nil {
t.Fatal("fail to marshal task", err)
}

// Case2: signed Pipeline refers to unsigned Task
signer, _, vps := test.SetupMatchAllVerificationPolicies(t, unsignedTask.Namespace)
signedPipelineWithUnsignedTask, err := test.GetSignedV1beta1Pipeline(unsignedPipeline, signer, "test-pipeline")
signedPipelineWithUnsignedTask, err := test.GetSignedV1beta1Pipeline(unsignedV1beta1Pipeline, signer, "test-pipeline")
if err != nil {
t.Fatal("fail to sign pipeline", err)
}
Expand Down Expand Up @@ -12236,7 +12236,7 @@ spec:
}{
{
name: "unsigned pipeline fails verification",
pipelineBytes: unsignedPipelineBytes,
pipelineBytes: unsignedV1beta1PipelineBytes,
taskBytes: unsignedTaskBytes,
},
{
Expand Down
50 changes: 25 additions & 25 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 @@ -517,8 +517,8 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyNoError(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
tektonclient := fake.NewSimpleClientset()

unsignedPipeline := test.GetUnsignedPipeline("test-pipeline")
unsignedPipelineBytes, err := json.Marshal(unsignedPipeline)
unsignedV1beta1Pipeline := test.GetUnsignedV1beta1Pipeline("test-pipeline")
unsignedV1beta1PipelineBytes, err := json.Marshal(unsignedV1beta1Pipeline)
if err != nil {
t.Fatal("fail to marshal pipeline", err)
}
Expand All @@ -529,10 +529,10 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyNoError(t *testing.T) {
},
EntryPoint: "foo/bar",
}
resolvedUnmatched := test.NewResolvedResource(unsignedPipelineBytes, nil, noMatchPolicyRefSource, nil)
resolvedUnmatched := test.NewResolvedResource(unsignedV1beta1PipelineBytes, nil, noMatchPolicyRefSource, nil)
requesterUnmatched := test.NewRequester(resolvedUnmatched, nil)

signedPipeline, err := test.GetSignedV1beta1Pipeline(unsignedPipeline, signer, "signed")
signedPipeline, err := test.GetSignedV1beta1Pipeline(unsignedV1beta1Pipeline, signer, "signed")
if err != nil {
t.Fatal("fail to sign pipeline", err)
}
Expand Down Expand Up @@ -588,7 +588,7 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyNoError(t *testing.T) {
warnPolicyRefSource := &v1beta1.RefSource{
URI: " warnVP",
}
resolvedUnsignedMatched := test.NewResolvedResource(unsignedPipelineBytes, nil, warnPolicyRefSource, nil)
resolvedUnsignedMatched := test.NewResolvedResource(unsignedV1beta1PipelineBytes, nil, warnPolicyRefSource, nil)
requesterUnsignedMatched := test.NewRequester(resolvedUnsignedMatched, nil)

testcases := []struct {
Expand Down Expand Up @@ -633,7 +633,7 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyNoError(t *testing.T) {
verificationNoMatchPolicy: config.WarnNoMatchPolicy,
pipelinerun: pr,
policies: vps,
expected: unsignedPipeline,
expected: unsignedV1beta1Pipeline,
expectedRefSource: noMatchPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationWarn, Err: trustedresources.ErrNoMatchedPolicies},
}, {
Expand All @@ -642,7 +642,7 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyNoError(t *testing.T) {
verificationNoMatchPolicy: config.FailNoMatchPolicy,
pipelinerun: pr,
policies: vps,
expected: unsignedPipeline,
expected: unsignedV1beta1Pipeline,
expectedRefSource: warnPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationWarn, Err: trustedresources.ErrResourceVerificationFailed},
}, {
Expand All @@ -651,7 +651,7 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyNoError(t *testing.T) {
verificationNoMatchPolicy: config.IgnoreNoMatchPolicy,
pipelinerun: pr,
policies: vps,
expected: unsignedPipeline,
expected: unsignedV1beta1Pipeline,
expectedRefSource: noMatchPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationSkip},
}, {
Expand Down Expand Up @@ -704,8 +704,8 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyError(t *testing.T) {
tektonclient := fake.NewSimpleClientset()
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)

unsignedPipeline := test.GetUnsignedPipeline("test-pipeline")
unsignedPipelineBytes, err := json.Marshal(unsignedPipeline)
unsignedV1beta1Pipeline := test.GetUnsignedV1beta1Pipeline("test-pipeline")
unsignedV1beta1PipelineBytes, err := json.Marshal(unsignedV1beta1Pipeline)
if err != nil {
t.Fatal("fail to marshal pipeline", err)
}
Expand All @@ -717,10 +717,10 @@ func TestGetPipelineFunc_V1beta1Pipeline_VerifyError(t *testing.T) {
EntryPoint: "foo/bar",
}

resolvedUnsigned := test.NewResolvedResource(unsignedPipelineBytes, nil, matchPolicyRefSource, nil)
resolvedUnsigned := test.NewResolvedResource(unsignedV1beta1PipelineBytes, nil, matchPolicyRefSource, nil)
requesterUnsigned := test.NewRequester(resolvedUnsigned, nil)

signedPipeline, err := test.GetSignedV1beta1Pipeline(unsignedPipeline, signer, "signed")
signedPipeline, err := test.GetSignedV1beta1Pipeline(unsignedV1beta1Pipeline, signer, "signed")
if err != nil {
t.Fatal("fail to sign pipeline", err)
}
Expand Down Expand Up @@ -821,17 +821,17 @@ func TestGetPipelineFunc_V1Pipeline_VerifyNoError(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
tektonclient := fake.NewSimpleClientset()

v1beta1UnsignedPipeline := &v1beta1.Pipeline{
v1beta1UnsignedV1beta1Pipeline := &v1beta1.Pipeline{
TypeMeta: metav1.TypeMeta{
Kind: "Pipeline",
APIVersion: "tekton.dev/v1beta1",
},
}
if err := v1beta1UnsignedPipeline.ConvertFrom(ctx, unsignedV1Pipeline.DeepCopy()); err != nil {
if err := v1beta1UnsignedV1beta1Pipeline.ConvertFrom(ctx, unsignedV1Pipeline.DeepCopy()); err != nil {
t.Error(err)
}

unsignedPipelineBytes, err := json.Marshal(unsignedV1Pipeline)
unsignedV1beta1PipelineBytes, err := json.Marshal(unsignedV1Pipeline)
if err != nil {
t.Fatal("fail to marshal pipeline", err)
}
Expand All @@ -842,7 +842,7 @@ func TestGetPipelineFunc_V1Pipeline_VerifyNoError(t *testing.T) {
},
EntryPoint: "foo/bar",
}
resolvedUnmatched := test.NewResolvedResource(unsignedPipelineBytes, nil, noMatchPolicyRefSource, nil)
resolvedUnmatched := test.NewResolvedResource(unsignedV1beta1PipelineBytes, nil, noMatchPolicyRefSource, nil)
requesterUnmatched := test.NewRequester(resolvedUnmatched, nil)

signedPipeline, err := getSignedV1Pipeline(unsignedV1Pipeline, signer, "signed")
Expand Down Expand Up @@ -912,7 +912,7 @@ func TestGetPipelineFunc_V1Pipeline_VerifyNoError(t *testing.T) {
warnPolicyRefSource := &v1beta1.RefSource{
URI: " warnVP",
}
resolvedUnsignedMatched := test.NewResolvedResource(unsignedPipelineBytes, nil, warnPolicyRefSource, nil)
resolvedUnsignedMatched := test.NewResolvedResource(unsignedV1beta1PipelineBytes, nil, warnPolicyRefSource, nil)
requesterUnsignedMatched := test.NewRequester(resolvedUnsignedMatched, nil)

testcases := []struct {
Expand Down Expand Up @@ -957,7 +957,7 @@ func TestGetPipelineFunc_V1Pipeline_VerifyNoError(t *testing.T) {
verificationNoMatchPolicy: config.WarnNoMatchPolicy,
pipelinerun: pr,
policies: vps,
expected: v1beta1UnsignedPipeline,
expected: v1beta1UnsignedV1beta1Pipeline,
expectedRefSource: noMatchPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationWarn, Err: trustedresources.ErrNoMatchedPolicies},
}, {
Expand All @@ -966,7 +966,7 @@ func TestGetPipelineFunc_V1Pipeline_VerifyNoError(t *testing.T) {
verificationNoMatchPolicy: config.FailNoMatchPolicy,
pipelinerun: pr,
policies: vps,
expected: v1beta1UnsignedPipeline,
expected: v1beta1UnsignedV1beta1Pipeline,
expectedRefSource: warnPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationWarn, Err: trustedresources.ErrResourceVerificationFailed},
}, {
Expand All @@ -975,7 +975,7 @@ func TestGetPipelineFunc_V1Pipeline_VerifyNoError(t *testing.T) {
verificationNoMatchPolicy: config.IgnoreNoMatchPolicy,
pipelinerun: pr,
policies: vps,
expected: v1beta1UnsignedPipeline,
expected: v1beta1UnsignedV1beta1Pipeline,
expectedRefSource: noMatchPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationSkip},
}, {
Expand Down Expand Up @@ -1028,7 +1028,7 @@ func TestGetPipelineFunc_V1Pipeline_VerifyError(t *testing.T) {
tektonclient := fake.NewSimpleClientset()
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)

unsignedPipelineBytes, err := json.Marshal(unsignedV1Pipeline)
unsignedV1beta1PipelineBytes, err := json.Marshal(unsignedV1Pipeline)
if err != nil {
t.Fatal("fail to marshal pipeline", err)
}
Expand All @@ -1040,7 +1040,7 @@ func TestGetPipelineFunc_V1Pipeline_VerifyError(t *testing.T) {
EntryPoint: "foo/bar",
}

resolvedUnsigned := test.NewResolvedResource(unsignedPipelineBytes, nil, matchPolicyRefSource, nil)
resolvedUnsigned := test.NewResolvedResource(unsignedV1beta1PipelineBytes, nil, matchPolicyRefSource, nil)
requesterUnsigned := test.NewRequester(resolvedUnsigned, nil)

signedPipeline, err := getSignedV1Pipeline(unsignedV1Pipeline, signer, "signed")
Expand Down Expand Up @@ -1144,13 +1144,13 @@ func TestGetPipelineFunc_GetFuncError(t *testing.T) {
tektonclient := fake.NewSimpleClientset()
_, k8sclient, vps := test.SetupMatchAllVerificationPolicies(t, "trusted-resources")

unsignedPipeline := test.GetUnsignedPipeline("test-pipeline")
unsignedPipelineBytes, err := json.Marshal(unsignedPipeline)
unsignedV1beta1Pipeline := test.GetUnsignedV1beta1Pipeline("test-pipeline")
unsignedV1beta1PipelineBytes, err := json.Marshal(unsignedV1beta1Pipeline)
if err != nil {
t.Fatal("fail to marshal pipeline", err)
}

resolvedUnsigned := test.NewResolvedResource(unsignedPipelineBytes, nil, sampleRefSource.DeepCopy(), nil)
resolvedUnsigned := test.NewResolvedResource(unsignedV1beta1PipelineBytes, nil, sampleRefSource.DeepCopy(), nil)
requesterUnsigned := test.NewRequester(resolvedUnsigned, nil)
resolvedUnsigned.DataErr = fmt.Errorf("resolution error")

Expand Down
22 changes: 11 additions & 11 deletions pkg/reconciler/taskrun/resources/taskref_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,8 +765,8 @@ func TestGetTaskFunc_V1beta1Task_VerifyNoError(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
tektonclient := fake.NewSimpleClientset()

unsignedTask := test.GetUnsignedTask("test-task")
unsignedTaskBytes, err := json.Marshal(unsignedTask)
unsignedV1beta1Task := test.GetUnsignedV1beta1Task("test-task")
unsignedTaskBytes, err := json.Marshal(unsignedV1beta1Task)
if err != nil {
t.Fatal("fail to marshal task", err)
}
Expand All @@ -775,7 +775,7 @@ func TestGetTaskFunc_V1beta1Task_VerifyNoError(t *testing.T) {
}
requesterUnmatched := bytesToRequester(unsignedTaskBytes, noMatchPolicyRefSource)

signedTask, err := test.GetSignedV1beta1Task(unsignedTask, signer, "signed")
signedTask, err := test.GetSignedV1beta1Task(unsignedV1beta1Task, signer, "signed")
if err != nil {
t.Fatal("fail to sign task", err)
}
Expand Down Expand Up @@ -832,23 +832,23 @@ func TestGetTaskFunc_V1beta1Task_VerifyNoError(t *testing.T) {
requester: requesterUnmatched,
verificationNoMatchPolicy: config.WarnNoMatchPolicy,
policies: vps,
expected: unsignedTask,
expected: unsignedV1beta1Task,
expectedRefSource: noMatchPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationWarn, Err: trustedresources.ErrNoMatchedPolicies},
}, {
name: "task fails warn mode policy return warn VerificationResult",
requester: requesterUnsignedMatched,
verificationNoMatchPolicy: config.FailNoMatchPolicy,
policies: vps,
expected: unsignedTask,
expected: unsignedV1beta1Task,
expectedRefSource: warnPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationWarn, Err: trustedresources.ErrResourceVerificationFailed},
}, {
name: "ignore unsigned task without matching policies",
requester: requesterUnmatched,
verificationNoMatchPolicy: config.IgnoreNoMatchPolicy,
policies: vps,
expected: unsignedTask,
expected: unsignedV1beta1Task,
expectedRefSource: noMatchPolicyRefSource,
expectedVerificationResult: &trustedresources.VerificationResult{VerificationResultType: trustedresources.VerificationSkip},
},
Expand Down Expand Up @@ -890,8 +890,8 @@ func TestGetTaskFunc_V1beta1Task_VerifyError(t *testing.T) {
signer, _, k8sclient, vps := test.SetupVerificationPolicies(t)
tektonclient := fake.NewSimpleClientset()

unsignedTask := test.GetUnsignedTask("test-task")
unsignedTaskBytes, err := json.Marshal(unsignedTask)
unsignedV1beta1Task := test.GetUnsignedV1beta1Task("test-task")
unsignedTaskBytes, err := json.Marshal(unsignedV1beta1Task)
if err != nil {
t.Fatal("fail to marshal task", err)
}
Expand All @@ -900,7 +900,7 @@ func TestGetTaskFunc_V1beta1Task_VerifyError(t *testing.T) {
}
requesterUnsigned := bytesToRequester(unsignedTaskBytes, matchPolicyRefSource)

signedTask, err := test.GetSignedV1beta1Task(unsignedTask, signer, "signed")
signedTask, err := test.GetSignedV1beta1Task(unsignedV1beta1Task, signer, "signed")
if err != nil {
t.Fatal("fail to sign task", err)
}
Expand Down Expand Up @@ -1267,8 +1267,8 @@ func TestGetTaskFunc_GetFuncError(t *testing.T) {
_, k8sclient, vps := test.SetupMatchAllVerificationPolicies(t, "trusted-resources")
tektonclient := fake.NewSimpleClientset()

unsignedTask := test.GetUnsignedTask("test-task")
unsignedTaskBytes, err := json.Marshal(unsignedTask)
unsignedV1beta1Task := test.GetUnsignedV1beta1Task("test-task")
unsignedTaskBytes, err := json.Marshal(unsignedV1beta1Task)
if err != nil {
t.Fatal("fail to marshal task", err)
}
Expand Down
Loading