Skip to content

Commit 854f21d

Browse files
committed
Address comments
1 parent a5567c9 commit 854f21d

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

tools/cli/internal/apiversion/stabilitylevel.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const (
2828

2929
var supportedValues = []string{StableStabilityLevel, PublicPreviewSabilityLevel, PrivatePreviewStabilityLevel}
3030

31-
// IsPreviewSabilityLevel checks if the version is a preview version, public or private.
32-
func IsPreviewSabilityLevel(value string) bool {
31+
// IsPreviewStabilityLevel checks if the version is a preview version, public or private.
32+
func IsPreviewStabilityLevel(value string) bool {
3333
return IsPrivatePreviewSabilityLevel(value) || IsPublicPreviewSabilityLevel(value)
3434
}
3535

@@ -51,7 +51,7 @@ func IsStableSabilityLevel(value string) bool {
5151
// IsValidStabilityLevel checks if the version is a valid stability level.
5252
// ValidateStabilityLevel checks if the version is a valid stability level.
5353
func ValidateStabilityLevel(value string) error {
54-
if IsStableSabilityLevel(value) || IsPreviewSabilityLevel(value) {
54+
if IsStableSabilityLevel(value) || IsPreviewStabilityLevel(value) {
5555
return nil
5656
}
5757

tools/cli/internal/apiversion/stabilitylevel_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import (
77
"github.com/stretchr/testify/require"
88
)
99

10-
func TestIsPreviewSabilityLevel(t *testing.T) {
11-
assert.True(t, IsPreviewSabilityLevel("preview"))
12-
assert.True(t, IsPreviewSabilityLevel("PREVIEW"))
13-
assert.True(t, IsPreviewSabilityLevel("prEvIEW"))
14-
assert.True(t, IsPreviewSabilityLevel("private-preview"))
15-
assert.True(t, IsPreviewSabilityLevel("public-preview"))
16-
assert.False(t, IsPreviewSabilityLevel("stable"))
17-
assert.False(t, IsPreviewSabilityLevel("invalid"))
10+
func TestIsPreviewStabilityLevel(t *testing.T) {
11+
assert.True(t, IsPreviewStabilityLevel("preview"))
12+
assert.True(t, IsPreviewStabilityLevel("PREVIEW"))
13+
assert.True(t, IsPreviewStabilityLevel("prEvIEW"))
14+
assert.True(t, IsPreviewStabilityLevel("private-preview"))
15+
assert.True(t, IsPreviewStabilityLevel("public-preview"))
16+
assert.False(t, IsPreviewStabilityLevel("stable"))
17+
assert.False(t, IsPreviewStabilityLevel("invalid"))
1818
}
1919

2020
func TestIsPrivatePreviewSabilityLevel(t *testing.T) {

tools/cli/internal/apiversion/version.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (v *APIVersion) newVersion(version string, date time.Time) {
5656
v.stabilityVersion = StableStabilityLevel
5757
v.versionDate = date
5858

59-
if IsPreviewSabilityLevel(version) {
59+
if IsPreviewStabilityLevel(version) {
6060
v.versionDate = time.Now().AddDate(10, 0, 0) // set preview date to the future
6161
v.stabilityVersion = PreviewStabilityLevel
6262
}
@@ -118,7 +118,7 @@ func WithFullContent(contentType string, contentValue *openapi3.MediaType) Optio
118118
}
119119

120120
func DateFromVersion(version string) (time.Time, error) {
121-
if IsPreviewSabilityLevel(version) {
121+
if IsPreviewStabilityLevel(version) {
122122
return time.Now(), nil
123123
}
124124
return time.Parse(dateFormat, version)
@@ -161,7 +161,7 @@ func (v *APIVersion) ExactMatchOnly() bool {
161161
}
162162

163163
func (v *APIVersion) IsPreview() bool {
164-
return IsPreviewSabilityLevel(v.version)
164+
return IsPreviewStabilityLevel(v.version)
165165
}
166166

167167
func (v *APIVersion) IsPrivatePreview() bool {

tools/cli/internal/changelog/changelog.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func NewEntries(basePath, revisionPath, exceptionFilePath string) ([]*Entry, err
175175

176176
for _, version := range changelog.RevisionMetadata.Versions {
177177
// Skip preview versions
178-
if apiversion.IsPreviewSabilityLevel(version) {
178+
if apiversion.IsPreviewStabilityLevel(version) {
179179
continue
180180
}
181181

@@ -220,7 +220,7 @@ func NewEntriesBetweenRevisionVersions(revisionPath, exceptionFilePath string) (
220220
for idx, fromVersion := range revisionMetadata.Versions {
221221
for _, toVersion := range revisionMetadata.Versions[idx+1:] {
222222
// skip preview versions
223-
if apiversion.IsPreviewSabilityLevel(fromVersion) || apiversion.IsPreviewSabilityLevel(toVersion) {
223+
if apiversion.IsPreviewStabilityLevel(fromVersion) || apiversion.IsPreviewStabilityLevel(toVersion) {
224224
continue
225225
}
226226
entry, err := newEntriesBetweenVersion(revisionMetadata, fromVersion, toVersion, exceptionFilePath)
@@ -430,7 +430,7 @@ func latestVersionActiveOnDate(date string, versions []string) (string, error) {
430430

431431
activeVersions := []time.Time{}
432432
for _, version := range versions {
433-
if apiversion.IsPreviewSabilityLevel(version) {
433+
if apiversion.IsPreviewStabilityLevel(version) {
434434
continue
435435
}
436436
versionTime, err := newDateFromString(version)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (o *Opts) filterStabilityLevelVersions(apiVersions []string) []string {
7777
var out []string
7878
for _, v := range apiVersions {
7979
for _, stabilityLevel := range o.stabilityLevel {
80-
if (apiversion.IsStableSabilityLevel(stabilityLevel)) && !apiversion.IsPreviewSabilityLevel(v) {
80+
if (apiversion.IsStableSabilityLevel(stabilityLevel)) && !apiversion.IsPreviewStabilityLevel(v) {
8181
out = append(out, v)
8282
}
8383

tools/cli/internal/openapi/versions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func extractVersions(oas *openapi3.T) ([]string, error) {
6060
continue
6161
}
6262

63-
if apiversion.IsPreviewSabilityLevel(version) {
63+
if apiversion.IsPreviewStabilityLevel(version) {
6464
// parse if it is public or not
6565
version, err = apiversion.GetPreviewVersionName(contentTypeValue)
6666
if err != nil {

0 commit comments

Comments
 (0)