diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..6313b56c57 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/tools/cli/internal/openapi/filter/code_sample.go b/tools/cli/internal/openapi/filter/code_sample.go index b880121bd1..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 go_sdk_code_sample.go.tmpl +//go:embed template/go_sdk_code_sample.go.tmpl var goSDKTemplate string const codeSampleExtensionName = "x-codeSamples" @@ -137,7 +137,6 @@ 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) if err != nil { return nil, err diff --git a/tools/cli/internal/openapi/filter/code_sample_test.go b/tools/cli/internal/openapi/filter/code_sample_test.go index 3f4e714c55..fac43acf83 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: %q,\ngot: %q", string(expectedOas), string(oasFromTest)) } }) } diff --git a/tools/cli/internal/openapi/filter/go_sdk_code_sample.go.tmpl b/tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl similarity index 100% rename from tools/cli/internal/openapi/filter/go_sdk_code_sample.go.tmpl rename to tools/cli/internal/openapi/filter/template/go_sdk_code_sample.go.tmpl