-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PipelineRun auto-conversion from v1alha1 to v1alpha2 🎋
This adds auto-conversion methods and tests for PipelineRun types in v1alpha1 and v1alpha2. Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
- Loading branch information
1 parent
9eef4d5
commit 4ce45d0
Showing
7 changed files
with
359 additions
and
191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| Copyright 2020 The Tekton Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // nolint: golint | ||
| package v1alpha1 | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha2" | ||
| "knative.dev/pkg/apis" | ||
| ) | ||
|
|
||
| var _ apis.Convertible = (*PipelineRun)(nil) | ||
|
|
||
| // ConvertUp implements api.Convertible | ||
| func (source *PipelineRun) ConvertUp(ctx context.Context, obj apis.Convertible) error { | ||
| switch sink := obj.(type) { | ||
| case *v1alpha2.PipelineRun: | ||
| sink.ObjectMeta = source.ObjectMeta | ||
| if err := source.Spec.ConvertUp(ctx, &sink.Spec); err != nil { | ||
| return err | ||
| } | ||
| sink.Status = source.Status | ||
| return nil | ||
| default: | ||
| return fmt.Errorf("unknown version, got: %T", sink) | ||
| } | ||
| } | ||
|
|
||
| func (source *PipelineRunSpec) ConvertUp(ctx context.Context, sink *v1alpha2.PipelineRunSpec) error { | ||
| sink.PipelineRef = source.PipelineRef | ||
| if source.PipelineSpec != nil { | ||
| sink.PipelineSpec = &v1alpha2.PipelineSpec{} | ||
| if err := source.PipelineSpec.ConvertUp(ctx, sink.PipelineSpec); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| sink.Resources = source.Resources | ||
| sink.Params = source.Params | ||
| sink.ServiceAccountName = source.ServiceAccountName | ||
| sink.ServiceAccountNames = source.ServiceAccountNames | ||
| sink.Status = source.Status | ||
| sink.Timeout = source.Timeout | ||
| sink.PodTemplate = source.PodTemplate | ||
| sink.Workspaces = source.Workspaces | ||
| sink.LimitRangeName = source.LimitRangeName | ||
| return nil | ||
| } | ||
|
|
||
| // ConvertDown implements api.Convertible | ||
| func (sink *PipelineRun) ConvertDown(ctx context.Context, obj apis.Convertible) error { | ||
| switch source := obj.(type) { | ||
| case *v1alpha2.PipelineRun: | ||
| sink.ObjectMeta = source.ObjectMeta | ||
| if err := sink.Spec.ConvertDown(ctx, &source.Spec); err != nil { | ||
| return err | ||
| } | ||
| sink.Status = source.Status | ||
| return nil | ||
| default: | ||
| return fmt.Errorf("unknown version, got: %T", sink) | ||
| } | ||
| } | ||
|
|
||
| func (sink *PipelineRunSpec) ConvertDown(ctx context.Context, source *v1alpha2.PipelineRunSpec) error { | ||
| sink.PipelineRef = source.PipelineRef | ||
| if source.PipelineSpec != nil { | ||
| sink.PipelineSpec = &PipelineSpec{} | ||
| if err := sink.PipelineSpec.ConvertDown(ctx, *source.PipelineSpec); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| sink.Resources = source.Resources | ||
| sink.Params = source.Params | ||
| sink.ServiceAccountName = source.ServiceAccountName | ||
| sink.ServiceAccountNames = source.ServiceAccountNames | ||
| sink.Status = source.Status | ||
| sink.Timeout = source.Timeout | ||
| sink.PodTemplate = source.PodTemplate | ||
| sink.Workspaces = source.Workspaces | ||
| sink.LimitRangeName = source.LimitRangeName | ||
| return nil | ||
| } |
183 changes: 183 additions & 0 deletions
183
pkg/apis/pipeline/v1alpha1/pipelinerun_conversion_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| /* | ||
| Copyright 2020 The Tekton Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha1 | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/google/go-cmp/cmp" | ||
| "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha2" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "knative.dev/pkg/apis" | ||
| ) | ||
|
|
||
| func TestPipelineRunConversionBadType(t *testing.T) { | ||
| good, bad := &PipelineRun{}, &Pipeline{} | ||
|
|
||
| if err := good.ConvertUp(context.Background(), bad); err == nil { | ||
| t.Errorf("ConvertUp() = %#v, wanted error", bad) | ||
| } | ||
|
|
||
| if err := good.ConvertDown(context.Background(), bad); err == nil { | ||
| t.Errorf("ConvertUp() = %#v, wanted error", bad) | ||
| } | ||
| } | ||
|
|
||
| func TestPipelineRunConversion(t *testing.T) { | ||
| versions := []apis.Convertible{&v1alpha2.PipelineRun{}} | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| in *PipelineRun | ||
| wantErr bool | ||
| }{{ | ||
| name: "simple conversion pipelineref", | ||
| in: &PipelineRun{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "foo", | ||
| Namespace: "bar", | ||
| Generation: 1, | ||
| }, | ||
| Spec: PipelineRunSpec{ | ||
| PipelineRef: &PipelineRef{ | ||
| Name: "pipeline", | ||
| }, | ||
| ServiceAccountName: "sa", | ||
| ServiceAccountNames: []PipelineRunSpecServiceAccountName{{ | ||
| TaskName: "t1", | ||
| ServiceAccountName: "sa1", | ||
| }}, | ||
| Timeout: &metav1.Duration{Duration: 1 * time.Minute}, | ||
| PodTemplate: &PodTemplate{ | ||
| NodeSelector: map[string]string{"foo": "bar"}, | ||
| }, | ||
| Workspaces: []WorkspaceBinding{{ | ||
| Name: "w1", | ||
| SubPath: "foo", | ||
| EmptyDir: &corev1.EmptyDirVolumeSource{}, | ||
| }}, | ||
| LimitRangeName: "foo", | ||
| Params: []Param{{ | ||
| Name: "p1", | ||
| Value: v1alpha2.ArrayOrString{StringVal: "baz"}, | ||
| }}, | ||
| Resources: []PipelineResourceBinding{{ | ||
| Name: "i1", | ||
| ResourceRef: &v1alpha2.PipelineResourceRef{Name: "r1"}, | ||
| }}, | ||
| }, | ||
| Status: PipelineRunStatus{ | ||
| PipelineRunStatusFields: PipelineRunStatusFields{ | ||
| StartTime: &metav1.Time{Time: time.Now().Add(-4 * time.Minute)}, | ||
| CompletionTime: &metav1.Time{Time: time.Now().Add(-1 * time.Minute)}, | ||
| TaskRuns: map[string]*PipelineRunTaskRunStatus{ | ||
| "foo-run": { | ||
| PipelineTaskName: "foo", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, { | ||
| name: "simple conversion pipelinespec", | ||
| in: &PipelineRun{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "foo", | ||
| Namespace: "bar", | ||
| Generation: 1, | ||
| }, | ||
| Spec: PipelineRunSpec{ | ||
| PipelineSpec: &PipelineSpec{ | ||
| Tasks: []PipelineTask{{ | ||
| Name: "task1", | ||
| TaskRef: &TaskRef{ | ||
| Name: "taskref", | ||
| }, | ||
| }, { | ||
| Name: "task2", | ||
| TaskSpec: &TaskSpec{TaskSpec: v1alpha2.TaskSpec{ | ||
| Steps: []v1alpha2.Step{{Container: corev1.Container{ | ||
| Image: "foo", | ||
| }}}, | ||
| }}, | ||
| RunAfter: []string{"task1"}, | ||
| }}, | ||
| }, | ||
| ServiceAccountName: "sa", | ||
| ServiceAccountNames: []PipelineRunSpecServiceAccountName{{ | ||
| TaskName: "t1", | ||
| ServiceAccountName: "sa1", | ||
| }}, | ||
| Timeout: &metav1.Duration{Duration: 1 * time.Minute}, | ||
| PodTemplate: &PodTemplate{ | ||
| NodeSelector: map[string]string{"foo": "bar"}, | ||
| }, | ||
| Workspaces: []WorkspaceBinding{{ | ||
| Name: "w1", | ||
| SubPath: "foo", | ||
| EmptyDir: &corev1.EmptyDirVolumeSource{}, | ||
| }}, | ||
| LimitRangeName: "foo", | ||
| Params: []Param{{ | ||
| Name: "p1", | ||
| Value: v1alpha2.ArrayOrString{StringVal: "baz"}, | ||
| }}, | ||
| Resources: []PipelineResourceBinding{{ | ||
| Name: "i1", | ||
| ResourceRef: &v1alpha2.PipelineResourceRef{Name: "r1"}, | ||
| }}, | ||
| }, | ||
| Status: PipelineRunStatus{ | ||
| PipelineRunStatusFields: PipelineRunStatusFields{ | ||
| StartTime: &metav1.Time{Time: time.Now().Add(-4 * time.Minute)}, | ||
| CompletionTime: &metav1.Time{Time: time.Now().Add(-1 * time.Minute)}, | ||
| TaskRuns: map[string]*PipelineRunTaskRunStatus{ | ||
| "foo-run": { | ||
| PipelineTaskName: "foo", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }} | ||
|
|
||
| for _, test := range tests { | ||
| for _, version := range versions { | ||
| t.Run(test.name, func(t *testing.T) { | ||
| ver := version | ||
| if err := test.in.ConvertUp(context.Background(), ver); err != nil { | ||
| if !test.wantErr { | ||
| t.Errorf("ConvertUp() = %v", err) | ||
| } | ||
| return | ||
| } | ||
| t.Logf("ConvertUp() = %#v", ver) | ||
| got := &PipelineRun{} | ||
| if err := got.ConvertDown(context.Background(), ver); err != nil { | ||
| t.Errorf("ConvertDown() = %v", err) | ||
| } | ||
| t.Logf("ConvertDown() = %#v", got) | ||
| if diff := cmp.Diff(test.in, got); diff != "" { | ||
| t.Errorf("roundtrip (-want, +got) = %v", diff) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.