Skip to content

Commit 08fa3bc

Browse files
committed
Update
1 parent 808949f commit 08fa3bc

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

tools/cli/internal/apiversion/stabilitylevel.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ const (
2323
StableStabilityLevel = "stable"
2424
PreviewStabilityLevel = "preview"
2525
PrivatePreviewStabilityLevel = "private-preview"
26+
PublicPreviewSabilityLevel = "public-preview"
2627
)
2728

28-
var supportedValues = []string{StableStabilityLevel, PreviewStabilityLevel, PrivatePreviewStabilityLevel}
29+
var supportedValues = []string{StableStabilityLevel, PublicPreviewSabilityLevel, PrivatePreviewStabilityLevel}
2930

3031
// IsPreviewSabilityLevel checks if the version is a preview version, public or private.
3132
func IsPreviewSabilityLevel(value string) bool {
@@ -35,12 +36,12 @@ func IsPreviewSabilityLevel(value string) bool {
3536

3637
// IsPrivatePreviewSabilityLevel checks if the version is a private preview version.
3738
func IsPrivatePreviewSabilityLevel(value string) bool {
38-
return strings.Contains(value, PrivatePreviewStabilityLevel)
39+
return strings.Contains(strings.ToLower(value), PrivatePreviewStabilityLevel)
3940
}
4041

4142
// IsPublicPreviewSabilityLevel checks if the version is a public preview version.
4243
func IsPublicPreviewSabilityLevel(value string) bool {
43-
return strings.EqualFold(value, PreviewStabilityLevel)
44+
return strings.EqualFold(value, PublicPreviewSabilityLevel) || strings.EqualFold(value, PreviewStabilityLevel)
4445
}
4546

4647
// IsStableSabilityLevel checks if the version is a stable version.

tools/cli/internal/cli/versions/versions.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (o *Opts) Run() error {
7070
}
7171

7272
func (o *Opts) filterStabilityLevelVersions(apiVersions []string) []string {
73-
if o.stabilityLevel == nil || len(o.stabilityLevel) == 0 || apiVersions == nil {
73+
if len(o.stabilityLevel) == 0 || apiVersions == nil {
7474
return apiVersions
7575
}
7676

@@ -91,6 +91,9 @@ func (o *Opts) filterStabilityLevelVersions(apiVersions []string) []string {
9191
}
9292
}
9393

94+
if len(out) == 0 {
95+
return []string{}
96+
}
9497
return out
9598
}
9699

@@ -163,7 +166,7 @@ func Builder() *cobra.Command {
163166

164167
cmd.Flags().StringVarP(&opts.basePath, flag.Spec, flag.SpecShort, "", usage.Spec)
165168
cmd.Flags().StringVar(&opts.env, flag.Environment, "", usage.Environment)
166-
cmd.Flags().StringArrayP(flag.StabilityLevel, flag.StabilityLevelShort, opts.stabilityLevel, usage.StabilityLevel)
169+
cmd.Flags().StringArrayVar(&opts.stabilityLevel, flag.StabilityLevel, nil, usage.StabilityLevel)
167170
cmd.Flags().StringVarP(&opts.outputPath, flag.Output, flag.OutputShort, "", usage.Output)
168171
cmd.Flags().StringVarP(&opts.format, flag.Format, flag.FormatShort, "json", usage.Format)
169172
return cmd

tools/cli/internal/cli/versions/versions_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestVersion_RunStabilityLevelPreviewAndPrivatePreview(t *testing.T) {
8282
outputPath: "foas.json",
8383
fs: fs,
8484
env: "staging",
85-
stabilityLevel: []string{"PREVIEW"},
85+
stabilityLevel: []string{"private-preview"},
8686
}
8787

8888
require.NoError(t, opts.Run())
@@ -102,7 +102,7 @@ func TestVersion_PreviewAndPublicPreview(t *testing.T) {
102102
outputPath: "foas.json",
103103
fs: fs,
104104
env: "staging",
105-
stabilityLevel: []string{"private-preview", "public-preview"},
105+
stabilityLevel: []string{"public-preview"},
106106
}
107107

108108
require.NoError(t, opts.Run())

0 commit comments

Comments
 (0)