Merged in feature/s3integration (pull request #47)
Set Up S3 integration * cfginterfaceandfirsts3funcs * addlocalstack * generallypassesfullsuite * addedmultipleattemptedpings * cleanup * stabiliseplusskip
This commit is contained in:
+7
-4
@@ -28,6 +28,9 @@ type Loader struct {
|
||||
// IsExternalRefsAllowed enables visiting other files
|
||||
IsExternalRefsAllowed bool
|
||||
|
||||
// IncludeOrigin specifies whether to include the origin of the OpenAPI elements
|
||||
IncludeOrigin bool
|
||||
|
||||
// ReadFromURIFunc allows overriding the any file/URL reading func
|
||||
ReadFromURIFunc ReadFromURIFunc
|
||||
|
||||
@@ -103,7 +106,7 @@ func (loader *Loader) loadSingleElementFromURI(ref string, rootPath *url.URL, el
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := unmarshal(data, element); err != nil {
|
||||
if err := unmarshal(data, element, loader.IncludeOrigin); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -139,7 +142,7 @@ func (loader *Loader) LoadFromIoReader(reader io.Reader) (*T, error) {
|
||||
func (loader *Loader) LoadFromData(data []byte) (*T, error) {
|
||||
loader.resetVisitedPathItemRefs()
|
||||
doc := &T{}
|
||||
if err := unmarshal(data, doc); err != nil {
|
||||
if err := unmarshal(data, doc, loader.IncludeOrigin); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := loader.ResolveRefsIn(doc, nil); err != nil {
|
||||
@@ -168,7 +171,7 @@ func (loader *Loader) loadFromDataWithPathInternal(data []byte, location *url.UR
|
||||
doc := &T{}
|
||||
loader.visitedDocuments[uri] = doc
|
||||
|
||||
if err := unmarshal(data, doc); err != nil {
|
||||
if err := unmarshal(data, doc, loader.IncludeOrigin); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -422,7 +425,7 @@ func (loader *Loader) resolveComponent(doc *T, ref string, path *url.URL, resolv
|
||||
if err2 != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if err2 = unmarshal(data, &cursor); err2 != nil {
|
||||
if err2 = unmarshal(data, &cursor, loader.IncludeOrigin); err2 != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
if cursor, err2 = drill(cursor); err2 != nil || cursor == nil {
|
||||
|
||||
Reference in New Issue
Block a user