From 02f5a9cef021fad7f9156a30797a9a72c68e7472 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 13:10:51 +0200 Subject: [PATCH 1/9] fix wind test --- .../internal/openapi/filter/code_sample.go | 12 +++++--- .../template/go_sdk_code_sample.go.tmpl | 28 +++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl diff --git a/tools/cli/internal/openapi/filter/code_sample.go b/tools/cli/internal/openapi/filter/code_sample.go index b880121bd1..2bf8676fd8 100644 --- a/tools/cli/internal/openapi/filter/code_sample.go +++ b/tools/cli/internal/openapi/filter/code_sample.go @@ -16,6 +16,7 @@ package filter import ( "bytes" + "embed" _ "embed" "fmt" goFormat "go/format" @@ -29,8 +30,8 @@ import ( "golang.org/x/text/language" ) -//go:embed go_sdk_code_sample.go.tmpl -var goSDKTemplate string +//go:embed template/* +var templatesDir embed.FS const codeSampleExtensionName = "x-codeSamples" @@ -137,8 +138,11 @@ func (f *CodeSampleFilter) newGoSdkCodeSamplesForOperation(op *openapi3.Operatio operationID := cases.Title(language.English, cases.NoLower).String(op.OperationID) tag := strings.ReplaceAll(op.Tags[0], " ", "") tag = strings.ReplaceAll(tag, ".", "") - - t, err := template.New("goSDK").Parse(goSDKTemplate) + file, err := templatesDir.ReadFile("template/go_sdk_code_sample.go.tmpl") + if err != nil { + return nil, err + } + t, err := template.New("goSDK").Parse(string(file)) if err != nil { return nil, err } diff --git a/tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl b/tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl new file mode 100644 index 0000000000..eb0ba9cef3 --- /dev/null +++ b/tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl @@ -0,0 +1,28 @@ +import ( + "os" + "context" + "log" + sdk "go.mongodb.org/atlas-sdk/v{{ .Version }}/admin" +) + +func main() { + ctx := context.Background() + clientID := os.Getenv("MONGODB_ATLAS_CLIENT_ID") + clientSecret := os.Getenv("MONGODB_ATLAS_CLIENT_SECRET") + + // See https://dochub.mongodb.org/core/atlas-go-sdk-oauth + client, err := sdk.NewClient( + sdk.UseOAuthAuth(clientID, clientSecret), + sdk.UseBaseURL(url)) + + if err != nil { + log.Fatalf("Error: %v", err) + } + + params = &sdk.{{ .OperationID }}ApiParams{} +{{ if eq .Method "DELETE" }} httpResp, err := client.{{ .Tag }}Api. + {{ .OperationID }}WithParams(ctx, params). + Execute(){{ else }} sdkResp, httpResp, err := client.{{ .Tag }}Api. + {{ .OperationID }}WithParams(ctx, params). + Execute(){{ end}} +} From 8ad46f85d4ff470ccd8e0761ceb5a5aa99c46c71 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 13:11:54 +0200 Subject: [PATCH 2/9] Delete go_sdk_code_sample.go.tmpl --- .../openapi/filter/go_sdk_code_sample.go.tmpl | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 tools/cli/internal/openapi/filter/go_sdk_code_sample.go.tmpl diff --git a/tools/cli/internal/openapi/filter/go_sdk_code_sample.go.tmpl b/tools/cli/internal/openapi/filter/go_sdk_code_sample.go.tmpl deleted file mode 100644 index eb0ba9cef3..0000000000 --- a/tools/cli/internal/openapi/filter/go_sdk_code_sample.go.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -import ( - "os" - "context" - "log" - sdk "go.mongodb.org/atlas-sdk/v{{ .Version }}/admin" -) - -func main() { - ctx := context.Background() - clientID := os.Getenv("MONGODB_ATLAS_CLIENT_ID") - clientSecret := os.Getenv("MONGODB_ATLAS_CLIENT_SECRET") - - // See https://dochub.mongodb.org/core/atlas-go-sdk-oauth - client, err := sdk.NewClient( - sdk.UseOAuthAuth(clientID, clientSecret), - sdk.UseBaseURL(url)) - - if err != nil { - log.Fatalf("Error: %v", err) - } - - params = &sdk.{{ .OperationID }}ApiParams{} -{{ if eq .Method "DELETE" }} httpResp, err := client.{{ .Tag }}Api. - {{ .OperationID }}WithParams(ctx, params). - Execute(){{ else }} sdkResp, httpResp, err := client.{{ .Tag }}Api. - {{ .OperationID }}WithParams(ctx, params). - Execute(){{ end}} -} From a9e9831184aa7e5b5044b9471f39b105b40c25dd Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 13:22:34 +0200 Subject: [PATCH 3/9] fix format --- tools/cli/internal/openapi/filter/code_sample_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/cli/internal/openapi/filter/code_sample_test.go b/tools/cli/internal/openapi/filter/code_sample_test.go index 3f4e714c55..0033852671 100644 --- a/tools/cli/internal/openapi/filter/code_sample_test.go +++ b/tools/cli/internal/openapi/filter/code_sample_test.go @@ -275,7 +275,11 @@ func TestCodeSampleFilter(t *testing.T) { require.NoError(t, filter.Apply()) if !reflect.DeepEqual(tt.expectedOas, tt.oas) { - t.Errorf("expected %v, got %v", tt.expectedOas, oas) + expectedOas, err := tt.expectedOas.MarshalJSON() + require.NoError(t, err) + oasFromTest, err := tt.oas.MarshalJSON() + require.NoError(t, err) + t.Errorf("expected %v, got %v", string(expectedOas), string(oasFromTest)) } }) } From 6d802bdbe7b84fa5761a73f03051bfdcbbcdb13b Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 13:39:58 +0200 Subject: [PATCH 4/9] Update code_sample_test.go --- tools/cli/internal/openapi/filter/code_sample_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cli/internal/openapi/filter/code_sample_test.go b/tools/cli/internal/openapi/filter/code_sample_test.go index 0033852671..fac43acf83 100644 --- a/tools/cli/internal/openapi/filter/code_sample_test.go +++ b/tools/cli/internal/openapi/filter/code_sample_test.go @@ -279,7 +279,7 @@ func TestCodeSampleFilter(t *testing.T) { require.NoError(t, err) oasFromTest, err := tt.oas.MarshalJSON() require.NoError(t, err) - t.Errorf("expected %v, got %v", string(expectedOas), string(oasFromTest)) + t.Errorf("expected: %q,\ngot: %q", string(expectedOas), string(oasFromTest)) } }) } From 30a243c004f92c7920964ee87a9e09a0a34479b0 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 13:55:45 +0200 Subject: [PATCH 5/9] fix format --- tools/cli/internal/openapi/filter/code_sample.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/cli/internal/openapi/filter/code_sample.go b/tools/cli/internal/openapi/filter/code_sample.go index 2bf8676fd8..541525165d 100644 --- a/tools/cli/internal/openapi/filter/code_sample.go +++ b/tools/cli/internal/openapi/filter/code_sample.go @@ -16,7 +16,6 @@ package filter import ( "bytes" - "embed" _ "embed" "fmt" goFormat "go/format" @@ -30,8 +29,8 @@ import ( "golang.org/x/text/language" ) -//go:embed template/* -var templatesDir embed.FS +//go:embed template/go_sdk_code_sample.go.tmpl +var goSDKTemplate string const codeSampleExtensionName = "x-codeSamples" @@ -138,11 +137,7 @@ func (f *CodeSampleFilter) newGoSdkCodeSamplesForOperation(op *openapi3.Operatio operationID := cases.Title(language.English, cases.NoLower).String(op.OperationID) tag := strings.ReplaceAll(op.Tags[0], " ", "") tag = strings.ReplaceAll(tag, ".", "") - file, err := templatesDir.ReadFile("template/go_sdk_code_sample.go.tmpl") - if err != nil { - return nil, err - } - t, err := template.New("goSDK").Parse(string(file)) + t, err := template.New("goSDK").Parse(goSDKTemplate) if err != nil { return nil, err } From 9b4ac93dbe3acd061c780a5fc89da41a36e7fb86 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 14:18:40 +0200 Subject: [PATCH 6/9] Update code_sample.go --- tools/cli/internal/openapi/filter/code_sample.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cli/internal/openapi/filter/code_sample.go b/tools/cli/internal/openapi/filter/code_sample.go index 541525165d..44ab69d43f 100644 --- a/tools/cli/internal/openapi/filter/code_sample.go +++ b/tools/cli/internal/openapi/filter/code_sample.go @@ -29,7 +29,7 @@ import ( "golang.org/x/text/language" ) -//go:embed template/go_sdk_code_sample.go.tmpl +//go:embed template/go_sdk_code_sample.txt var goSDKTemplate string const codeSampleExtensionName = "x-codeSamples" From 5350f5f66d358355bea730131c5375a021cf1d04 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 14:19:19 +0200 Subject: [PATCH 7/9] fix --- .../{go_sdk_code_sample.go.tmpl => go_sdk_code_sample.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tools/cli/internal/openapi/filter/template/{go_sdk_code_sample.go.tmpl => go_sdk_code_sample.txt} (100%) diff --git a/tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl b/tools/cli/internal/openapi/filter/template/go_sdk_code_sample.txt similarity index 100% rename from tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl rename to tools/cli/internal/openapi/filter/template/go_sdk_code_sample.txt From 2ba2e9eddf3cc5c86c3c97718d857c64a4461da2 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 14:30:29 +0200 Subject: [PATCH 8/9] fix --- .gitattributes | 1 + tools/cli/internal/openapi/filter/code_sample.go | 2 +- .../{go_sdk_code_sample.txt => go_sdk_code_sample.go.tmpl} | 0 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .gitattributes rename tools/cli/internal/openapi/filter/template/{go_sdk_code_sample.txt => go_sdk_code_sample.go.tmpl} (100%) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..27196e961b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.tmpl text eol=lf diff --git a/tools/cli/internal/openapi/filter/code_sample.go b/tools/cli/internal/openapi/filter/code_sample.go index 44ab69d43f..541525165d 100644 --- a/tools/cli/internal/openapi/filter/code_sample.go +++ b/tools/cli/internal/openapi/filter/code_sample.go @@ -29,7 +29,7 @@ import ( "golang.org/x/text/language" ) -//go:embed template/go_sdk_code_sample.txt +//go:embed template/go_sdk_code_sample.go.tmpl var goSDKTemplate string const codeSampleExtensionName = "x-codeSamples" diff --git a/tools/cli/internal/openapi/filter/template/go_sdk_code_sample.txt b/tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl similarity index 100% rename from tools/cli/internal/openapi/filter/template/go_sdk_code_sample.txt rename to tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl From 1db085b08ddea1aa48dec6ceac2dd67b2e7fb2d1 Mon Sep 17 00:00:00 2001 From: andreaangiolillo Date: Tue, 17 Jun 2025 14:38:12 +0200 Subject: [PATCH 9/9] Update .gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 27196e961b..6313b56c57 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -*.tmpl text eol=lf +* text=auto eol=lf