-
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.
Refactor version.ValidateEnabledAPIFields to config pkg
This commit refactors the ValidateEnabledAPIFields function to the config package. The validation previously lived in v1beta1 and it was moved to the version pkg which functions as API version conversion utils rather than for feature versions. This commit moves it to the config pkg since it is actually more tied with config validation of the feature flag. version.ValidateEnabledAPIFields has been deprecated and aliased to keep backwards compatibility. /kind misc
- Loading branch information
1 parent
d26a45c
commit 5d403c6
Showing
14 changed files
with
194 additions
and
65 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
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,116 @@ | ||
| /* | ||
| Copyright 2021 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 config_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/tektoncd/pipeline/pkg/apis/config" | ||
| ) | ||
|
|
||
| func TestValidateEnabledAPIFields(t *testing.T) { | ||
| tcs := []struct { | ||
| name string | ||
| wantVersion string | ||
| currentVersion string | ||
| }{{ | ||
| name: "alpha fields w/ alpha", | ||
| wantVersion: "alpha", | ||
| currentVersion: "alpha", | ||
| }, { | ||
| name: "beta fields w/ alpha", | ||
| wantVersion: "beta", | ||
| currentVersion: "alpha", | ||
| }, { | ||
| name: "beta fields w/ beta", | ||
| wantVersion: "beta", | ||
| currentVersion: "beta", | ||
| }, { | ||
| name: "stable fields w/ alpha", | ||
| wantVersion: "stable", | ||
| currentVersion: "alpha", | ||
| }, { | ||
| name: "stable fields w/ beta", | ||
| wantVersion: "stable", | ||
| currentVersion: "beta", | ||
| }, { | ||
| name: "stable fields w/ stable", | ||
| wantVersion: "stable", | ||
| currentVersion: "stable", | ||
| }} | ||
| for _, tc := range tcs { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| flags, err := config.NewFeatureFlagsFromMap(map[string]string{ | ||
| "enable-api-fields": tc.currentVersion, | ||
| }) | ||
| if err != nil { | ||
| t.Fatalf("error creating feature flags from map: %v", err) | ||
| } | ||
| cfg := &config.Config{ | ||
| FeatureFlags: flags, | ||
| } | ||
| ctx := config.ToContext(context.Background(), cfg) | ||
| if err := config.ValidateEnabledAPIFields(ctx, "test feature", tc.wantVersion); err != nil { | ||
| t.Errorf("unexpected error for compatible feature gates: %q", err) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestValidateEnabledAPIFieldsError(t *testing.T) { | ||
| tcs := []struct { | ||
| name string | ||
| wantVersion string | ||
| currentVersion string | ||
| }{{ | ||
| name: "alpha fields w/ stable", | ||
| wantVersion: "alpha", | ||
| currentVersion: "stable", | ||
| }, { | ||
| name: "alpha fields w/ beta", | ||
| wantVersion: "alpha", | ||
| currentVersion: "beta", | ||
| }, { | ||
| name: "beta fields w/ stable", | ||
| wantVersion: "beta", | ||
| currentVersion: "stable", | ||
| }, { | ||
| name: "invalid wantVersion", | ||
| wantVersion: "foo", | ||
| currentVersion: "stable", | ||
| }} | ||
| for _, tc := range tcs { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| flags, err := config.NewFeatureFlagsFromMap(map[string]string{ | ||
| "enable-api-fields": tc.currentVersion, | ||
| }) | ||
| if err != nil { | ||
| t.Fatalf("error creating feature flags from map: %v", err) | ||
| } | ||
| cfg := &config.Config{ | ||
| FeatureFlags: flags, | ||
| } | ||
| ctx := config.ToContext(context.Background(), cfg) | ||
| fieldErr := config.ValidateEnabledAPIFields(ctx, "test feature", tc.wantVersion) | ||
|
|
||
| if fieldErr == nil { | ||
| t.Errorf("error expected for incompatible feature gates") | ||
| } | ||
| }) | ||
| } | ||
| } |
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
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
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.