kind/misc: introduce feature flag to guard artifacts feature

tektoncd · Feb 29, 2024 · 5b38046 · 5b38046
1 parent a9d8a9b
commit 5b38046
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 1 deletion.
diff --git a/config/config-feature-flags.yaml b/config/config-feature-flags.yaml
@@ -126,5 +126,8 @@ data:
   # Setting this flag to "true" will enable the use of StepActions in Steps
   # This feature is in preview mode and not implemented yet. Please check #7259 for updates.
   enable-step-actions: "false"
+  # Setting this flag to "true" will enable the use of Artifacts in Steps
+  # This feature is in preview mode and not implemented yet. Please check #7693 for updates.
+  enable-artifacts: "false"
   # Setting this flag to "true" will enable the built-in param input validation via param enum.
   enable-param-enum: "false"
diff --git a/pkg/apis/config/feature_flags.go b/pkg/apis/config/feature_flags.go
@@ -100,7 +100,11 @@ const (
 	EnableCELInWhenExpression = "enable-cel-in-whenexpression"
 	// EnableStepActions is the flag to enable the use of StepActions in Steps
 	EnableStepActions = "enable-step-actions"
-	// DefaultEnableStepActions is the default value for EnableStepActions
+
+	// EnableArtifacts is the flag to enable the use of Artifacts in Steps
+	EnableArtifacts = "enable-artifacts"
+	// DefaultEnableArtifacts is the default value for EnableStepActions
+	DefaultEnableArtifacts = false
 	// EnableParamEnum is the flag to enabled enum in params
 	EnableParamEnum = "enable-param-enum"
 
@@ -183,6 +187,7 @@ type FeatureFlags struct {
 	EnableCELInWhenExpression bool
 	EnableStepActions         bool
 	EnableParamEnum           bool
+	EnableArtifacts           bool
 }
 
 // GetFeatureFlagsConfigName returns the name of the configmap containing all
@@ -277,6 +282,10 @@ func NewFeatureFlagsFromMap(cfgMap map[string]string) (*FeatureFlags, error) {
 	if err := setPerFeatureFlag(EnableParamEnum, DefaultEnableParamEnum, &tc.EnableParamEnum); err != nil {
 		return nil, err
 	}
+
+	if err := setFeature(EnableStepActions, DefaultEnableArtifacts, &tc.EnableArtifacts); err != nil {
+		return nil, err
+	}
 	// Given that they are alpha features, Tekton Bundles and Custom Tasks should be switched on if
 	// enable-api-fields is "alpha". If enable-api-fields is not "alpha" then fall back to the value of
 	// each feature's individual flag.

diff --git a/pkg/apis/config/feature_flags_test.go b/pkg/apis/config/feature_flags_test.go
@@ -79,6 +79,7 @@ func TestNewFeatureFlagsFromConfigMap(t *testing.T) {
 				Coschedule:                       config.CoscheduleDisabled,
 				EnableCELInWhenExpression:        true,
 				EnableStepActions:                true,
+				EnableArtifacts:                  true,
 				EnableParamEnum:                  true,
 			},
 			fileName: "feature-flags-all-flags-set",
@@ -303,6 +304,9 @@ func TestNewFeatureFlagsConfigMapErrors(t *testing.T) {
 	}, {
 		fileName: "feature-flags-invalid-enable-param-enum",
 		want:     `failed parsing feature flags config "invalid": strconv.ParseBool: parsing "invalid": invalid syntax for feature enable-param-enum`,
+	}, {
+		fileName: "feature-flags-invalid-enable-artifacts",
+		want:     `failed parsing feature flags config "invalid": strconv.ParseBool: parsing "invalid": invalid syntax for feature enable-artifacts`,
 	}} {
 		t.Run(tc.fileName, func(t *testing.T) {
 			cm := test.ConfigMapFromTestFile(t, tc.fileName)

diff --git a/pkg/apis/config/testdata/feature-flags-all-flags-set.yaml b/pkg/apis/config/testdata/feature-flags-all-flags-set.yaml
@@ -35,3 +35,4 @@ data:
   enable-cel-in-whenexpression: "true"
   enable-step-actions: "true"
   enable-param-enum: "true"
+  enable-artifacts: "true"
diff --git a/pkg/apis/config/testdata/feature-flags-invalid-enable-artifacts.yaml b/pkg/apis/config/testdata/feature-flags-invalid-enable-artifacts.yaml
@@ -0,0 +1,21 @@
+# Copyright 2024 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
+#
+#     https://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.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: feature-flags
+  namespace: tekton-pipelines
+data:
+  enable-artifacts: "invalid"
diff --git a/test/e2e-tests-kind-prow-alpha.env b/test/e2e-tests-kind-prow-alpha.env
@@ -7,3 +7,4 @@ RESULTS_FROM=sidecar-logs
 ENABLE_STEP_ACTIONS=true
 ENABLE_CEL_IN_WHENEXPRESSION=true
 ENABLE_PARAM_ENUM=true
+ENABLE_ARTIFACTS=true
diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
@@ -31,6 +31,7 @@ RESULTS_FROM=${RESULTS_FROM:-termination-message}
 ENABLE_STEP_ACTIONS=${ENABLE_STEP_ACTIONS:="false"}
 ENABLE_CEL_IN_WHENEXPRESSION=${ENABLE_CEL_IN_WHENEXPRESSION:="false"}
 ENABLE_PARAM_ENUM=${ENABLE_PARAM_ENUM:="false"}
+ENABLE_ARTIFACTS=${ENABLE_ARTIFACTS:="false"}
 failed=0
 
 # Script entry point.
@@ -116,6 +117,18 @@ function set_enable_param_enum() {
   kubectl patch configmap feature-flags -n tekton-pipelines -p "$jsonpatch"
 }
 
+function set_enable_artifacts() {
+  local method="$1"
+  if [ "$method" != "false" ] && [ "$method" != "true" ]; then
+    printf "Invalid value for enable-artifacts %s\n" ${method}
+    exit 255
+  fi
+  printf "Setting enable-artifacts to %s\n", ${method}
+  jsonpatch=$(printf "{\"data\": {\"enable-artifacts\": \"%s\"}}" $1)
+  echo "feature-flags ConfigMap patch: ${jsonpatch}"
+  kubectl patch configmap feature-flags -n tekton-pipelines -p "$jsonpatch"
+}
+
 function run_e2e() {
   # Run the integration tests
   header "Running Go e2e tests"
@@ -142,6 +155,7 @@ set_result_extraction_method "$RESULTS_FROM"
 set_enable_step_actions "$ENABLE_STEP_ACTIONS"
 set_cel_in_whenexpression "$ENABLE_CEL_IN_WHENEXPRESSION"
 set_enable_param_enum "$ENABLE_PARAM_ENUM"
+set_enable_artifacts "$ENABLE_ARTIFACTS"
 run_e2e
 
 (( failed )) && fail_test

diff --git a/test/featureflags.go b/test/featureflags.go
@@ -117,6 +117,7 @@ func getFeatureFlagsBaseOnAPIFlag(t *testing.T) *config.FeatureFlags {
 		"enable-step-actions":          "true",
 		"enable-cel-in-whenexpression": "true",
 		"enable-param-enum":            "true",
+		"enable-artifacts":             "true",
 	})
 	if err != nil {
 		t.Fatalf("error creating alpha feature flags configmap: %v", err)