Revert "feat: update the merge logic to generate an OAS where the fields are the same order as Atlas OAS"

This reverts commit 2d47372.

Author: andreaangiolillo

tools/cli/internal/cli/merge/merge.go

@@ -15,6 +15,7 @@
 package merge
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -40,14 +41,13 @@ func (o *Opts) Run() error {
 		return err
 	}
 
-	federatedBytes, err := json.MarshalIndent(*federated, "", "    ")
+	federatedBytes, err := federated.Spec.MarshalJSON()
 	if err != nil {
 		return err
 	}
 
 	if o.outputPath == "" {
-		fmt.Println(string(federatedBytes))
-		return nil
+		return prettyPrintJSON(federatedBytes)
 	}
 
 	return o.saveFile(federatedBytes)
@@ -67,6 +67,15 @@ func (o *Opts) PreRunE(_ []string) error {
 	return err
 }
 
+func prettyPrintJSON(jsonBytes []byte) error {
+	var prettyJSON bytes.Buffer
+	if err := json.Indent(&prettyJSON, jsonBytes, "", "    "); err != nil {
+		return err
+	}
+	fmt.Println(prettyJSON.String())
+	return nil
+}
+
 func (o *Opts) saveFile(data []byte) error {
 	if err := afero.WriteFile(o.fs, o.outputPath, data, 0o600); err != nil {
 		return err

tools/cli/internal/cli/merge/merge_test.go

@@ -16,13 +16,14 @@ package merge
 
 import (
 	"fmt"
-	"github.com/getkin/kin-openapi/openapi3"
 	"testing"
 
+	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/mongodb/openapi/tools/cli/internal/cli/flag"
 	"github.com/mongodb/openapi/tools/cli/internal/openapi"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
+	"github.com/tufin/oasdiff/load"
 	"go.uber.org/mock/gomock"
 )
 
@@ -39,11 +40,10 @@ func TestSuccessfulMerge_Run(t *testing.T) {
 		fs:            fs,
 	}
 
-	response := &openapi.Spec{
-		OpenAPI: "v3.0.1",
-		Info:    &openapi3.Info{},
-		Servers: nil,
-		Tags:    openapi3.Tags{},
+	response := &load.SpecInfo{
+		Spec:    &openapi3.T{},
+		Url:     "test",
+		Version: "3.0.1",
 	}
 
 	mockMergerStore.

tools/cli/internal/openapi/mock_openapi.go

@@ -16,7 +16,6 @@ package openapi
 
 //go:generate mockgen -destination=../openapi/mock_openapi.go -package=openapi github.com/mongodb/openapi/tools/cli/internal/openapi Parser,Merger
 import (
-	"github.com/getkin/kin-openapi/openapi3"
 	"log"
 
 	"github.com/tufin/oasdiff/diff"
@@ -28,21 +27,10 @@ type Parser interface {
 }
 
 type Merger interface {
-	MergeOpenAPISpecs([]string) (*Spec, error)
+	MergeOpenAPISpecs([]string) (*load.SpecInfo, error)
 }
 
-type Spec struct {
-	OpenAPI      string                        `json:"openapi" yaml:"openapi"`
-	Info         *openapi3.Info                `json:"info" yaml:"info"`
-	Servers      openapi3.Servers              `json:"servers,omitempty" yaml:"servers,omitempty"`
-	Tags         openapi3.Tags                 `json:"tags,omitempty" yaml:"tags,omitempty"`
-	Paths        *openapi3.Paths               `json:"paths" yaml:"paths"`
-	Components   *openapi3.Components          `json:"components,omitempty" yaml:"components,omitempty"`
-	Security     openapi3.SecurityRequirements `json:"security,omitempty" yaml:"security,omitempty"`
-	ExternalDocs *openapi3.ExternalDocs        `json:"externalDocs,omitempty" yaml:"externalDocs,omitempty"`
-}
-
-func (o *OasDiff) MergeOpenAPISpecs(paths []string) (*Spec, error) {
+func (o *OasDiff) MergeOpenAPISpecs(paths []string) (*load.SpecInfo, error) {
 	for _, p := range paths {
 		spec, err := o.parser.CreateOpenAPISpecFromPath(p)
 		if err != nil {
@@ -63,7 +51,7 @@ func (o *OasDiff) MergeOpenAPISpecs(paths []string) (*Spec, error) {
 		}
 	}
 
-	return newSpec(o.base), nil
+	return o.base, nil
 }
 
 func NewOasDiff(base string) (*OasDiff, error) {
@@ -81,16 +69,3 @@ func NewOasDiff(base string) (*OasDiff, error) {
 		},
 	}, nil
 }
-
-func newSpec(specInfo *load.SpecInfo) *Spec {
-	return &Spec{
-		OpenAPI:      specInfo.Spec.OpenAPI,
-		Components:   specInfo.Spec.Components,
-		Info:         specInfo.Spec.Info,
-		Paths:        specInfo.Spec.Paths,
-		Security:     specInfo.Spec.Security,
-		Servers:      specInfo.Spec.Servers,
-		Tags:         specInfo.Spec.Tags,
-		ExternalDocs: specInfo.Spec.ExternalDocs,
-	}
-}