Skip to content

Commit 4b90e0b

Browse files
CLOUD-322276: Revert upcoming changes (#745)
1 parent 1423cbc commit 4b90e0b

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

.github/scripts/split_spec.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -eou pipefail
33

44
echo "Running FOAS CLI versions command"
5-
foascli versions -s openapi-foas.json -o ./openapi/v2/versions.json --env "${target_env:?}" --stability-level stable --stability-level preview --stability-level upcoming
5+
foascli versions -s openapi-foas.json -o ./openapi/v2/versions.json --env "${target_env:?}" --stability-level stable --stability-level preview
66

77
echo "Running FOAS CLI split command with the following --env=${target_env:?} and -o=./openapi/v2/openapi.json"
88

tools/cli/internal/cli/changelog/metadata/create.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package metadata
1717
import (
1818
"encoding/json"
1919
"fmt"
20-
"strings"
2120
"time"
2221

2322
"github.com/mongodb/openapi/tools/cli/internal/changelog"
@@ -72,9 +71,6 @@ func (o *Opts) PreRun() error {
7271
}
7372

7473
for _, version := range o.versions {
75-
if strings.Contains(version, ".upcoming") {
76-
continue
77-
}
7874
if _, err := time.Parse("2006-01-02", version); err != nil {
7975
return fmt.Errorf("invalid version date: %w. Make sure to use the format YYYY-MM-DD", err)
8076
}

tools/cli/internal/cli/changelog/metadata/create_test.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ func TestCreateBuild_Run(t *testing.T) {
2828
opts := &Opts{
2929
specRevision: "11110c256dffdb163be71a3ca70854a57fad5f6f",
3030
runDate: "2024-01-01",
31-
versions: []string{"2024-01-01", "2024-01-01.upcoming"},
31+
versions: []string{"2024-01-01"},
3232
fs: fs,
3333
}
34+
3435
require.NoError(t, opts.Run())
3536
}
3637

@@ -46,18 +47,6 @@ func TestCreateBuild_PreRun_InvalidVersion(t *testing.T) {
4647
require.ErrorContains(t, opts.PreRun(), "invalid version date")
4748
}
4849

49-
func TestCreateBuild_PreRun_upcomingAPI(t *testing.T) {
50-
fs := afero.NewMemMapFs()
51-
opts := &Opts{
52-
specRevision: "test",
53-
runDate: "2024-01-01",
54-
versions: []string{"2024-01-01", "2024-01-01.upcoming"},
55-
fs: fs,
56-
}
57-
58-
require.NoError(t, opts.PreRun())
59-
}
60-
6150
func TestCreateBuilder(t *testing.T) {
6251
test.CmdValidator(
6352
t,

0 commit comments

Comments
 (0)