use go/format

Author: andreaangiolillo

tools/cli/internal/openapi/filter/code_sample.go

@@ -16,6 +16,8 @@ package filter
 
 import (
 	"bytes"
+	"fmt"
+	goFormat "go/format"
 	"strings"
 	"text/template"
 	"time"
@@ -44,11 +46,10 @@ func main() {
     sdk.UseDebug(true))
 
   params = &sdk.{{ .OperationID }}ApiParams{}
-{{ if eq .Method "DELETE" }}  httpResp, err := sdk.{{ .Tag }}Api
-    .{{ .OperationID }}WithParams(ctx, params)
-    .Execute(){{ else }}  sdkResp, httpResp, err := sdk.{{ .Tag }}Api
-    .{{ .OperationID }}WithParams(ctx, params)
-    .Execute(){{ end}}
+{{ if eq .Method "DELETE" }}  httpResp, err := sdk.{{ .Tag }}Api.
+    {{ .OperationID }}WithParams(ctx, params).
+    Execute(){{ else }}  sdkResp, httpResp, err := sdk.{{ .Tag }}Api.
+    Execute(){{ end}}
 }`
 
 const codeSampleExtensionName = "x-codeSamples"
@@ -155,6 +156,7 @@ func (f *CodeSampleFilter) newGoSdkCodeSamplesForOperation(op *openapi3.Operatio
 	version := strings.ReplaceAll(apiVersion(f.metadata.targetVersion), "-", "") + "001"
 	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)
 	if err != nil {
@@ -178,10 +180,16 @@ func (f *CodeSampleFilter) newGoSdkCodeSamplesForOperation(op *openapi3.Operatio
 		return codeSample{}, err
 	}
 
+	formattedResult, err := goFormat.Source(buffer.Bytes())
+	if err != nil {
+		return codeSample{}, fmt.Errorf("tag: %s, operationId: %s code: %s: error: %w",
+			op.Tags[0], operationID, buffer.String(), err)
+	}
+
 	return codeSample{
 		Lang:   "go",
 		Label:  "Go",
-		Source: buffer.String(),
+		Source: string(formattedResult),
 	}, nil
 }
 

tools/cli/internal/openapi/filter/code_sample_test.go

@@ -87,21 +87,21 @@ func TestCodeSampleFilter(t *testing.T) {
 									Lang:  "go",
 									Label: "Go",
 									Source: "import (\n" +
-										"  \"os\"\n  \"context\"\n" +
-										"  sdk \"go.mongodb.org/atlas-sdk/v20250101001/admin\"\n)\n\n" +
+										"\t\"os\"\n	\"context\"\n" +
+										"\tsdk \"go.mongodb.org/atlas-sdk/v20250101001/admin\"\n)\n\n" +
 										"func main() {\n" +
-										"  ctx := context.Background()\n" +
-										"  apiKey := os.Getenv(\"MONGODB_ATLAS_PUBLIC_KEY\")\n" +
-										"  apiSecret := os.Getenv(\"MONGODB_ATLAS_PRIVATE_KEY\")\n" +
-										"  url := os.Getenv(\"MONGODB_ATLAS_BASE_URL\")\n\n" +
-										"  client, err := sdk.NewClient(\n" +
-										"    sdk.UseDigestAuth(apiKey, apiSecret),\n" +
-										"    sdk.UseBaseURL(url),\n" +
-										"    sdk.UseDebug(true))\n\n" +
-										"  params = &sdk.TestOperationIDApiParams{}\n" +
-										"  sdkResp, httpResp, err := sdk.TestTagApi\n" +
-										"    .TestOperationIDWithParams(ctx, params)\n" +
-										"    .Execute()" + "\n}",
+										"\tctx := context.Background()\n" +
+										"\tapiKey := os.Getenv(\"MONGODB_ATLAS_PUBLIC_KEY\")\n" +
+										"\tapiSecret := os.Getenv(\"MONGODB_ATLAS_PRIVATE_KEY\")\n" +
+										"\turl := os.Getenv(\"MONGODB_ATLAS_BASE_URL\")\n\n" +
+										"\tclient, err := sdk.NewClient(\n" +
+										"\t\tsdk.UseDigestAuth(apiKey, apiSecret),\n" +
+										"\t\tsdk.UseBaseURL(url),\n" +
+										"\t\tsdk.UseDebug(true))\n\n" +
+										"\tparams = &sdk.TestOperationIDApiParams{}\n" +
+										"\tsdkResp, httpResp, err := sdk.TestTagApi.\n" +
+										"\t\tTestOperationIDWithParams(ctx, params).\n" +
+										"\t\tExecute()" + "\n}",
 								},
 								{
 									Lang:  "cURL",