From f4a7cce97587507665cf8edfef341888ae5a34e5 Mon Sep 17 00:00:00 2001
From: Jerop <jerop@google.com>
Date: Fri, 7 May 2021 14:41:07 -0400
Subject: [PATCH] Remove deprecated PascalCase fields in WhenExpressions

This change removes the deprecated PascalCase fields in `WhenExpressions`

The fields in `WhenExpressions` were missing json annotations in
https://github.com/tektoncd/pipeline/pull/3135 so they were
PascalCase - released in v0.16

The json annotations were added and supported both PascalCase and
lowercase fields for backwards compatibility in
https://github.com/tektoncd/pipeline/pull/3291 and
https://github.com/tektoncd/pipeline/pull/3389 - released in v0.17

The PascalCase fields were deprecated in v0.17, with an earliest date of
removal of Jan 07 2021 - https://github.com/tektoncd/pipeline/blob/v0.23.0/docs/deprecations.md
---
 docs/deprecations.md                          |  1 -
 go.sum                                        |  2 -
 .../pipeline/v1beta1/openapi_generated.go     | 29 ----------
 pkg/apis/pipeline/v1beta1/swagger.json        | 16 -----
 pkg/apis/pipeline/v1beta1/when_types.go       | 58 +++----------------
 pkg/apis/pipeline/v1beta1/when_validation.go  | 23 ++------
 .../pipeline/v1beta1/when_validation_test.go  | 24 --------
 .../pipeline/v1beta1/zz_generated.deepcopy.go |  5 --
 8 files changed, 13 insertions(+), 145 deletions(-)

