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

Attempt to fix another structured-merge-diff failures. #3348

Merged
merged 1 commit into from
Oct 7, 2020
Merged

Attempt to fix another structured-merge-diff failures. #3348

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
2 changes: 1 addition & 1 deletion internal/builder/v1beta1/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func PipelineRunResult(name, value string) PipelineRunStatusOp {
}

// PipelineTaskSpec sets the TaskSpec on a PipelineTask.
func PipelineTaskSpec(spec *v1beta1.TaskSpec) PipelineTaskOp {
func PipelineTaskSpec(spec v1beta1.TaskSpec) PipelineTaskOp {
return func(pt *v1beta1.PipelineTask) {
if pt.TaskSpec == nil {
pt.TaskSpec = &v1beta1.EmbeddedTask{}
Expand Down
4 changes: 2 additions & 2 deletions internal/builder/v1beta1/pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,8 @@ func TestPipelineRunWithFinalTask(t *testing.T) {
}
}

func getTaskSpec() *v1beta1.TaskSpec {
return &v1beta1.TaskSpec{
func getTaskSpec() v1beta1.TaskSpec {
return v1beta1.TaskSpec{
Steps: []v1beta1.Step{{Container: corev1.Container{
Name: "step",
Image: "myimage",
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/pipeline/v1alpha1/pipeline_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ func (source *PipelineTask) ConvertTo(ctx context.Context, sink *v1beta1.Pipelin
sink.Name = source.Name
sink.TaskRef = source.TaskRef
if source.TaskSpec != nil {
sink.TaskSpec = &v1beta1.EmbeddedTask{TaskSpec: &v1beta1.TaskSpec{}}
if err := source.TaskSpec.ConvertTo(ctx, sink.TaskSpec.TaskSpec); err != nil {
sink.TaskSpec = &v1beta1.EmbeddedTask{TaskSpec: v1beta1.TaskSpec{}}
if err := source.TaskSpec.ConvertTo(ctx, &sink.TaskSpec.TaskSpec); err != nil {
return err
}
}
Expand Down Expand Up @@ -112,7 +112,7 @@ func (sink *PipelineTask) ConvertFrom(ctx context.Context, source v1beta1.Pipeli
sink.TaskRef = source.TaskRef
if source.TaskSpec != nil {
sink.TaskSpec = &TaskSpec{}
if err := sink.TaskSpec.ConvertFrom(ctx, source.TaskSpec.TaskSpec); err != nil {
if err := sink.TaskSpec.ConvertFrom(ctx, &source.TaskSpec.TaskSpec); err != nil {
return err
}
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/pipeline/v1beta1/pipeline_defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func TestPipelineSpec_SetDefaults(t *testing.T) {
ps: &v1beta1.PipelineSpec{
Tasks: []v1beta1.PipelineTask{{
Name: "foo", TaskSpec: &v1beta1.EmbeddedTask{
TaskSpec: &v1beta1.TaskSpec{
TaskSpec: v1beta1.TaskSpec{
Params: []v1beta1.ParamSpec{{
Name: "string-param",
}},
Expand All @@ -97,7 +97,7 @@ func TestPipelineSpec_SetDefaults(t *testing.T) {
want: &v1beta1.PipelineSpec{
Tasks: []v1beta1.PipelineTask{{
Name: "foo", TaskSpec: &v1beta1.EmbeddedTask{
TaskSpec: &v1beta1.TaskSpec{
TaskSpec: v1beta1.TaskSpec{
Params: []v1beta1.ParamSpec{{
Name: "string-param",
Type: v1beta1.ParamTypeString,
Expand All @@ -111,7 +111,7 @@ func TestPipelineSpec_SetDefaults(t *testing.T) {
ps: &v1beta1.PipelineSpec{
Finally: []v1beta1.PipelineTask{{
Name: "foo", TaskSpec: &v1beta1.EmbeddedTask{
TaskSpec: &v1beta1.TaskSpec{
TaskSpec: v1beta1.TaskSpec{
Params: []v1beta1.ParamSpec{{
Name: "string-param",
}},
Expand All @@ -122,7 +122,7 @@ func TestPipelineSpec_SetDefaults(t *testing.T) {
want: &v1beta1.PipelineSpec{
Finally: []v1beta1.PipelineTask{{
Name: "foo", TaskSpec: &v1beta1.EmbeddedTask{
TaskSpec: &v1beta1.TaskSpec{
TaskSpec: v1beta1.TaskSpec{
Params: []v1beta1.ParamSpec{{
Name: "string-param",
Type: v1beta1.ParamTypeString,
Expand Down
3 changes: 1 addition & 2 deletions pkg/apis/pipeline/v1beta1/pipeline_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ type EmbeddedTask struct {
Metadata PipelineTaskMetadata `json:"metadata,omitempty"`

// TaskSpec is a specification of a task
// +optional
*TaskSpec `json:",inline,omitempty"`
TaskSpec `json:",inline,omitempty"`
}

// PipelineTask defines a task in a Pipeline, passing inputs from both
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/pipeline/v1beta1/pipeline_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ func TestValidatePipelineTasks_Failure(t *testing.T) {
name: "pipeline task with invalid taskspec",
tasks: []PipelineTask{{
Name: "foo",
TaskSpec: &EmbeddedTask{TaskSpec: &TaskSpec{}},
TaskSpec: &EmbeddedTask{TaskSpec: TaskSpec{}},
}},
expectedError: apis.FieldError{
Message: `missing field(s)`,
Expand Down Expand Up @@ -903,7 +903,7 @@ func TestValidateGraph_Failure(t *testing.T) {
func TestValidateParamResults_Success(t *testing.T) {
desc := "valid pipeline task referencing task result along with parameter variable"
tasks := []PipelineTask{{
TaskSpec: &EmbeddedTask{TaskSpec: &TaskSpec{
TaskSpec: &EmbeddedTask{TaskSpec: TaskSpec{
Results: []TaskResult{{
Name: "output",
}},
Expand Down Expand Up @@ -1995,8 +1995,8 @@ func TestContextInvalid(t *testing.T) {
}
}

func getTaskSpec() *TaskSpec {
return &TaskSpec{
func getTaskSpec() TaskSpec {
return TaskSpec{
Steps: []Step{{
Container: corev1.Container{Name: "foo", Image: "bar"},
}},
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/pipeline/v1beta1/pipelinerun_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func TestPipelineRun_Validate(t *testing.T) {
ArrayVal: []string{"$(params.pipeline-words)"},
},
}},
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: &v1beta1.TaskSpec{
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: v1beta1.TaskSpec{
Params: []v1beta1.ParamSpec{{
Name: "task-words",
Type: v1beta1.ParamTypeArray,
Expand Down
6 changes: 1 addition & 5 deletions pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/reconciler/pipelinerun/pipelinerun_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ func TestReconcile_PipelineSpecTaskSpec(t *testing.T) {
tb.Pipeline("test-pipeline",
tb.PipelineNamespace("foo"),
tb.PipelineSpec(
tb.PipelineTask("unit-test-task-spec", "", tb.PipelineTaskSpec(&v1beta1.TaskSpec{
tb.PipelineTask("unit-test-task-spec", "", tb.PipelineTaskSpec(v1beta1.TaskSpec{
Steps: []v1beta1.Step{{Container: corev1.Container{
Name: "mystep",
Image: "myimage"}}},
Expand Down Expand Up @@ -3860,8 +3860,8 @@ func TestReconcilePipeline_TaskSpecMetadata(t *testing.T) {
tb.Pipeline("test-pipeline",
tb.PipelineNamespace("foo"),
tb.PipelineSpec(
tb.PipelineTask("task-without-metadata", "", tb.PipelineTaskSpec(&ts)),
tb.PipelineTask("task-with-metadata", "", tb.PipelineTaskSpec(&ts),
tb.PipelineTask("task-without-metadata", "", tb.PipelineTaskSpec(ts)),
tb.PipelineTask("task-with-metadata", "", tb.PipelineTaskSpec(ts),
tb.TaskSpecMetadata(v1beta1.PipelineTaskMetadata{
Labels: labels,
Annotations: annotations}),
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ func ResolvePipelineRun(
taskName = t.TaskMetadata().Name
kind = pt.TaskRef.Kind
} else {
spec = *pt.TaskSpec.TaskSpec
spec = pt.TaskSpec.TaskSpec
}
spec.SetDefaults(contexts.WithUpgradeViaDefaulting(ctx))
rtr, err := ResolvePipelineTaskResources(pt, &spec, taskName, kind, providedResources)
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/pipelinerun/resources/pipelinerunresolution_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ func TestResolvePipelineRun(t *testing.T) {
tb.PipelineTaskOutputResource("output1", "git-resource"),
),
tb.PipelineTask("mytask4", "",
tb.PipelineTaskSpec(&v1beta1.TaskSpec{
tb.PipelineTaskSpec(v1beta1.TaskSpec{
Steps: []v1beta1.Step{{Container: corev1.Container{
Name: "step1",
}}},
Expand Down
2 changes: 1 addition & 1 deletion test/cancel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestTaskRunPipelineRunCancel(t *testing.T) {
Tasks: []v1beta1.PipelineTask{{
Name: "task",
Retries: numRetries,
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: &v1beta1.TaskSpec{
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: v1beta1.TaskSpec{
Steps: []v1beta1.Step{{
Container: corev1.Container{
Image: "busybox",
Expand Down
4 changes: 2 additions & 2 deletions test/git_checkout_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func TestGitPipelineRun(t *testing.T) {
}},
Tasks: []v1beta1.PipelineTask{{
Name: "git-check",
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: &v1beta1.TaskSpec{
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: v1beta1.TaskSpec{
Resources: &v1beta1.TaskResources{
Inputs: []v1beta1.TaskResource{{ResourceDeclaration: v1beta1.ResourceDeclaration{
Name: "gitsource", Type: v1alpha1.PipelineResourceTypeGit,
Expand Down Expand Up @@ -220,7 +220,7 @@ func TestGitPipelineRunFail(t *testing.T) {
}},
Tasks: []v1beta1.PipelineTask{{
Name: "git-check",
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: &v1beta1.TaskSpec{
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: v1beta1.TaskSpec{
Resources: &v1beta1.TaskResources{
Inputs: []v1beta1.TaskResource{{ResourceDeclaration: v1beta1.ResourceDeclaration{
Name: "gitsource", Type: v1alpha1.PipelineResourceTypeGit,
Expand Down
2 changes: 1 addition & 1 deletion test/retry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestTaskRunRetry(t *testing.T) {
PipelineSpec: &v1beta1.PipelineSpec{
Tasks: []v1beta1.PipelineTask{{
Name: "retry-me",
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: &v1beta1.TaskSpec{
TaskSpec: &v1beta1.EmbeddedTask{TaskSpec: v1beta1.TaskSpec{
Steps: []v1beta1.Step{{
Container: corev1.Container{Image: "busybox"},
Script: "exit 1",
Expand Down
94 changes: 0 additions & 94 deletions third_party/github.com/hashicorp/errwrap/errwrap_test.go
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions third_party/github.com/hashicorp/go-multierror/append_test.go
View file
Open in desktop

This file was deleted.

Loading