From 9d6c7f7a22ee59a71d4e66ca66b4f8ea34ef462b Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Wed, 4 Jun 2025 17:54:33 +0200 Subject: [PATCH 1/5] fix: fix the changelog release --- tools/cli/internal/cli/changelog/metadata/create.go | 4 ++++ tools/cli/internal/cli/changelog/metadata/create_test.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/cli/internal/cli/changelog/metadata/create.go b/tools/cli/internal/cli/changelog/metadata/create.go index a7991d98a0..d87ac67b28 100644 --- a/tools/cli/internal/cli/changelog/metadata/create.go +++ b/tools/cli/internal/cli/changelog/metadata/create.go @@ -17,6 +17,7 @@ package metadata import ( "encoding/json" "fmt" + "strings" "time" "github.com/mongodb/openapi/tools/cli/internal/changelog" @@ -71,6 +72,9 @@ 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 15d2eeccdb..34361fd73e 100644 --- a/tools/cli/internal/cli/changelog/metadata/create_test.go +++ b/tools/cli/internal/cli/changelog/metadata/create_test.go @@ -28,7 +28,7 @@ func TestCreateBuild_Run(t *testing.T) { opts := &Opts{ specRevision: "11110c256dffdb163be71a3ca70854a57fad5f6f", runDate: "2024-01-01", - versions: []string{"2024-01-01"}, + versions: []string{"2024-01-01", "2024-01-01.upcoming"}, fs: fs, } From 5c622a1f7c9126437f8f7291d00871d0004a92b8 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Wed, 4 Jun 2025 17:57:05 +0200 Subject: [PATCH 2/5] Update create_test.go --- tools/cli/internal/cli/changelog/metadata/create_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cli/internal/cli/changelog/metadata/create_test.go b/tools/cli/internal/cli/changelog/metadata/create_test.go index 34361fd73e..f9cf11ec7d 100644 --- a/tools/cli/internal/cli/changelog/metadata/create_test.go +++ b/tools/cli/internal/cli/changelog/metadata/create_test.go @@ -31,7 +31,7 @@ func TestCreateBuild_Run(t *testing.T) { versions: []string{"2024-01-01", "2024-01-01.upcoming"}, fs: fs, } - + require.NoError(t, opts.PreRun()) require.NoError(t, opts.Run()) } From 78b5deef58fdc877e150a3ddc2c15a302b16b24a Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Wed, 4 Jun 2025 18:19:00 +0200 Subject: [PATCH 3/5] Addressed Gustavo's comments --- .../internal/cli/changelog/metadata/create_test.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/cli/internal/cli/changelog/metadata/create_test.go b/tools/cli/internal/cli/changelog/metadata/create_test.go index f9cf11ec7d..d8b7ddae34 100644 --- a/tools/cli/internal/cli/changelog/metadata/create_test.go +++ b/tools/cli/internal/cli/changelog/metadata/create_test.go @@ -31,7 +31,6 @@ func TestCreateBuild_Run(t *testing.T) { versions: []string{"2024-01-01", "2024-01-01.upcoming"}, fs: fs, } - require.NoError(t, opts.PreRun()) require.NoError(t, opts.Run()) } @@ -47,6 +46,18 @@ 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, From 723dfefc980d66ab8a9c13898aacf7b4d47535ed Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Wed, 4 Jun 2025 20:32:02 +0200 Subject: [PATCH 4/5] Revert "fix: fix the changelog release (#744)" This reverts commit 9aa974e0a63220fb178c7f45e0ab323401399752. --- .../cli/internal/cli/changelog/metadata/create.go | 4 ---- .../cli/changelog/metadata/create_test.go | 15 ++------------- 2 files changed, 2 insertions(+), 17 deletions(-) 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, From ac489e7ebe171172bb0821e8ad73f5edfa41fead Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Wed, 4 Jun 2025 20:32:51 +0200 Subject: [PATCH 5/5] Update split_spec.sh --- .github/scripts/split_spec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"