diff --git a/.github/scripts/split_spec.sh b/.github/scripts/split_spec.sh index e541b20775..3f348be4b9 100755 --- a/.github/scripts/split_spec.sh +++ b/.github/scripts/split_spec.sh @@ -2,7 +2,7 @@ set -eou pipefail echo "Running FOAS CLI versions command" -foascli versions -s openapi-foas.json -o ./openapi/v2/versions.json --env "${target_env:?}" --stability-level stable --stability-level preview --stability-level upcoming +foascli versions -s openapi-foas.json -o ./openapi/v2/versions.json --env "${target_env:?}" --stability-level stable --stability-level preview echo "Running FOAS CLI split command with the following --env=${target_env:?} and -o=./openapi/v2/openapi.json" diff --git a/tools/cli/internal/cli/changelog/metadata/create.go b/tools/cli/internal/cli/changelog/metadata/create.go index d87ac67b28..a7991d98a0 100644 --- a/tools/cli/internal/cli/changelog/metadata/create.go +++ b/tools/cli/internal/cli/changelog/metadata/create.go @@ -17,7 +17,6 @@ package metadata import ( "encoding/json" "fmt" - "strings" "time" "github.com/mongodb/openapi/tools/cli/internal/changelog" @@ -72,9 +71,6 @@ func (o *Opts) PreRun() error { } for _, version := range o.versions { - if strings.Contains(version, ".upcoming") { - continue - } if _, err := time.Parse("2006-01-02", version); err != nil { return fmt.Errorf("invalid version date: %w. Make sure to use the format YYYY-MM-DD", err) } diff --git a/tools/cli/internal/cli/changelog/metadata/create_test.go b/tools/cli/internal/cli/changelog/metadata/create_test.go index d8b7ddae34..15d2eeccdb 100644 --- a/tools/cli/internal/cli/changelog/metadata/create_test.go +++ b/tools/cli/internal/cli/changelog/metadata/create_test.go @@ -28,9 +28,10 @@ func TestCreateBuild_Run(t *testing.T) { opts := &Opts{ specRevision: "11110c256dffdb163be71a3ca70854a57fad5f6f", runDate: "2024-01-01", - versions: []string{"2024-01-01", "2024-01-01.upcoming"}, + versions: []string{"2024-01-01"}, fs: fs, } + require.NoError(t, opts.Run()) } @@ -46,18 +47,6 @@ func TestCreateBuild_PreRun_InvalidVersion(t *testing.T) { require.ErrorContains(t, opts.PreRun(), "invalid version date") } -func TestCreateBuild_PreRun_upcomingAPI(t *testing.T) { - fs := afero.NewMemMapFs() - opts := &Opts{ - specRevision: "test", - runDate: "2024-01-01", - versions: []string{"2024-01-01", "2024-01-01.upcoming"}, - fs: fs, - } - - require.NoError(t, opts.PreRun()) -} - func TestCreateBuilder(t *testing.T) { test.CmdValidator( t,