From d30ac24db9ecde4dbcb76d06bf688696a71011c4 Mon Sep 17 00:00:00 2001 From: quobix Date: Tue, 24 Oct 2023 10:24:19 -0400 Subject: [PATCH] All tests pass! logs of tests fixed and tuning API for high level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Document configuration has been simplified, no more need for AllowRemote stuff in the document configuration, it’s assumed by setting the baseURL or the basePath. Signed-off-by: quobix --- datamodel/document_config.go | 47 ++++- datamodel/document_config_test.go | 11 +- datamodel/high/v3/document_test.go | 22 +-- datamodel/high/v3/package_test.go | 2 +- datamodel/low/v3/create_document.go | 24 ++- datamodel/low/v3/create_document_test.go | 6 +- document.go | 70 ++++---- document_examples_test.go | 30 +++- document_test.go | 41 ++--- index/rolodex.go | 11 +- renderer/mock_generator_test.go | 5 +- renderer/schema_renderer_test.go | 5 +- what-changed/model/callback_test.go | 17 +- what-changed/model/components_test.go | 159 ++++++++--------- what-changed/model/contact_test.go | 37 ++-- what-changed/model/encoding_test.go | 17 +- what-changed/model/example_test.go | 33 ++-- what-changed/model/examples_test.go | 17 +- what-changed/model/external_docs_test.go | 29 ++-- what-changed/model/header_test.go | 29 ++-- what-changed/model/info_test.go | 41 ++--- what-changed/model/items_test.go | 17 +- what-changed/model/license_test.go | 29 ++-- what-changed/model/link_test.go | 33 ++-- what-changed/model/media_type_test.go | 33 ++-- what-changed/model/oauth_flows_test.go | 37 ++-- what-changed/model/operation_test.go | 161 +++++++++--------- what-changed/model/parameter_test.go | 105 ++++++------ what-changed/model/path_item_test.go | 65 +++---- what-changed/model/paths_test.go | 33 ++-- what-changed/model/request_body_test.go | 9 +- what-changed/model/response_test.go | 25 +-- what-changed/model/responses_test.go | 53 +++--- what-changed/model/schema_test.go | 8 +- what-changed/model/scopes_test.go | 17 +- .../model/security_requirement_test.go | 45 ++--- what-changed/model/security_scheme_test.go | 41 ++--- what-changed/model/server_test.go | 17 +- 38 files changed, 734 insertions(+), 647 deletions(-) diff --git a/datamodel/document_config.go b/datamodel/document_config.go index 205dd47..1a4af92 100644 --- a/datamodel/document_config.go +++ b/datamodel/document_config.go @@ -4,8 +4,10 @@ package datamodel import ( + "log/slog" "net/http" "net/url" + "os" ) // DocumentConfiguration is used to configure the document creation process. It was added in v0.6.0 to allow @@ -20,17 +22,38 @@ type DocumentConfiguration struct { // RemoteURLHandler is a function that will be used to retrieve remote documents. If not set, the default // remote document getter will be used. + // + // The remote handler is only used if the BaseURL is set. If the BaseURL is not set, then the remote handler + // will not be used, as there will be nothing to use it against. + // // Resolves [#132]: https://github.com/pb33f/libopenapi/issues/132 RemoteURLHandler func(url string) (*http.Response, error) + // FileFilter is a list of specific files to be included by the rolodex when looking up references. If this value + // is set, then only these specific files will be included. If this value is not set, then all files will be included. + FileFilter []string + // If resolving locally, the BasePath will be the root from which relative references will be resolved from. // It's usually the location of the root specification. + // + // Be warned, setting this value will instruct the rolodex to index EVERY yaml and JSON file it finds from the + // base path. The rolodex will recurse into every directory and pick up everything form this location down. + // + // To avoid sucking in all the files, set the FileFilter to a list of specific files to be included. BasePath string // set the Base Path for resolving relative references if the spec is exploded. // AllowFileReferences will allow the index to locate relative file references. This is disabled by default. + // + // Deprecated: This behavior is now driven by the inclusion of a BasePath. If a BasePath is set, then the + // rolodex will look for relative file references. If no BasePath is set, then the rolodex will not look for + // relative file references. This value has no effect as of version 0.13.0 and will be removed in a future release. AllowFileReferences bool // AllowRemoteReferences will allow the index to lookup remote references. This is disabled by default. + // + // Deprecated: This behavior is now driven by the inclusion of a BaseURL. If a BaseURL is set, then the + // rolodex will look for remote references. If no BaseURL is set, then the rolodex will not look for + // remote references. This value has no effect as of version 0.13.0 and will be removed in a future release. AllowRemoteReferences bool // AvoidIndexBuild will avoid building the index. This is disabled by default, only use if you are sure you don't need it. @@ -57,18 +80,26 @@ type DocumentConfiguration struct { // means circular references will be checked. This is useful for developers building out models that should be // indexed later on. SkipCircularReferenceCheck bool + + // Logger is a structured logger that will be used for logging errors and warnings. If not set, a default logger + // will be used, set to the Error level. + Logger *slog.Logger } +func NewDocumentConfiguration() *DocumentConfiguration { + return &DocumentConfiguration{ + Logger: slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{ + Level: slog.LevelError, + })), + } +} + +// Deprecated: use NewDocumentConfiguration instead. func NewOpenDocumentConfiguration() *DocumentConfiguration { - return &DocumentConfiguration{ - AllowFileReferences: true, - AllowRemoteReferences: true, - } + return NewDocumentConfiguration() } +// Deprecated: use NewDocumentConfiguration instead. func NewClosedDocumentConfiguration() *DocumentConfiguration { - return &DocumentConfiguration{ - AllowFileReferences: false, - AllowRemoteReferences: false, - } + return NewDocumentConfiguration() } diff --git a/datamodel/document_config_test.go b/datamodel/document_config_test.go index 8d18f38..334932c 100644 --- a/datamodel/document_config_test.go +++ b/datamodel/document_config_test.go @@ -9,13 +9,6 @@ import ( ) func TestNewClosedDocumentConfiguration(t *testing.T) { - cfg := NewClosedDocumentConfiguration() - assert.False(t, cfg.AllowRemoteReferences) - assert.False(t, cfg.AllowFileReferences) -} - -func TestNewOpenDocumentConfiguration(t *testing.T) { - cfg := NewOpenDocumentConfiguration() - assert.True(t, cfg.AllowRemoteReferences) - assert.True(t, cfg.AllowFileReferences) + cfg := NewDocumentConfiguration() + assert.NotNil(t, cfg) } diff --git a/datamodel/high/v3/document_test.go b/datamodel/high/v3/document_test.go index ebc9c61..c7c1ef4 100644 --- a/datamodel/high/v3/document_test.go +++ b/datamodel/high/v3/document_test.go @@ -389,7 +389,7 @@ func TestStripeAsDoc(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/stripe.yaml") info, _ := datamodel.ExtractSpecInfo(data) var err error - lowDoc, err = lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowDoc, err = lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) assert.Len(t, utils.UnwrapErrors(err), 3) d := NewDocument(lowDoc) assert.NotNil(t, d) @@ -399,7 +399,7 @@ func TestK8sAsDoc(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/k8s.json") info, _ := datamodel.ExtractSpecInfo(data) var err []error - lowSwag, err := lowv2.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowSwag, err := lowv2.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) d := v2.NewSwaggerDocument(lowSwag) assert.Len(t, err, 0) assert.NotNil(t, d) @@ -409,7 +409,7 @@ func TestAsanaAsDoc(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/asana.yaml") info, _ := datamodel.ExtractSpecInfo(data) var err error - lowDoc, err = lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowDoc, err = lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) if err != nil { panic("broken something") } @@ -528,7 +528,7 @@ func TestPetstoreAsDoc(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/petstorev3.json") info, _ := datamodel.ExtractSpecInfo(data) var err error - lowDoc, err = lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowDoc, err = lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) if err != nil { panic("broken something") } @@ -541,7 +541,7 @@ func TestCircularReferencesDoc(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/circular-tests.yaml") info, _ := datamodel.ExtractSpecInfo(data) - lDoc, err := lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lDoc, err := lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) assert.Len(t, utils.UnwrapErrors(err), 3) d := NewDocument(lDoc) assert.Len(t, d.Components.Schemas, 9) @@ -557,7 +557,7 @@ func TestDocument_MarshalYAML(t *testing.T) { r, _ := h.Render() info, _ := datamodel.ExtractSpecInfo(r) - lDoc, e := lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lDoc, e := lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) assert.Nil(t, e) highDoc := NewDocument(lDoc) @@ -568,7 +568,7 @@ func TestDocument_MarshalIndention(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/single-definition.yaml") info, _ := datamodel.ExtractSpecInfo(data) - lowDoc, _ = lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowDoc, _ = lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) highDoc := NewDocument(lowDoc) rendered := highDoc.RenderWithIndention(2) @@ -584,7 +584,7 @@ func TestDocument_MarshalIndention_Error(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/single-definition.yaml") info, _ := datamodel.ExtractSpecInfo(data) - lowDoc, _ = lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowDoc, _ = lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) highDoc := NewDocument(lowDoc) rendered := highDoc.RenderWithIndention(2) @@ -600,7 +600,7 @@ func TestDocument_MarshalJSON(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/petstorev3.json") info, _ := datamodel.ExtractSpecInfo(data) - lowDoc, _ = lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowDoc, _ = lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) highDoc := NewDocument(lowDoc) @@ -608,7 +608,7 @@ func TestDocument_MarshalJSON(t *testing.T) { // now read back in the JSON info, _ = datamodel.ExtractSpecInfo(rendered) - lowDoc, _ = lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowDoc, _ = lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) newDoc := NewDocument(lowDoc) assert.Equal(t, len(newDoc.Paths.PathItems), len(highDoc.Paths.PathItems)) @@ -624,7 +624,7 @@ func TestDocument_MarshalYAMLInline(t *testing.T) { r, _ := h.RenderInline() info, _ := datamodel.ExtractSpecInfo(r) - lDoc, e := lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lDoc, e := lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) assert.Nil(t, e) highDoc := NewDocument(lDoc) diff --git a/datamodel/high/v3/package_test.go b/datamodel/high/v3/package_test.go index a61ca33..f852133 100644 --- a/datamodel/high/v3/package_test.go +++ b/datamodel/high/v3/package_test.go @@ -23,7 +23,7 @@ func Example_createHighLevelOpenAPIDocument() { var err error // Create a new low-level Document, capture any errors thrown during creation. - lowDoc, err = lowv3.CreateDocumentFromConfig(info, datamodel.NewOpenDocumentConfiguration()) + lowDoc, err = lowv3.CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) // Get upset if any errors were thrown. for i := range utils.UnwrapErrors(err) { diff --git a/datamodel/low/v3/create_document.go b/datamodel/low/v3/create_document.go index d3901db..5266c35 100644 --- a/datamodel/low/v3/create_document.go +++ b/datamodel/low/v3/create_document.go @@ -19,11 +19,7 @@ import ( // Deprecated: Use CreateDocumentFromConfig instead. This function will be removed in a later version, it // defaults to allowing file and remote references, and does not support relative file references. func CreateDocument(info *datamodel.SpecInfo) (*Document, error) { - config := datamodel.DocumentConfiguration{ - AllowFileReferences: true, - AllowRemoteReferences: true, - } - return createDocument(info, &config) + return createDocument(info, datamodel.NewDocumentConfiguration()) } // CreateDocumentFromConfig Create a new document from the provided SpecInfo and DocumentConfiguration pointer. @@ -40,16 +36,15 @@ func createDocument(info *datamodel.SpecInfo, config *datamodel.DocumentConfigur version = low.NodeReference[string]{Value: versionNode.Value, KeyNode: labelNode, ValueNode: versionNode} doc := Document{Version: version} - // TODO: configure allowFileReferences and allowRemoteReferences stuff - // create an index config and shadow the document configuration. - idxConfig := index.CreateOpenAPIIndexConfig() + idxConfig := index.CreateClosedAPIIndexConfig() idxConfig.SpecInfo = info idxConfig.IgnoreArrayCircularReferences = config.IgnoreArrayCircularReferences idxConfig.IgnorePolymorphicCircularReferences = config.IgnorePolymorphicCircularReferences idxConfig.AvoidCircularReferenceCheck = true idxConfig.BaseURL = config.BaseURL idxConfig.BasePath = config.BasePath + idxConfig.Logger = config.Logger rolodex := index.NewRolodex(idxConfig) rolodex.SetRootNode(info.RootNode) doc.Rolodex = rolodex @@ -64,11 +59,19 @@ func createDocument(info *datamodel.SpecInfo, config *datamodel.DocumentConfigur } // create a local filesystem - fileFS, err := index.NewLocalFS(cwd, os.DirFS(cwd)) + localFSConf := index.LocalFSConfig{ + BaseDirectory: cwd, + DirFS: os.DirFS(cwd), + FileFilters: config.FileFilter, + } + fileFS, err := index.NewLocalFSWithConfig(&localFSConf) + if err != nil { return nil, err } + idxConfig.AllowFileLookup = true + // add the filesystem to the rolodex rolodex.AddLocalFS(cwd, fileFS) @@ -85,6 +88,9 @@ func createDocument(info *datamodel.SpecInfo, config *datamodel.DocumentConfigur if config.RemoteURLHandler != nil { remoteFS.RemoteHandlerFunc = config.RemoteURLHandler } + + idxConfig.AllowRemoteLookup = true + // add to the rolodex rolodex.AddRemoteFS(config.BaseURL.String(), remoteFS) } diff --git a/datamodel/low/v3/create_document_test.go b/datamodel/low/v3/create_document_test.go index a13c7b6..f64e2b2 100644 --- a/datamodel/low/v3/create_document_test.go +++ b/datamodel/low/v3/create_document_test.go @@ -30,7 +30,7 @@ func BenchmarkCreateDocument(b *testing.B) { data, _ := os.ReadFile("../../../test_specs/burgershop.openapi.yaml") info, _ := datamodel.ExtractSpecInfo(data) for i := 0; i < b.N; i++ { - doc, _ = CreateDocumentFromConfig(info, datamodel.NewClosedDocumentConfiguration()) + doc, _ = CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) } } @@ -38,7 +38,7 @@ func BenchmarkCreateDocument_Circular(b *testing.B) { data, _ := os.ReadFile("../../../test_specs/circular-tests.yaml") info, _ := datamodel.ExtractSpecInfo(data) for i := 0; i < b.N; i++ { - _, err := CreateDocumentFromConfig(info, datamodel.NewClosedDocumentConfiguration()) + _, err := CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) if err == nil { panic("this should error, it has circular references") } @@ -48,7 +48,7 @@ func BenchmarkCreateDocument_Circular(b *testing.B) { func TestCircularReferenceError(t *testing.T) { data, _ := os.ReadFile("../../../test_specs/circular-tests.yaml") info, _ := datamodel.ExtractSpecInfo(data) - circDoc, err := CreateDocumentFromConfig(info, datamodel.NewClosedDocumentConfiguration()) + circDoc, err := CreateDocumentFromConfig(info, datamodel.NewDocumentConfiguration()) assert.NotNil(t, circDoc) assert.Error(t, err) diff --git a/document.go b/document.go index 8ee30f3..4012e7c 100644 --- a/document.go +++ b/document.go @@ -210,12 +210,12 @@ func (d *document) RenderAndReload() ([]byte, Document, *DocumentModel[v3high.Do errs = append(errs, err) // build the model. - model, buildErrs := newDoc.BuildV3Model() + m, buildErrs := newDoc.BuildV3Model() if buildErrs != nil { - return newBytes, newDoc, model, errs + return newBytes, newDoc, m, errs } // this document is now dead, long live the new document! - return newBytes, newDoc, model, nil + return newBytes, newDoc, m, nil } func (d *document) Render() ([]byte, error) { @@ -246,15 +246,15 @@ func (d *document) BuildV2Model() (*DocumentModel[v2high.Swagger], []error) { if d.highSwaggerModel != nil { return d.highSwaggerModel, nil } - var errors []error + var errs []error if d.info == nil { - errors = append(errors, fmt.Errorf("unable to build swagger document, no specification has been loaded")) - return nil, errors + errs = append(errs, fmt.Errorf("unable to build swagger document, no specification has been loaded")) + return nil, errs } if d.info.SpecFormat != datamodel.OAS2 { - errors = append(errors, fmt.Errorf("unable to build swagger document, "+ + errs = append(errs, fmt.Errorf("unable to build swagger document, "+ "supplied spec is a different version (%v). Try 'BuildV3Model()'", d.info.SpecFormat)) - return nil, errors + return nil, errs } var lowDoc *v2low.Swagger @@ -265,16 +265,16 @@ func (d *document) BuildV2Model() (*DocumentModel[v2high.Swagger], []error) { } } - lowDoc, errors = v2low.CreateDocumentFromConfig(d.info, d.config) + lowDoc, errs = v2low.CreateDocumentFromConfig(d.info, d.config) + // Do not short-circuit on circular reference errors, so the client // has the option of ignoring them. - for _, err := range errors { - if refErr, ok := err.(*index.ResolvingError); ok { + for _, err := range errs { + var refErr *index.ResolvingError + if errors.As(err, &refErr) { if refErr.CircularReference == nil { - return nil, errors + return nil, errs } - } else { - return nil, errors } } highDoc := v2high.NewSwaggerDocument(lowDoc) @@ -282,7 +282,7 @@ func (d *document) BuildV2Model() (*DocumentModel[v2high.Swagger], []error) { Model: *highDoc, Index: lowDoc.Index, } - return d.highSwaggerModel, errors + return d.highSwaggerModel, errs } func (d *document) BuildV3Model() (*DocumentModel[v3high.Document], []error) { @@ -311,6 +311,11 @@ func (d *document) BuildV3Model() (*DocumentModel[v3high.Document], []error) { var docErr error lowDoc, docErr = v3low.CreateDocumentFromConfig(d.info, d.config) d.rolodex = lowDoc.Rolodex + + if docErr != nil { + errs = append(errs, utils.UnwrapErrors(docErr)...) + } + // Do not short-circuit on circular reference errors, so the client // has the option of ignoring them. for _, err := range utils.UnwrapErrors(docErr) { @@ -321,6 +326,7 @@ func (d *document) BuildV3Model() (*DocumentModel[v3high.Document], []error) { } } } + highDoc := v3high.NewDocument(lowDoc) d.highOpenAPI3Model = &DocumentModel[v3high.Document]{ @@ -337,35 +343,35 @@ func (d *document) BuildV3Model() (*DocumentModel[v3high.Document], []error) { // model.DocumentChanges. If there are any changes found however between either Document, then a pointer to // model.DocumentChanges is returned containing every single change, broken down, model by model. func CompareDocuments(original, updated Document) (*model.DocumentChanges, []error) { - var errors []error + var errs []error if original.GetSpecInfo().SpecType == utils.OpenApi3 && updated.GetSpecInfo().SpecType == utils.OpenApi3 { - v3ModelLeft, errs := original.BuildV3Model() - if len(errs) > 0 { - errors = errs + v3ModelLeft, oErrs := original.BuildV3Model() + if len(oErrs) > 0 { + errs = oErrs } - v3ModelRight, errs := updated.BuildV3Model() - if len(errs) > 0 { - errors = append(errors, errs...) + v3ModelRight, uErrs := updated.BuildV3Model() + if len(uErrs) > 0 { + errs = append(errs, uErrs...) } if v3ModelLeft != nil && v3ModelRight != nil { - return what_changed.CompareOpenAPIDocuments(v3ModelLeft.Model.GoLow(), v3ModelRight.Model.GoLow()), errors + return what_changed.CompareOpenAPIDocuments(v3ModelLeft.Model.GoLow(), v3ModelRight.Model.GoLow()), errs } else { - return nil, errors + return nil, errs } } if original.GetSpecInfo().SpecType == utils.OpenApi2 && updated.GetSpecInfo().SpecType == utils.OpenApi2 { - v2ModelLeft, errs := original.BuildV2Model() - if len(errs) > 0 { - errors = errs + v2ModelLeft, oErrs := original.BuildV2Model() + if len(oErrs) > 0 { + errs = oErrs } - v2ModelRight, errs := updated.BuildV2Model() - if len(errs) > 0 { - errors = append(errors, errs...) + v2ModelRight, uErrs := updated.BuildV2Model() + if len(uErrs) > 0 { + errs = append(errs, uErrs...) } if v2ModelLeft != nil && v2ModelRight != nil { - return what_changed.CompareSwaggerDocuments(v2ModelLeft.Model.GoLow(), v2ModelRight.Model.GoLow()), errors + return what_changed.CompareSwaggerDocuments(v2ModelLeft.Model.GoLow(), v2ModelRight.Model.GoLow()), errs } else { - return nil, errors + return nil, errs } } return nil, []error{fmt.Errorf("unable to compare documents, one or both documents are not of the same version")} diff --git a/document_examples_test.go b/document_examples_test.go index c6182bc..c6988e9 100644 --- a/document_examples_test.go +++ b/document_examples_test.go @@ -4,9 +4,11 @@ package libopenapi import ( + "bytes" "fmt" "github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/index" + "log/slog" "net/url" "os" "strings" @@ -64,13 +66,24 @@ func ExampleNewDocument_fromWithDocumentConfigurationFailure() { digitalOcean, _ := os.ReadFile("test_specs/digitalocean.yaml") // create a DocumentConfiguration that prevents loading file and remote references - config := datamodel.DocumentConfiguration{ - AllowFileReferences: false, - AllowRemoteReferences: false, - } + config := datamodel.NewDocumentConfiguration() + + // create a new structured logger to capture error logs that will be spewed out by the rolodex + // when it tries to load external references. We're going to create a byte buffer to capture the logs + // and then look at them after the document is built. + var logs []byte + buf := bytes.NewBuffer(logs) + logger := slog.New(slog.NewTextHandler(buf, &slog.HandlerOptions{ + Level: slog.LevelError, + })) + config.Logger = logger // set the config logger to our new logger. + + // Do not set any baseURL, as this will allow the rolodex to resolve relative references. + // without a baseURL (for remote references, or a basePath for local references) the rolodex + // will consider the reference to be local, and will not attempt to load it from the network. // create a new document from specification bytes - doc, err := NewDocumentWithConfiguration(digitalOcean, &config) + doc, err := NewDocumentWithConfiguration(digitalOcean, config) // if anything went wrong, an error is thrown if err != nil { @@ -80,11 +93,16 @@ func ExampleNewDocument_fromWithDocumentConfigurationFailure() { // only errors will be thrown, so just capture them and print the number of errors. _, errors := doc.BuildV3Model() + // there should be 475 errors logs + logItems := strings.Split(buf.String(), "\n") + fmt.Printf("There are %d errors logged\n", len(logItems)) + // if anything went wrong when building the v3 model, a slice of errors will be returned if len(errors) > 0 { fmt.Println("Error building Digital Ocean spec errors reported") } - // Output: Error building Digital Ocean spec errors reported + // Output: There are 475 errors logged + //Error building Digital Ocean spec errors reported } func ExampleNewDocument_fromWithDocumentConfigurationSuccess() { diff --git a/document_test.go b/document_test.go index e9999ef..1b76097 100644 --- a/document_test.go +++ b/document_test.go @@ -97,7 +97,7 @@ func TestLoadDocument_Simple_V3(t *testing.T) { assert.NotNil(t, v3Doc) } -func TestLoadDocument_Simple_V3_Error_BadSpec(t *testing.T) { +func TestLoadDocument_Simple_V3_Error_BadSpec_BuildModel(t *testing.T) { yml := `openapi: 3.0 paths: @@ -106,9 +106,10 @@ paths: doc, err := NewDocument([]byte(yml)) assert.NoError(t, err) - v3Doc, docErr := doc.BuildV3Model() - assert.Len(t, docErr, 2) - assert.Nil(t, v3Doc) + doc.BuildV3Model() + rolo := doc.GetRolodex() + assert.Len(t, rolo.GetCaughtErrors(), 1) + } func TestDocument_Serialize_Error(t *testing.T) { @@ -417,17 +418,15 @@ func TestDocument_AnyDocWithConfig(t *testing.T) { func TestDocument_BuildModelCircular(t *testing.T) { petstore, _ := os.ReadFile("test_specs/circular-tests.yaml") doc, _ := NewDocument(petstore) - m, e := doc.BuildV3Model() - assert.NotNil(t, m) - assert.Len(t, e, 3) + doc.BuildV3Model() + assert.Len(t, doc.GetRolodex().GetCaughtErrors(), 3) } func TestDocument_BuildModelBad(t *testing.T) { petstore, _ := os.ReadFile("test_specs/badref-burgershop.openapi.yaml") doc, _ := NewDocument(petstore) - m, e := doc.BuildV3Model() - assert.Nil(t, m) - assert.Len(t, e, 9) + doc.BuildV3Model() + assert.Len(t, doc.GetRolodex().GetCaughtErrors(), 6) } func TestDocument_Serialize_JSON_Modified(t *testing.T) { @@ -493,7 +492,7 @@ func TestDocument_BuildModel_CompareDocsV3_LeftError(t *testing.T) { originalDoc, _ := NewDocument(burgerShopOriginal) updatedDoc, _ := NewDocument(burgerShopUpdated) changes, errors := CompareDocuments(originalDoc, updatedDoc) - assert.Len(t, errors, 9) + assert.Len(t, errors, 6) assert.Nil(t, changes) } @@ -504,7 +503,7 @@ func TestDocument_BuildModel_CompareDocsV3_RightError(t *testing.T) { originalDoc, _ := NewDocument(burgerShopOriginal) updatedDoc, _ := NewDocument(burgerShopUpdated) changes, errors := CompareDocuments(updatedDoc, originalDoc) - assert.Len(t, errors, 9) + assert.Len(t, errors, 6) assert.Nil(t, changes) } @@ -635,7 +634,7 @@ paths: // parameters: // - $ref: "https://schemas.opengis.net/ogcapi/features/part2/1.0/openapi/ogcapi-features-2.yaml#/components/parameters/crs"` // -// config := datamodel.NewOpenDocumentConfiguration() +// config := datamodel.NewDocumentConfiguration() // // doc, err := NewDocumentWithConfiguration([]byte(spec), config) // if err != nil { @@ -698,7 +697,11 @@ paths: get: $ref: test-operation.yaml` - doc, err := NewDocumentWithConfiguration([]byte(d), datamodel.NewOpenDocumentConfiguration()) + cf := datamodel.NewDocumentConfiguration() + cf.BasePath = "." + cf.FileFilter = []string{"test-operation.yaml"} + + doc, err := NewDocumentWithConfiguration([]byte(d), cf) if err != nil { panic(err) } @@ -727,7 +730,7 @@ func TestDocument_InputAsJSON(t *testing.T) { } }` - doc, err := NewDocumentWithConfiguration([]byte(d), datamodel.NewOpenDocumentConfiguration()) + doc, err := NewDocumentWithConfiguration([]byte(d), datamodel.NewDocumentConfiguration()) if err != nil { panic(err) } @@ -753,7 +756,7 @@ func TestDocument_InputAsJSON_LargeIndent(t *testing.T) { } }` - doc, err := NewDocumentWithConfiguration([]byte(d), datamodel.NewOpenDocumentConfiguration()) + doc, err := NewDocumentWithConfiguration([]byte(d), datamodel.NewDocumentConfiguration()) if err != nil { panic(err) } @@ -777,7 +780,7 @@ paths: get: operationId: 'test'` - config := datamodel.NewOpenDocumentConfiguration() + config := datamodel.NewDocumentConfiguration() doc, err := NewDocumentWithConfiguration([]byte(spec), config) if err != nil { @@ -810,7 +813,7 @@ components: - "name" - "children"` - config := datamodel.NewClosedDocumentConfiguration() + config := datamodel.NewDocumentConfiguration() config.IgnorePolymorphicCircularReferences = true doc, err := NewDocumentWithConfiguration([]byte(d), config) @@ -845,7 +848,7 @@ components: - "name" - "children"` - config := datamodel.NewClosedDocumentConfiguration() + config := datamodel.NewDocumentConfiguration() config.IgnoreArrayCircularReferences = true doc, err := NewDocumentWithConfiguration([]byte(d), config) diff --git a/index/rolodex.go b/index/rolodex.go index 50f168d..88545a8 100644 --- a/index/rolodex.go +++ b/index/rolodex.go @@ -447,16 +447,19 @@ func (r *Rolodex) BuildIndexes() { } func (r *Rolodex) Open(location string) (RolodexFile, error) { + if r == nil { + return nil, fmt.Errorf("rolodex has not been initialized, cannot open file '%s'", location) + } + + if len(r.localFS) <= 0 && len(r.remoteFS) <= 0 { + return nil, fmt.Errorf("rolodex has no file systems configured, cannot open '%s'. Add a BaseURL or BasePath to your configuration so the rolodex knows how to resolve references", location) + } var errorStack []error var localFile *LocalFile var remoteFile *RemoteFile - if r == nil || r.localFS == nil && r.remoteFS == nil { - return nil, fmt.Errorf("rolodex has no file systems configured, cannot open '%s'", location) - } - fileLookup := location isUrl := false u, _ := url.Parse(location) diff --git a/renderer/mock_generator_test.go b/renderer/mock_generator_test.go index 028095c..ab1ce44 100644 --- a/renderer/mock_generator_test.go +++ b/renderer/mock_generator_test.go @@ -4,6 +4,7 @@ package renderer import ( + "context" "encoding/json" highbase "github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/datamodel/low" @@ -43,7 +44,7 @@ func createFakeMock(mock string, values map[string]any, example any) *fakeMockab var root yaml.Node _ = yaml.Unmarshal([]byte(mock), &root) var lowProxy lowbase.SchemaProxy - _ = lowProxy.Build(&root, root.Content[0], nil) + _ = lowProxy.Build(context.Background(), &root, root.Content[0], nil) lowRef := low.NodeReference[*lowbase.SchemaProxy]{ Value: &lowProxy, } @@ -66,7 +67,7 @@ func createFakeMockWithoutProxy(mock string, values map[string]any, example any) var root yaml.Node _ = yaml.Unmarshal([]byte(mock), &root) var lowProxy lowbase.SchemaProxy - _ = lowProxy.Build(&root, root.Content[0], nil) + _ = lowProxy.Build(context.Background(), &root, root.Content[0], nil) lowRef := low.NodeReference[*lowbase.SchemaProxy]{ Value: &lowProxy, } diff --git a/renderer/schema_renderer_test.go b/renderer/schema_renderer_test.go index 873940b..4088c13 100644 --- a/renderer/schema_renderer_test.go +++ b/renderer/schema_renderer_test.go @@ -4,6 +4,7 @@ package renderer import ( + "context" "encoding/base64" "encoding/json" "errors" @@ -56,7 +57,7 @@ func getSchema(schema []byte) *highbase.Schema { panic(e) } sp := new(lowbase.SchemaProxy) - _ = sp.Build(nil, compNode.Content[0], nil) + _ = sp.Build(context.Background(), nil, compNode.Content[0], nil) lp := low.NodeReference[*lowbase.SchemaProxy]{ Value: sp, ValueNode: compNode.Content[0], @@ -1131,7 +1132,7 @@ properties: buildSchema := func() *highbase.SchemaProxy { sp := new(lowbase.SchemaProxy) - _ = sp.Build(nil, compNode.Content[0], nil) + _ = sp.Build(context.Background(), nil, compNode.Content[0], nil) lp := low.NodeReference[*lowbase.SchemaProxy]{ Value: sp, ValueNode: compNode.Content[0], diff --git a/what-changed/model/callback_test.go b/what-changed/model/callback_test.go index 6e559c0..efa64f4 100644 --- a/what-changed/model/callback_test.go +++ b/what-changed/model/callback_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/stretchr/testify/assert" @@ -36,8 +37,8 @@ func TestCompareCallback(t *testing.T) { var rDoc v3.Callback _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareCallback(&lDoc, &rDoc) @@ -82,8 +83,8 @@ func TestCompareCallback_Add(t *testing.T) { var rDoc v3.Callback _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareCallback(&lDoc, &rDoc) @@ -133,8 +134,8 @@ func TestCompareCallback_Modify(t *testing.T) { var rDoc v3.Callback _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareCallback(&lDoc, &rDoc) @@ -183,8 +184,8 @@ func TestCompareCallback_Remove(t *testing.T) { var rDoc v3.Callback _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareCallback(&rDoc, &lDoc) diff --git a/what-changed/model/components_test.go b/what-changed/model/components_test.go index 99544ba..fb79301 100644 --- a/what-changed/model/components_test.go +++ b/what-changed/model/components_test.go @@ -4,13 +4,14 @@ package model import ( - "github.com/pb33f/libopenapi/datamodel/low" - v2 "github.com/pb33f/libopenapi/datamodel/low/v2" - "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v3" - "testing" + "context" + "github.com/pb33f/libopenapi/datamodel/low" + v2 "github.com/pb33f/libopenapi/datamodel/low/v2" + "github.com/pb33f/libopenapi/datamodel/low/v3" + "github.com/pb33f/libopenapi/index" + "github.com/stretchr/testify/assert" + "gopkg.in/yaml.v3" + "testing" ) func TestCompareComponents_Swagger_Definitions_Equal(t *testing.T) { @@ -38,8 +39,8 @@ thing2: var rDoc v2.Definitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -68,8 +69,8 @@ thing2: var rDoc v2.Definitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -107,8 +108,8 @@ thing3: var rDoc v2.Definitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -147,8 +148,8 @@ thing3: var rDoc v2.Definitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&rDoc, &lDoc) @@ -186,8 +187,8 @@ param4: var rDoc v2.ParameterDefinitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -225,8 +226,8 @@ param4: var rDoc v2.ParameterDefinitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&rDoc, &lDoc) @@ -260,8 +261,8 @@ resp3: var rDoc v2.ResponsesDefinitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -297,8 +298,8 @@ resp3: var rDoc v2.ResponsesDefinitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&rDoc, &lDoc) @@ -330,8 +331,8 @@ scheme2: var rDoc v2.SecurityDefinitions _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -366,8 +367,8 @@ schemas: var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -398,8 +399,8 @@ func TestCompareComponents_OpenAPI_Schemas_Refs_FullBuild(t *testing.T) { idx := index.NewSpecIndex(&lNode) - _ = lDoc.Build(lNode.Content[0], idx) - _ = rDoc.Build(rNode.Content[0], idx) + _ = lDoc.Build(context.Background(), lNode.Content[0], idx) + _ = rDoc.Build(context.Background(), rNode.Content[0], idx) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -430,8 +431,8 @@ schemas: var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -467,8 +468,8 @@ schemas: var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -503,8 +504,8 @@ schemas: var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&rDoc, &lDoc) @@ -533,8 +534,8 @@ responses: var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -563,8 +564,8 @@ func TestCompareComponents_OpenAPI_Responses_FullBuild(t *testing.T) { idx := index.NewSpecIndex(&lNode) - _ = lDoc.Build(lNode.Content[0], idx) - _ = rDoc.Build(rNode.Content[0], idx) + _ = lDoc.Build(context.Background(), lNode.Content[0], idx) + _ = rDoc.Build(context.Background(), rNode.Content[0], idx) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -599,8 +600,8 @@ func TestCompareComponents_OpenAPI_ResponsesAdd_FullBuild(t *testing.T) { idx := index.NewSpecIndex(&lNode) - _ = lDoc.Build(lNode.Content[0], idx) - _ = rDoc.Build(rNode.Content[0], idx) + _ = lDoc.Build(context.Background(), lNode.Content[0], idx) + _ = rDoc.Build(context.Background(), rNode.Content[0], idx) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -638,8 +639,8 @@ func TestCompareComponents_OpenAPI_Responses_FullBuild_IdenticalRef(t *testing.T idx := index.NewSpecIndex(&lNode) idx2 := index.NewSpecIndex(&rNode) - _ = lDoc.Build(lNode.Content[0], idx) - _ = rDoc.Build(rNode.Content[0], idx2) + _ = lDoc.Build(context.Background(), lNode.Content[0], idx) + _ = rDoc.Build(context.Background(), rNode.Content[0], idx2) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -682,8 +683,8 @@ func TestCompareComponents_OpenAPI_Responses_FullBuild_CircularRef(t *testing.T) re1.CheckForCircularReferences() re2.CheckForCircularReferences() - _ = lDoc.Build(lNode.Content[0], idx) - _ = rDoc.Build(rNode.Content[0], idx2) + _ = lDoc.Build(context.Background(), lNode.Content[0], idx) + _ = rDoc.Build(context.Background(), rNode.Content[0], idx2) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -693,16 +694,16 @@ func TestCompareComponents_OpenAPI_Responses_FullBuild_CircularRef(t *testing.T) //func TestCompareComponents_OpenAPI_Responses_Modify(t *testing.T) { // // left := `responses: -// niceResponse: -// description: hello -// badResponse: -// description: go away please` +// niceResponse: +// description: hello +// badResponse: +// description: go away please` // // right := `responses: -// niceResponse: -// description: hello my matey -// badResponse: -// description: go away please, now!` +// niceResponse: +// description: hello my matey +// badResponse: +// description: go away please, now!` // // var lNode, rNode yaml.Node // _ = yaml.Unmarshal([]byte(left), &lNode) @@ -713,8 +714,8 @@ func TestCompareComponents_OpenAPI_Responses_FullBuild_CircularRef(t *testing.T) // var rDoc v3.Components // _ = low.BuildModel(lNode.Content[0], &lDoc) // _ = low.BuildModel(rNode.Content[0], &rDoc) -// _ = lDoc.Build(lNode.Content[0], nil) -// _ = rDoc.Build(rNode.Content[0], nil) +// _ = lDoc.Build(context.Background(), lNode.Content[0], nil) +// _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // // // compare. // extChanges := CompareComponents(&rDoc, &lDoc) @@ -747,8 +748,8 @@ func TestCompareComponents_OpenAPI_Responses_Add(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -782,8 +783,8 @@ func TestCompareComponents_OpenAPI_Responses_Remove(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&rDoc, &lDoc) @@ -811,8 +812,8 @@ func TestCompareComponents_OpenAPI_Parameters_Equal(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -844,8 +845,8 @@ func TestCompareComponents_OpenAPI_Parameters_Added(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -879,8 +880,8 @@ func TestCompareComponents_OpenAPI_Parameters_Removed(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&rDoc, &lDoc) @@ -910,8 +911,8 @@ func TestCompareComponents_OpenAPI_RequestBodies_Modified(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -940,8 +941,8 @@ func TestCompareComponents_OpenAPI_Headers_Add(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -968,8 +969,8 @@ func TestCompareComponents_OpenAPI_SecuritySchemes_Equal(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -999,8 +1000,8 @@ func TestCompareComponents_OpenAPI_SecuritySchemes_Modified(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -1029,8 +1030,8 @@ func TestCompareComponents_OpenAPI_Links_Added(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -1065,8 +1066,8 @@ func TestCompareComponents_OpenAPI_Callbacks_Modified(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) @@ -1089,8 +1090,8 @@ func TestCompareComponents_OpenAPI_Extensions_Modified(t *testing.T) { var rDoc v3.Components _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(lNode.Content[0], nil) - _ = rDoc.Build(rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), rNode.Content[0], nil) // compare. extChanges := CompareComponents(&lDoc, &rDoc) diff --git a/what-changed/model/contact_test.go b/what-changed/model/contact_test.go index 24b746e..1f77dcd 100644 --- a/what-changed/model/contact_test.go +++ b/what-changed/model/contact_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/stretchr/testify/assert" @@ -27,8 +28,8 @@ url: https://pb33f.io` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) @@ -54,8 +55,8 @@ url: https://pb33f.io` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) @@ -80,8 +81,8 @@ name: buckaroo` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) @@ -106,8 +107,8 @@ name: buckaroo` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) @@ -131,8 +132,8 @@ email: buckaroo@pb33f.io` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) @@ -157,8 +158,8 @@ email: buckaroo@pb33f.io` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) @@ -183,8 +184,8 @@ email: dave@quobix.com` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) @@ -210,8 +211,8 @@ email: dave@quobix.com` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) @@ -235,8 +236,8 @@ url: https://pb33f.io` var rDoc lowbase.Contact _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareContact(&lDoc, &rDoc) diff --git a/what-changed/model/encoding_test.go b/what-changed/model/encoding_test.go index 02cdc73..1ca5542 100644 --- a/what-changed/model/encoding_test.go +++ b/what-changed/model/encoding_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/stretchr/testify/assert" @@ -38,8 +39,8 @@ allowReserved: true` var rDoc v3.Encoding _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareEncoding(&lDoc, &rDoc) @@ -73,8 +74,8 @@ allowReserved: true` var rDoc v3.Encoding _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareEncoding(&lDoc, &rDoc) @@ -108,8 +109,8 @@ allowReserved: true` var rDoc v3.Encoding _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareEncoding(&lDoc, &rDoc) @@ -144,8 +145,8 @@ allowReserved: true` var rDoc v3.Encoding _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareEncoding(&rDoc, &lDoc) diff --git a/what-changed/model/example_test.go b/what-changed/model/example_test.go index 087cc4e..e97f819 100644 --- a/what-changed/model/example_test.go +++ b/what-changed/model/example_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "testing" "github.com/stretchr/testify/assert" @@ -28,8 +29,8 @@ func TestCompareExamples_SummaryModified(t *testing.T) { var rDoc base.Example _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamples(&lDoc, &rDoc) @@ -61,8 +62,8 @@ func TestCompareExamples_Map(t *testing.T) { var rDoc base.Example _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamples(&lDoc, &rDoc) @@ -90,8 +91,8 @@ func TestCompareExamples_MapAdded(t *testing.T) { var rDoc base.Example _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamples(&lDoc, &rDoc) @@ -119,8 +120,8 @@ func TestCompareExamples_MapRemoved(t *testing.T) { var rDoc base.Example _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamples(&rDoc, &lDoc) @@ -144,8 +145,8 @@ description: cure all` var rDoc base.Example _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamples(&lDoc, &rDoc) @@ -171,8 +172,8 @@ x-herbs: cure all` var rDoc base.Example _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamples(&lDoc, &rDoc) @@ -197,8 +198,8 @@ func TestCompareExamples_Identical(t *testing.T) { var rDoc base.Example _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamples(&lDoc, &rDoc) assert.Nil(t, extChanges) @@ -220,8 +221,8 @@ func TestCompareExamples_Date(t *testing.T) { var rDoc base.Example _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) changes := CompareExamples(&lDoc, &rDoc) diff --git a/what-changed/model/examples_test.go b/what-changed/model/examples_test.go index 5ac6bab..731aef3 100644 --- a/what-changed/model/examples_test.go +++ b/what-changed/model/examples_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -26,8 +27,8 @@ func TestCompareExamplesV2(t *testing.T) { var rDoc v2.Examples _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamplesV2(&lDoc, &rDoc) assert.Equal(t, extChanges.TotalChanges(), 1) @@ -54,8 +55,8 @@ yummy: coffee` var rDoc v2.Examples _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamplesV2(&lDoc, &rDoc) assert.Equal(t, extChanges.TotalChanges(), 1) @@ -79,8 +80,8 @@ yummy: coffee` var rDoc v2.Examples _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamplesV2(&rDoc, &lDoc) assert.Equal(t, extChanges.TotalChanges(), 1) @@ -103,8 +104,8 @@ func TestCompareExamplesV2_Identical(t *testing.T) { var rDoc v2.Examples _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareExamplesV2(&rDoc, &lDoc) assert.Nil(t, extChanges) diff --git a/what-changed/model/external_docs_test.go b/what-changed/model/external_docs_test.go index 4fc06ed..df2fa4b 100644 --- a/what-changed/model/external_docs_test.go +++ b/what-changed/model/external_docs_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" lowv3 "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -31,8 +32,8 @@ x-testing: hiya!` var rDoc lowbase.ExternalDoc _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareExternalDocs(&lDoc, &rDoc) @@ -88,8 +89,8 @@ url: https://quobix.com` var rDoc lowbase.ExternalDoc _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareExternalDocs(&lDoc, &rDoc) @@ -139,8 +140,8 @@ x-testing: hello` var rDoc lowbase.ExternalDoc _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareExternalDocs(&lDoc, &rDoc) @@ -165,8 +166,8 @@ x-testing: hello` var rDoc lowbase.ExternalDoc _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareExternalDocs(&lDoc, &rDoc) @@ -191,8 +192,8 @@ url: https://pb33f.io` var rDoc lowbase.ExternalDoc _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareExternalDocs(&lDoc, &rDoc) @@ -217,8 +218,8 @@ description: something` var rDoc lowbase.ExternalDoc _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareExternalDocs(&lDoc, &rDoc) @@ -243,8 +244,8 @@ url: https://pb33f.io` var rDoc lowbase.ExternalDoc _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareExternalDocs(&lDoc, &rDoc) diff --git a/what-changed/model/header_test.go b/what-changed/model/header_test.go index 74e51ca..c6d6a4b 100644 --- a/what-changed/model/header_test.go +++ b/what-changed/model/header_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -73,8 +74,8 @@ func TestCompareHeaders_v2_identical(t *testing.T) { var rDoc v2.Header _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareHeadersV2(&lDoc, &rDoc) @@ -116,8 +117,8 @@ x-beer: really yummy` var rDoc v2.Header _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareHeadersV2(&lDoc, &rDoc) @@ -160,8 +161,8 @@ x-beer: yummy` var rDoc v2.Header _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareHeadersV2(&rDoc, &lDoc) @@ -205,8 +206,8 @@ x-beer: yummy` var rDoc v2.Header _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareHeadersV2(&lDoc, &rDoc) @@ -232,8 +233,8 @@ func TestCompareHeaders_v2_ItemsModified(t *testing.T) { var rDoc v2.Header _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareHeadersV2(&lDoc, &rDoc) @@ -255,8 +256,8 @@ func TestCompareHeaders_v3_identical(t *testing.T) { var rDoc v3.Header _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareHeadersV3(&lDoc, &rDoc) @@ -297,8 +298,8 @@ x-beer: yummy` var rDoc v3.Header _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareHeadersV3(&lDoc, &rDoc) diff --git a/what-changed/model/info_test.go b/what-changed/model/info_test.go index 33396f5..b51613e 100644 --- a/what-changed/model/info_test.go +++ b/what-changed/model/info_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -42,8 +43,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -83,8 +84,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -123,8 +124,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -161,8 +162,8 @@ contact: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -199,8 +200,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -239,8 +240,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -276,8 +277,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -313,8 +314,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -353,8 +354,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) @@ -394,8 +395,8 @@ license: var rDoc base.Info _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareInfo(&lDoc, &rDoc) diff --git a/what-changed/model/items_test.go b/what-changed/model/items_test.go index d394b7c..3f2b09b 100644 --- a/what-changed/model/items_test.go +++ b/what-changed/model/items_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -27,8 +28,8 @@ func TestCompareItems(t *testing.T) { var rDoc v2.Items _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. changes := CompareItems(&lDoc, &rDoc) @@ -58,8 +59,8 @@ items: var rDoc v2.Items _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. changes := CompareItems(&lDoc, &rDoc) @@ -88,8 +89,8 @@ items: var rDoc v2.Items _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. changes := CompareItems(&lDoc, &rDoc) @@ -118,8 +119,8 @@ items: var rDoc v2.Items _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. changes := CompareItems(&rDoc, &lDoc) diff --git a/what-changed/model/license_test.go b/what-changed/model/license_test.go index 17efc14..56ced0d 100644 --- a/what-changed/model/license_test.go +++ b/what-changed/model/license_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/stretchr/testify/assert" @@ -27,8 +28,8 @@ url: https://pb33f.io` var rDoc lowbase.License _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLicense(&lDoc, &rDoc) @@ -55,8 +56,8 @@ url: https://pb33f.io` var rDoc lowbase.License _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLicense(&lDoc, &rDoc) @@ -82,8 +83,8 @@ name: buckaroo` var rDoc lowbase.License _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLicense(&lDoc, &rDoc) @@ -109,8 +110,8 @@ name: buckaroo` var rDoc lowbase.License _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLicense(&lDoc, &rDoc) @@ -135,8 +136,8 @@ func TestCompareLicense_URLModified(t *testing.T) { var rDoc lowbase.License _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLicense(&lDoc, &rDoc) @@ -162,8 +163,8 @@ url: https://pb33f.io` var rDoc lowbase.License _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLicense(&lDoc, &rDoc) @@ -190,8 +191,8 @@ url: https://pb33f.io` var rDoc lowbase.License _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLicense(&lDoc, &rDoc) diff --git a/what-changed/model/link_test.go b/what-changed/model/link_test.go index a16a1a3..4723fec 100644 --- a/what-changed/model/link_test.go +++ b/what-changed/model/link_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/stretchr/testify/assert" @@ -32,8 +33,8 @@ parameters: var rDoc v3.Link _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLinks(&lDoc, &rDoc) @@ -70,8 +71,8 @@ x-cake: very tasty` var rDoc v3.Link _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLinks(&lDoc, &rDoc) @@ -109,8 +110,8 @@ parameters: var rDoc v3.Link _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLinks(&lDoc, &rDoc) @@ -145,8 +146,8 @@ parameters: var rDoc v3.Link _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLinks(&lDoc, &rDoc) @@ -181,8 +182,8 @@ parameters: var rDoc v3.Link _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLinks(&rDoc, &lDoc) @@ -219,8 +220,8 @@ parameters: var rDoc v3.Link _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLinks(&lDoc, &rDoc) @@ -261,8 +262,8 @@ parameters: var rDoc v3.Link _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLinks(&lDoc, &rDoc) @@ -302,8 +303,8 @@ parameters: var rDoc v3.Link _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareLinks(&rDoc, &lDoc) diff --git a/what-changed/model/media_type_test.go b/what-changed/model/media_type_test.go index 6ed9c56..eb98ad3 100644 --- a/what-changed/model/media_type_test.go +++ b/what-changed/model/media_type_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/stretchr/testify/assert" @@ -40,8 +41,8 @@ encoding: var rDoc v3.MediaType _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareMediaTypes(&lDoc, &rDoc) @@ -77,8 +78,8 @@ encoding: var rDoc v3.MediaType _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareMediaTypes(&lDoc, &rDoc) @@ -112,8 +113,8 @@ example: var rDoc v3.MediaType _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareMediaTypes(&lDoc, &rDoc) @@ -145,8 +146,8 @@ example: var rDoc v3.MediaType _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareMediaTypes(&lDoc, &rDoc) @@ -178,8 +179,8 @@ example: var rDoc v3.MediaType _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareMediaTypes(&rDoc, &lDoc) @@ -218,8 +219,8 @@ encoding: var rDoc v3.MediaType _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareMediaTypes(&lDoc, &rDoc) @@ -258,8 +259,8 @@ encoding: var rDoc v3.MediaType _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareMediaTypes(&rDoc, &lDoc) @@ -304,8 +305,8 @@ x-tea: cup` var rDoc v3.MediaType _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareMediaTypes(&lDoc, &rDoc) diff --git a/what-changed/model/oauth_flows_test.go b/what-changed/model/oauth_flows_test.go index 13432fa..12c1fb5 100644 --- a/what-changed/model/oauth_flows_test.go +++ b/what-changed/model/oauth_flows_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/stretchr/testify/assert" @@ -34,8 +35,8 @@ scopes: var rDoc v3.OAuthFlow _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlow(&lDoc, &rDoc) @@ -68,8 +69,8 @@ x-burgers: crispy` var rDoc v3.OAuthFlow _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlow(&lDoc, &rDoc) @@ -104,8 +105,8 @@ x-burgers: nice` var rDoc v3.OAuthFlow _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlow(&lDoc, &rDoc) @@ -142,8 +143,8 @@ x-burgers: nice` var rDoc v3.OAuthFlow _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlow(&rDoc, &lDoc) @@ -179,8 +180,8 @@ x-burgers: nice` var rDoc v3.OAuthFlow _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlow(&lDoc, &rDoc) @@ -223,8 +224,8 @@ x-coke: cola` var rDoc v3.OAuthFlows _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlows(&lDoc, &rDoc) @@ -253,8 +254,8 @@ x-coke: cola` var rDoc v3.OAuthFlows _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlows(&lDoc, &rDoc) @@ -285,8 +286,8 @@ x-coke: cola` var rDoc v3.OAuthFlows _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlows(&rDoc, &lDoc) @@ -325,8 +326,8 @@ x-coke: cherry` var rDoc v3.OAuthFlows _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareOAuthFlows(&lDoc, &rDoc) diff --git a/what-changed/model/operation_test.go b/what-changed/model/operation_test.go index 654e72a..a148672 100644 --- a/what-changed/model/operation_test.go +++ b/what-changed/model/operation_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "testing" "github.com/pb33f/libopenapi/datamodel/low" @@ -43,8 +44,8 @@ parameters: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -96,8 +97,8 @@ parameters: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -147,8 +148,8 @@ parameters: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -201,8 +202,8 @@ parameters: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -261,8 +262,8 @@ parameters: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -319,8 +320,8 @@ parameters: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -377,8 +378,8 @@ parameters: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -435,8 +436,8 @@ parameters: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -472,8 +473,8 @@ schemes: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -506,8 +507,8 @@ responses: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -548,8 +549,8 @@ responses: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -578,8 +579,8 @@ responses: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -610,8 +611,8 @@ responses: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -646,8 +647,8 @@ security: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -683,8 +684,8 @@ security: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -722,8 +723,8 @@ security: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -761,8 +762,8 @@ security: var rDoc v2.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -812,8 +813,8 @@ parameters: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -841,8 +842,8 @@ func TestCompareOperations_V3_ModifyParam(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -875,8 +876,8 @@ func TestCompareOperations_V3_AddParam(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -909,8 +910,8 @@ func TestCompareOperations_V3_RemoveParam(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -939,8 +940,8 @@ parameters: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -969,8 +970,8 @@ parameters: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -1000,8 +1001,8 @@ func TestCompareOperations_V3_ModifyServers(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1034,8 +1035,8 @@ func TestCompareOperations_V3_ModifyCallback(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1075,8 +1076,8 @@ func TestCompareOperations_V3_AddCallback(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1110,8 +1111,8 @@ callbacks: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1145,8 +1146,8 @@ callbacks: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -1183,8 +1184,8 @@ func TestCompareOperations_V3_RemoveCallback(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -1212,8 +1213,8 @@ func TestCompareOperations_V3_AddServer(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1241,8 +1242,8 @@ func TestCompareOperations_V3_RemoveServer(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -1270,8 +1271,8 @@ servers: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1299,8 +1300,8 @@ servers: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) @@ -1332,8 +1333,8 @@ security: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1361,8 +1362,8 @@ security: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1390,8 +1391,8 @@ security: []` var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1418,8 +1419,8 @@ func TestCompareOperations_V3_ModifyRequestBody(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1446,8 +1447,8 @@ requestBody: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1472,8 +1473,8 @@ func TestCompareOperations_V3_ModifyExtension(t *testing.T) { var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&lDoc, &rDoc) @@ -1500,8 +1501,8 @@ requestBody: var rDoc v3.Operation _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareOperations(&rDoc, &lDoc) diff --git a/what-changed/model/parameter_test.go b/what-changed/model/parameter_test.go index a77ef64..f569f46 100644 --- a/what-changed/model/parameter_test.go +++ b/what-changed/model/parameter_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -26,8 +27,8 @@ func TestCompareParameters(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -48,8 +49,8 @@ func TestCompareParameters_V3(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParametersV3(&lDoc, &rDoc) @@ -72,8 +73,8 @@ func TestCompareParameters_V3_Schema(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -100,8 +101,8 @@ schema: var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -128,8 +129,8 @@ schema: var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&rDoc, &lDoc) @@ -154,8 +155,8 @@ func TestCompareParameters_V3_Extensions(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -181,8 +182,8 @@ func TestCompareParameters_V3_ExampleChange(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -205,8 +206,8 @@ func TestCompareParameters_V3_ExampleEqual(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -228,8 +229,8 @@ example: a string` var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareParameters(&lDoc, &rDoc) @@ -254,8 +255,8 @@ example: a string` var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareParameters(&rDoc, &lDoc) @@ -283,8 +284,8 @@ func TestCompareParameters_V3_ExamplesChanged(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareParameters(&lDoc, &rDoc) @@ -315,8 +316,8 @@ func TestCompareParameters_V3_ExamplesAdded(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareParameters(&lDoc, &rDoc) @@ -347,8 +348,8 @@ func TestCompareParameters_V3_ExamplesRemoved(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareParameters(&rDoc, &lDoc) @@ -379,8 +380,8 @@ func TestCompareParameters_V3_ContentChanged(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareParameters(&lDoc, &rDoc) @@ -415,8 +416,8 @@ func TestCompareParameters_V3_ContentAdded(t *testing.T) { var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareParameters(&lDoc, &rDoc) @@ -440,8 +441,8 @@ func TestCompareParameters_V2_DefaultChange(t *testing.T) { var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -465,8 +466,8 @@ default: wat?` var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -491,8 +492,8 @@ func TestCompareParameters_V2_EnumChange(t *testing.T) { var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -519,8 +520,8 @@ func TestCompareParameters_V2_EnumEqual_Reorder(t *testing.T) { var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -542,8 +543,8 @@ example: a string` var rDoc v3.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareParameters(&rDoc, &lDoc) @@ -567,8 +568,8 @@ func TestCompareParameters_V2_Equal(t *testing.T) { var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -589,8 +590,8 @@ func TestCompareParameters_V2(t *testing.T) { var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -613,8 +614,8 @@ func TestCompareParameters_V2_ItemsChange(t *testing.T) { var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -641,8 +642,8 @@ items: var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) @@ -668,8 +669,8 @@ items: var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&rDoc, &lDoc) @@ -693,8 +694,8 @@ func TestCompareParameters_V2_Extensions(t *testing.T) { var rDoc v2.Parameter _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareParameters(&lDoc, &rDoc) diff --git a/what-changed/model/path_item_test.go b/what-changed/model/path_item_test.go index 2f01056..90d654e 100644 --- a/what-changed/model/path_item_test.go +++ b/what-changed/model/path_item_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "testing" "github.com/pb33f/libopenapi/datamodel/low" @@ -44,8 +45,8 @@ x-thing: thang.` var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -99,8 +100,8 @@ x-thing: ding-a-ling` var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -136,8 +137,8 @@ parameters: var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -177,8 +178,8 @@ parameters: var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -217,8 +218,8 @@ parameters: var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&rDoc, &lDoc) @@ -252,8 +253,8 @@ parameters: var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -288,8 +289,8 @@ parameters: var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -329,8 +330,8 @@ parameters: var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -369,8 +370,8 @@ parameters: var rDoc v2.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&rDoc, &lDoc) @@ -416,8 +417,8 @@ x-thing: thang.` var rDoc v3.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -484,8 +485,8 @@ x-thing: dang.` var rDoc v3.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -511,8 +512,8 @@ parameters: var rDoc v3.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -540,8 +541,8 @@ parameters: var rDoc v3.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItemsV3(&rDoc, &lDoc) @@ -583,8 +584,8 @@ trace: var rDoc v3.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) @@ -624,8 +625,8 @@ trace: var rDoc v3.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&rDoc, &lDoc) @@ -657,8 +658,8 @@ func TestComparePathItem_V3_ChangeParam(t *testing.T) { var rDoc v3.PathItem _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePathItems(&lDoc, &rDoc) diff --git a/what-changed/model/paths_test.go b/what-changed/model/paths_test.go index f6a52e6..deda4d7 100644 --- a/what-changed/model/paths_test.go +++ b/what-changed/model/paths_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -36,8 +37,8 @@ func TestComparePaths_v2(t *testing.T) { var rDoc v2.Paths _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePaths(&rDoc, &lDoc) @@ -78,8 +79,8 @@ x-windows: washed var rDoc v2.Paths _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePaths(&lDoc, &rDoc) @@ -118,8 +119,8 @@ x-windows: dirty var rDoc v2.Paths _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePaths(&lDoc, &rDoc) @@ -160,8 +161,8 @@ x-windows: dirty var rDoc v2.Paths _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePaths(&rDoc, &lDoc) @@ -195,8 +196,8 @@ func TestComparePaths_v3(t *testing.T) { var rDoc v3.Paths _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePaths(&rDoc, &lDoc) @@ -237,8 +238,8 @@ x-windows: washed var rDoc v3.Paths _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePaths(&lDoc, &rDoc) @@ -284,8 +285,8 @@ x-windows: dirty` var rDoc v3.Paths _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePaths(&lDoc, &rDoc) @@ -333,8 +334,8 @@ x-windows: dirty` var rDoc v3.Paths _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := ComparePaths(&rDoc, &lDoc) diff --git a/what-changed/model/request_body_test.go b/what-changed/model/request_body_test.go index 0235698..3b47642 100644 --- a/what-changed/model/request_body_test.go +++ b/what-changed/model/request_body_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/stretchr/testify/assert" @@ -36,8 +37,8 @@ content: var rDoc v3.RequestBody _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareRequestBodies(&lDoc, &rDoc) @@ -71,8 +72,8 @@ content: var rDoc v3.RequestBody _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareRequestBodies(&lDoc, &rDoc) diff --git a/what-changed/model/response_test.go b/what-changed/model/response_test.go index f7b84a5..14ebace 100644 --- a/what-changed/model/response_test.go +++ b/what-changed/model/response_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -36,8 +37,8 @@ x-toot: poot` var rDoc v2.Response _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponse(&lDoc, &rDoc) assert.Nil(t, extChanges) @@ -74,8 +75,8 @@ x-toot: poot` var rDoc v2.Response _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponse(&lDoc, &rDoc) assert.Equal(t, 5, extChanges.TotalChanges()) @@ -108,8 +109,8 @@ examples: var rDoc v2.Response _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponse(&lDoc, &rDoc) assert.Equal(t, 2, extChanges.TotalChanges()) @@ -142,8 +143,8 @@ examples: var rDoc v2.Response _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponse(&rDoc, &lDoc) assert.Equal(t, 2, extChanges.TotalChanges()) @@ -176,8 +177,8 @@ x-toot: poot` var rDoc v3.Response _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponse(&lDoc, &rDoc) assert.Nil(t, extChanges) @@ -222,8 +223,8 @@ x-toot: pooty` var rDoc v3.Response _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponse(&lDoc, &rDoc) diff --git a/what-changed/model/responses_test.go b/what-changed/model/responses_test.go index 5732bae..131fa47 100644 --- a/what-changed/model/responses_test.go +++ b/what-changed/model/responses_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -38,8 +39,8 @@ default: var rDoc v2.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Nil(t, extChanges) @@ -76,8 +77,8 @@ x-ting: tang` var rDoc v2.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Equal(t, 2, extChanges.TotalChanges()) @@ -117,8 +118,8 @@ x-apple: pie` var rDoc v2.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&rDoc, &lDoc) assert.Equal(t, 2, extChanges.TotalChanges()) @@ -153,8 +154,8 @@ func TestCompareResponses_V2_RemoveSchema(t *testing.T) { var rDoc v2.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Equal(t, 1, extChanges.TotalChanges()) @@ -187,8 +188,8 @@ default: var rDoc v2.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Equal(t, 1, extChanges.TotalChanges()) @@ -221,8 +222,8 @@ default: var rDoc v2.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&rDoc, &lDoc) assert.Equal(t, 1, extChanges.TotalChanges()) @@ -259,8 +260,8 @@ default: var rDoc v2.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Equal(t, 2, extChanges.TotalChanges()) @@ -289,8 +290,8 @@ default: var rDoc v3.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Nil(t, extChanges) @@ -323,8 +324,8 @@ x-coffee: yum var rDoc v3.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Equal(t, 4, extChanges.TotalChanges()) @@ -357,8 +358,8 @@ default: var rDoc v3.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Equal(t, 1, extChanges.TotalChanges()) @@ -392,8 +393,8 @@ default: var rDoc v3.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&rDoc, &lDoc) assert.Equal(t, 1, extChanges.TotalChanges()) @@ -429,8 +430,8 @@ default: var rDoc v3.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Equal(t, 1, extChanges.TotalChanges()) @@ -462,8 +463,8 @@ func TestCompareResponses_V3_AddRemoveMediaType(t *testing.T) { var rDoc v3.Responses _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) extChanges := CompareResponses(&lDoc, &rDoc) assert.Equal(t, 2, extChanges.TotalChanges()) diff --git a/what-changed/model/schema_test.go b/what-changed/model/schema_test.go index 1b8c4dc..5626b80 100644 --- a/what-changed/model/schema_test.go +++ b/what-changed/model/schema_test.go @@ -162,8 +162,8 @@ func test_BuildDoc(l, r string) (*v3.Document, *v3.Document) { leftInfo, _ := datamodel.ExtractSpecInfo([]byte(l)) rightInfo, _ := datamodel.ExtractSpecInfo([]byte(r)) - leftDoc, _ := v3.CreateDocumentFromConfig(leftInfo, datamodel.NewOpenDocumentConfiguration()) - rightDoc, _ := v3.CreateDocumentFromConfig(rightInfo, datamodel.NewOpenDocumentConfiguration()) + leftDoc, _ := v3.CreateDocumentFromConfig(leftInfo, datamodel.NewDocumentConfiguration()) + rightDoc, _ := v3.CreateDocumentFromConfig(rightInfo, datamodel.NewDocumentConfiguration()) return leftDoc, rightDoc } @@ -173,8 +173,8 @@ func test_BuildDocv2(l, r string) (*v2.Swagger, *v2.Swagger) { var err []error var leftDoc, rightDoc *v2.Swagger - leftDoc, err = v2.CreateDocumentFromConfig(leftInfo, datamodel.NewOpenDocumentConfiguration()) - rightDoc, err = v2.CreateDocumentFromConfig(rightInfo, datamodel.NewOpenDocumentConfiguration()) + leftDoc, err = v2.CreateDocumentFromConfig(leftInfo, datamodel.NewDocumentConfiguration()) + rightDoc, err = v2.CreateDocumentFromConfig(rightInfo, datamodel.NewDocumentConfiguration()) if len(err) > 0 { for i := range err { diff --git a/what-changed/model/scopes_test.go b/what-changed/model/scopes_test.go index acb7e62..c154d23 100644 --- a/what-changed/model/scopes_test.go +++ b/what-changed/model/scopes_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" v2 "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/stretchr/testify/assert" @@ -29,8 +30,8 @@ x-nugget: chicken` var rDoc v2.Scopes _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareScopes(&lDoc, &rDoc) @@ -55,8 +56,8 @@ x-nugget: chicken` var rDoc v2.Scopes _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareScopes(&lDoc, &rDoc) @@ -84,8 +85,8 @@ x-nugget: chicken` var rDoc v2.Scopes _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareScopes(&lDoc, &rDoc) @@ -114,8 +115,8 @@ x-nugget: soup` var rDoc v2.Scopes _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareScopes(&rDoc, &lDoc) diff --git a/what-changed/model/security_requirement_test.go b/what-changed/model/security_requirement_test.go index 6c3cc50..b55963f 100644 --- a/what-changed/model/security_requirement_test.go +++ b/what-changed/model/security_requirement_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/stretchr/testify/assert" @@ -30,8 +31,8 @@ func TestCompareSecurityRequirement_V2(t *testing.T) { var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) @@ -63,8 +64,8 @@ biscuit: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) @@ -96,8 +97,8 @@ biscuit: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&rDoc, &lDoc) @@ -129,8 +130,8 @@ milk: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) @@ -166,8 +167,8 @@ milk: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) @@ -201,8 +202,8 @@ biscuit: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) @@ -239,8 +240,8 @@ biscuit: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) @@ -273,8 +274,8 @@ biscuit: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) @@ -307,8 +308,8 @@ biscuit: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) @@ -339,8 +340,8 @@ biscuit: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&rDoc, &lDoc) @@ -375,8 +376,8 @@ biscuit: var rDoc base.SecurityRequirement _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecurityRequirement(&lDoc, &rDoc) diff --git a/what-changed/model/security_scheme_test.go b/what-changed/model/security_scheme_test.go index fd8fb75..989ae28 100644 --- a/what-changed/model/security_scheme_test.go +++ b/what-changed/model/security_scheme_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" @@ -37,8 +38,8 @@ x-beer: tasty` var rDoc v2.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&lDoc, &rDoc) @@ -66,8 +67,8 @@ x-beer: very tasty` var rDoc v2.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&lDoc, &rDoc) @@ -98,8 +99,8 @@ scopes: var rDoc v2.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&lDoc, &rDoc) @@ -128,8 +129,8 @@ scopes: var rDoc v2.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&rDoc, &lDoc) @@ -158,8 +159,8 @@ func TestCompareSecuritySchemes_v2_ModifyScope(t *testing.T) { var rDoc v2.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&lDoc, &rDoc) @@ -193,8 +194,8 @@ description: a thing` var rDoc v3.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&lDoc, &rDoc) @@ -224,8 +225,8 @@ x-beer: cool` var rDoc v3.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&lDoc, &rDoc) @@ -257,8 +258,8 @@ flows: var rDoc v3.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&lDoc, &rDoc) @@ -286,8 +287,8 @@ flows: var rDoc v3.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&rDoc, &lDoc) @@ -318,8 +319,8 @@ flows: var rDoc v3.SecurityScheme _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare extChanges := CompareSecuritySchemes(&lDoc, &rDoc) diff --git a/what-changed/model/server_test.go b/what-changed/model/server_test.go index a4961fe..8e83be9 100644 --- a/what-changed/model/server_test.go +++ b/what-changed/model/server_test.go @@ -4,6 +4,7 @@ package model import ( + "context" "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/stretchr/testify/assert" @@ -40,8 +41,8 @@ variables: var rDoc v3.Server _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareServers(&lDoc, &rDoc) @@ -77,8 +78,8 @@ variables: var rDoc v3.Server _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareServers(&lDoc, &rDoc) @@ -115,8 +116,8 @@ variables: var rDoc v3.Server _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareServers(&lDoc, &rDoc) @@ -155,8 +156,8 @@ variables: var rDoc v3.Server _ = low.BuildModel(lNode.Content[0], &lDoc) _ = low.BuildModel(rNode.Content[0], &rDoc) - _ = lDoc.Build(nil, lNode.Content[0], nil) - _ = rDoc.Build(nil, rNode.Content[0], nil) + _ = lDoc.Build(context.Background(), nil, lNode.Content[0], nil) + _ = rDoc.Build(context.Background(), nil, rNode.Content[0], nil) // compare. extChanges := CompareServers(&rDoc, &lDoc)