diff --git a/docs/deprecations.md b/docs/deprecations.md
index b33fb56c680..51ff5c902d4 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -23,6 +23,5 @@ being deprecated.
 | [The `TaskRun.Status.ResourceResults.ResourceRef` field is deprecated and will be removed.](https://github.com/tektoncd/pipeline/issues/2694) | [v0.14.0](https://github.com/tektoncd/pipeline/releases/tag/v0.14.0)         | Beta                                                                                                     | April 30 2021                       |
 | [The `PipelineRun.Spec.ServiceAccountNames` field is deprecated and will be removed.](https://github.com/tektoncd/pipeline/issues/2614)       | [v0.15.0](https://github.com/tektoncd/pipeline/releases/tag/v0.15.0)         | Beta                                                                                                     | May 15 2021                         |
 | [`Conditions` CRD is deprecated and will be removed. Use `WhenExpressions` instead.](https://github.com/tektoncd/community/blob/main/teps/0007-conditions-beta.md)       | [v0.16.0](https://github.com/tektoncd/pipeline/releases/tag/v0.16.0)         | Alpha                                                                                                     | Nov 02 2020                         |
-| [The PascalCase fields in WhenExpressions is deprecated and will be removed](https://github.com/tektoncd/pipeline/pull/3389)                  | [v0.17.2](https://github.com/tektoncd/pipeline/releases/tag/v0.17.2)         | Alpha                                                                                                    | Jan 07 2021                         |
 | [The `disable-home-env-overwrite` flag will be removed](https://github.com/tektoncd/pipeline/issues/2013)                                     | [v0.24.0](https://github.com/tektoncd/pipeline/releases/tag/v0.24.0)         | Beta                                                                                                     | February 10 2022                    |
 | [The `disable-working-dir-overwrite` flag will be removed](https://github.com/tektoncd/pipeline/issues/1836)                                  | [v0.24.0](https://github.com/tektoncd/pipeline/releases/tag/v0.24.0)         | Beta                                                                                                     | February 10 2022                    |
diff --git a/go.sum b/go.sum
index d4b664e820c..c3689892bb0 100644
--- a/go.sum
+++ b/go.sum
@@ -720,8 +720,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tektoncd/plumbing v0.0.0-20201021153918-6b7e894737b5 h1:Y2Gd3X79zqvCd6AdiWyi/pnSewSkLxKygpvXNFXwscg=
-github.com/tektoncd/plumbing v0.0.0-20201021153918-6b7e894737b5/go.mod h1:WTWwsg91xgm+jPOKoyKVK/yRYxnVDlUYeDlypB1lDdQ=
 github.com/tektoncd/plumbing v0.0.0-20210420200944-17170d5e7bc9 h1:ZLPo8/vilaxvpdvvdd9ZgIhhQJPkHyS5GeKK8UH4/Yo=
 github.com/tektoncd/plumbing v0.0.0-20210420200944-17170d5e7bc9/go.mod h1:WTWwsg91xgm+jPOKoyKVK/yRYxnVDlUYeDlypB1lDdQ=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
diff --git a/pkg/apis/pipeline/v1beta1/openapi_generated.go b/pkg/apis/pipeline/v1beta1/openapi_generated.go
index 134d8e3b6c2..8b47e4b412a 100644
--- a/pkg/apis/pipeline/v1beta1/openapi_generated.go
+++ b/pkg/apis/pipeline/v1beta1/openapi_generated.go
@@ -4178,13 +4178,6 @@ func schema_pkg_apis_pipeline_v1beta1_WhenExpression(ref common.ReferenceCallbac
 							Format:      "",
 						},
 					},
-					"Input": {
-						SchemaProps: spec.SchemaProps{
-							Description: "DeprecatedInput for backwards compatibility with <v0.17 it is the string for guard checking which can be a static input or an output from a parent Task",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
 					"operator": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Operator that represents an Input's relationship to the values",
@@ -4193,13 +4186,6 @@ func schema_pkg_apis_pipeline_v1beta1_WhenExpression(ref common.ReferenceCallbac
 							Format:      "",
 						},
 					},
-					"Operator": {
-						SchemaProps: spec.SchemaProps{
-							Description: "DeprecatedOperator for backwards compatibility with <v0.17 it represents a DeprecatedInput's relationship to the DeprecatedValues",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
 					"values": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Values is an array of strings, which is compared against the input, for guard checking It must be non-empty",
@@ -4215,21 +4201,6 @@ func schema_pkg_apis_pipeline_v1beta1_WhenExpression(ref common.ReferenceCallbac
 							},
 						},
 					},
-					"Values": {
-						SchemaProps: spec.SchemaProps{
-							Description: "DeprecatedValues for backwards compatibility with <v0.17 it represents a DeprecatedInput's relationship to the DeprecatedValues",
-							Type:        []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
-									},
-								},
-							},
-						},
-					},
 				},
 				Required: []string{"input", "operator", "values"},
 			},
diff --git a/pkg/apis/pipeline/v1beta1/swagger.json b/pkg/apis/pipeline/v1beta1/swagger.json
index ec20a201170..3eec4b4948b 100644
--- a/pkg/apis/pipeline/v1beta1/swagger.json
+++ b/pkg/apis/pipeline/v1beta1/swagger.json
@@ -2467,22 +2467,6 @@
         "values"
       ],
       "properties": {
-        "Input": {
-          "description": "DeprecatedInput for backwards compatibility with \u003cv0.17 it is the string for guard checking which can be a static input or an output from a parent Task",
-          "type": "string"
-        },
-        "Operator": {
-          "description": "DeprecatedOperator for backwards compatibility with \u003cv0.17 it represents a DeprecatedInput's relationship to the DeprecatedValues",
-          "type": "string"
-        },
-        "Values": {
-          "description": "DeprecatedValues for backwards compatibility with \u003cv0.17 it represents a DeprecatedInput's relationship to the DeprecatedValues",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "default": ""
-          }
-        },
         "input": {
           "description": "Input is the string for guard checking which can be a static input or an output from a parent Task",
           "type": "string",
diff --git a/pkg/apis/pipeline/v1beta1/when_types.go b/pkg/apis/pipeline/v1beta1/when_types.go
index 6100a1637ac..21661e3b82f 100644
--- a/pkg/apis/pipeline/v1beta1/when_types.go
+++ b/pkg/apis/pipeline/v1beta1/when_types.go
@@ -27,60 +27,18 @@ type WhenExpression struct {
 	// Input is the string for guard checking which can be a static input or an output from a parent Task
 	Input string `json:"input"`
 
-	// DeprecatedInput for backwards compatibility with <v0.17
-	// it is the string for guard checking which can be a static input or an output from a parent Task
-	// +optional
-	DeprecatedInput string `json:"Input,omitempty"`
-
 	// Operator that represents an Input's relationship to the values
 	Operator selection.Operator `json:"operator"`
 
-	// DeprecatedOperator for backwards compatibility with <v0.17
-	// it represents a DeprecatedInput's relationship to the DeprecatedValues
-	// +optional
-	DeprecatedOperator selection.Operator `json:"Operator,omitempty"`
-
 	// Values is an array of strings, which is compared against the input, for guard checking
 	// It must be non-empty
 	Values []string `json:"values"`
 
-	// DeprecatedValues for backwards compatibility with <v0.17
-	// it represents a DeprecatedInput's relationship to the DeprecatedValues
-	// +optional
-	DeprecatedValues []string `json:"Values,omitempty"`
-}
-
-// GetInput returns the input string for guard checking
-// based on DeprecatedInput (<v0.17) and Input
-func (we *WhenExpression) GetInput() string {
-	if we.Input == "" {
-		return we.DeprecatedInput
-	}
-	return we.Input
-}
-
-// GetOperator returns the relationship between input and values
-// based on DeprecatedOperator (<v0.17) and Operator
-func (we *WhenExpression) GetOperator() selection.Operator {
-	if we.Operator == "" {
-		return we.DeprecatedOperator
-	}
-	return we.Operator
-}
-
-// GetValues returns an array of strings which is compared against the input
-// based on DeprecatedValues (<v0.17) and Values
-func (we *WhenExpression) GetValues() []string {
-	if we.Values == nil {
-		return we.DeprecatedValues
-	}
-	return we.Values
 }
 
 func (we *WhenExpression) isInputInValues() bool {
-	values := we.GetValues()
-	for i := range values {
-		if values[i] == we.GetInput() {
+	for i := range we.Values {
+		if we.Values[i] == we.Input {
 			return true
 		}
 	}
@@ -88,7 +46,7 @@ func (we *WhenExpression) isInputInValues() bool {
 }
 
 func (we *WhenExpression) isTrue() bool {
-	if we.GetOperator() == selection.In {
+	if we.Operator == selection.In {
 		return we.isInputInValues()
 	}
 	// selection.NotIn
@@ -103,21 +61,21 @@ func (we *WhenExpression) hasVariable() bool {
 }
 
 func (we *WhenExpression) applyReplacements(replacements map[string]string) WhenExpression {
-	replacedInput := substitution.ApplyReplacements(we.GetInput(), replacements)
+	replacedInput := substitution.ApplyReplacements(we.Input, replacements)
 
 	var replacedValues []string
-	for _, val := range we.GetValues() {
+	for _, val := range we.Values {
 		replacedValues = append(replacedValues, substitution.ApplyReplacements(val, replacements))
 	}
 
-	return WhenExpression{Input: replacedInput, Operator: we.GetOperator(), Values: replacedValues}
+	return WhenExpression{Input: replacedInput, Operator: we.Operator, Values: replacedValues}
 }
 
 // GetVarSubstitutionExpressions extracts all the values between "$(" and ")" in a When Expression
 func (we *WhenExpression) GetVarSubstitutionExpressions() ([]string, bool) {
 	var allExpressions []string
-	allExpressions = append(allExpressions, validateString(we.GetInput())...)
-	for _, value := range we.GetValues() {
+	allExpressions = append(allExpressions, validateString(we.Input)...)
+	for _, value := range we.Values {
 		allExpressions = append(allExpressions, validateString(value)...)
 	}
 	return allExpressions, len(allExpressions) != 0
diff --git a/pkg/apis/pipeline/v1beta1/when_validation.go b/pkg/apis/pipeline/v1beta1/when_validation.go
index 5f39e87675a..e9803017503 100644
--- a/pkg/apis/pipeline/v1beta1/when_validation.go
+++ b/pkg/apis/pipeline/v1beta1/when_validation.go
@@ -48,26 +48,13 @@ func (we *WhenExpression) validateWhenExpressionFields() *apis.FieldError {
 	if equality.Semantic.DeepEqual(we, &WhenExpression{}) || we == nil {
 		return apis.ErrMissingField(apis.CurrentField)
 	}
-	if !sets.NewString(validWhenOperators...).Has(string(we.GetOperator())) {
-		message := fmt.Sprintf("operator %q is not recognized. valid operators: %s", we.GetOperator(), strings.Join(validWhenOperators, ","))
+	if !sets.NewString(validWhenOperators...).Has(string(we.Operator)) {
+		message := fmt.Sprintf("operator %q is not recognized. valid operators: %s", we.Operator, strings.Join(validWhenOperators, ","))
 		return apis.ErrInvalidValue(message, apis.CurrentField)
 	}
-	if len(we.GetValues()) == 0 {
+	if len(we.Values) == 0 {
 		return apis.ErrInvalidValue("expecting non-empty values field", apis.CurrentField)
 	}
-	return we.validateWhenExpressionsDuplicateFields()
-}
-
-func (we *WhenExpression) validateWhenExpressionsDuplicateFields() *apis.FieldError {
-	if we.Input != "" && we.DeprecatedInput != "" {
-		return apis.ErrMultipleOneOf("input", "Input")
-	}
-	if we.Operator != "" && we.DeprecatedOperator != "" {
-		return apis.ErrMultipleOneOf("operator", "Operator")
-	}
-	if we.Values != nil && we.DeprecatedValues != nil {
-		return apis.ErrMultipleOneOf("values", "Values")
-	}
 	return nil
 }
 
@@ -90,8 +77,8 @@ func (wes WhenExpressions) validateTaskResultsVariables() *apis.FieldError {
 
 func (wes WhenExpressions) validatePipelineParametersVariables(prefix string, paramNames sets.String, arrayParamNames sets.String) (errs *apis.FieldError) {
 	for idx, we := range wes {
-		errs = errs.Also(validateStringVariable(we.GetInput(), prefix, paramNames, arrayParamNames).ViaField("input").ViaFieldIndex("when", idx))
-		for _, val := range we.GetValues() {
+		errs = errs.Also(validateStringVariable(we.Input, prefix, paramNames, arrayParamNames).ViaField("input").ViaFieldIndex("when", idx))
+		for _, val := range we.Values {
 			errs = errs.Also(validateStringVariable(val, prefix, paramNames, arrayParamNames).ViaField("values").ViaFieldIndex("when", idx))
 		}
 	}
diff --git a/pkg/apis/pipeline/v1beta1/when_validation_test.go b/pkg/apis/pipeline/v1beta1/when_validation_test.go
index f5243beeac9..2b6f698bc1d 100644
--- a/pkg/apis/pipeline/v1beta1/when_validation_test.go
+++ b/pkg/apis/pipeline/v1beta1/when_validation_test.go
@@ -98,30 +98,6 @@ func TestWhenExpressions_Invalid(t *testing.T) {
 			Operator: selection.In,
 			Values:   []string{"bar"},
 		}},
-	}, {
-		name: "multiple inputs",
-		wes: []WhenExpression{{
-			Input:           "foo",
-			DeprecatedInput: "nay",
-			Operator:        selection.In,
-			Values:          []string{"bar"},
-		}},
-	}, {
-		name: "multiple operators",
-		wes: []WhenExpression{{
-			Input:              "foo",
-			Operator:           selection.In,
-			DeprecatedOperator: selection.NotIn,
-			Values:             []string{"bar"},
-		}},
-	}, {
-		name: "multiple values",
-		wes: []WhenExpression{{
-			Input:            "foo",
-			Operator:         selection.In,
-			Values:           []string{"bar"},
-			DeprecatedValues: []string{"bar"},
-		}},
 	}, {
 		name: "missing when expression",
 		wes:  []WhenExpression{{}},
diff --git a/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go b/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go
index e8ae972e0bd..3a7d13b84a2 100644
--- a/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go
+++ b/pkg/apis/pipeline/v1beta1/zz_generated.deepcopy.go
@@ -1821,11 +1821,6 @@ func (in *WhenExpression) DeepCopyInto(out *WhenExpression) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
-	if in.DeprecatedValues != nil {
-		in, out := &in.DeprecatedValues, &out.DeprecatedValues
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
 	return
 }