update prometheus dependencies (#5520)

Signed-off-by: junot <junotxiang@kubesphere.io>

vendor/github.com/go-openapi/loads/.golangci.yml

@@ -20,3 +20,25 @@ linters:
     - lll
     - gochecknoglobals
     - gochecknoinits
+    - godox
+    - gocognit
+    - whitespace
+    - wsl
+    - funlen
+    - gochecknoglobals
+    - gochecknoinits
+    - scopelint
+    - wrapcheck
+    - exhaustivestruct
+    - exhaustive
+    - nlreturn
+    - testpackage
+    - gci
+    - gofumpt
+    - goerr113
+    - gomnd
+    - tparallel
+    - nestif
+    - godot
+    - errorlint
+    - paralleltest

vendor/github.com/go-openapi/loads/.travis.yml

@@ -1,11 +1,23 @@
 after_success:
 - bash <(curl -s https://codecov.io/bash)
 go:
-- 1.13.x
-- 1.14.x
+- 1.16.x
+- 1.x
 install:
-- go get -u gotest.tools/gotestsum
+- go get gotest.tools/gotestsum
 language: go
+arch:
+- amd64
+- ppc64le
+jobs:
+  include:
+  # include linting job, but only for latest go version and amd64 arch
+  - go: 1.x
+    arch: amd64
+    install:
+      go get github.com/golangci/golangci-lint/cmd/golangci-lint
+    script:
+    - golangci-lint run --new-from-rev master
 notifications:
   slack:
     secure: OxkPwVp35qBTUilgWC8xykSj+sGMcj0h8IIOKD+Rflx2schZVlFfdYdyVBM+s9OqeOfvtuvnR9v1Ye2rPKAvcjWdC4LpRGUsgmItZaI6Um8Aj6+K9udCw5qrtZVfOVmRu8LieH//XznWWKdOultUuniW0MLqw5+II87Gd00RWbCGi0hk0PykHe7uK+PDA2BEbqyZ2WKKYCvfB3j+0nrFOHScXqnh0V05l2E83J4+Sgy1fsPy+1WdX58ZlNBG333ibaC1FS79XvKSmTgKRkx3+YBo97u6ZtUmJa5WZjf2OdLG3KIckGWAv6R5xgxeU31N0Ng8L332w/Edpp2O/M2bZwdnKJ8hJQikXIAQbICbr+lTDzsoNzMdEIYcHpJ5hjPbiUl3Bmd+Jnsjf5McgAZDiWIfpCKZ29tPCEkVwRsOCqkyPRMNMzHHmoja495P5jR+ODS7+J8RFg5xgcnOgpP9D4Wlhztlf5WyZMpkLxTUD+bZq2SRf50HfHFXTkfq22zPl3d1eq0yrLwh/Z/fWKkfb6SyysROL8y6s8u3dpFX1YHSg0BR6i913h4aoZw9B2BG27cafLLTwKYsp2dFo1PWl4O6u9giFJIeqwloZHLKKrwh0cBFhB7RH0I58asxkZpCH6uWjJierahmHe7iS+E6i+9oCHkOZ59hmCYNimIs3hM=

vendor/github.com/go-openapi/loads/README.md

@@ -1,7 +1,6 @@
-# Loads OAI specs  [![Build Status](https://travis-ci.org/go-openapi/loads.svg?branch=master)](https://travis-ci.org/go-openapi/loads) [![codecov](https://codecov.io/gh/go-openapi/loads/branch/master/graph/badge.svg)](https://codecov.io/gh/go-openapi/loads) [![Slack Status](https://slackin.goswagger.io/badge.svg)](https://slackin.goswagger.io)
+# Loads OAI specs  [![Build Status](https://travis-ci.org/go-openapi/loads.svg?branch=master)](https://travis-ci.org/go-openapi/loads) [![codecov](https://codecov.io/gh/go-openapi/loads/branch/master/graph/badge.svg)](https://codecov.io/gh/go-openapi/loads) [![Slack Status](https://slackin.goswagger.io/badge.svg)](https://slackin.goswagger.io) [![Actions/Go Test Status](https://github.com/go-openapi/loads/workflows/Go%20Test/badge.svg)](https://github.com/go-openapi/loads/actions?query=workflow%3A"Go+Test")
 
 [![license](http://img.shields.io/badge/license-Apache%20v2-orange.svg)](https://raw.githubusercontent.com/go-openapi/loads/master/LICENSE) [![GoDoc](https://godoc.org/github.com/go-openapi/loads?status.svg)](http://godoc.org/github.com/go-openapi/loads)
-[![GolangCI](https://golangci.com/badges/github.com/go-openapi/loads.svg)](https://golangci.com)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-openapi/loads)](https://goreportcard.com/report/github.com/go-openapi/loads)
 
 Loading of OAI specification documents from local or remote locations. Supports JSON and YAML documents.

vendor/github.com/go-openapi/loads/loaders.go

@@ -0,0 +1,134 @@
+package loads
+
+import (
+	"encoding/json"
+	"errors"
+	"net/url"
+
+	"github.com/go-openapi/spec"
+	"github.com/go-openapi/swag"
+)
+
+var (
+	// Default chain of loaders, defined at the package level.
+	//
+	// By default this matches json and yaml documents.
+	//
+	// May be altered with AddLoader().
+	loaders *loader
+)
+
+func init() {
+	jsonLoader := &loader{
+		DocLoaderWithMatch: DocLoaderWithMatch{
+			Match: func(pth string) bool {
+				return true
+			},
+			Fn: JSONDoc,
+		},
+	}
+
+	loaders = jsonLoader.WithHead(&loader{
+		DocLoaderWithMatch: DocLoaderWithMatch{
+			Match: swag.YAMLMatcher,
+			Fn:    swag.YAMLDoc,
+		},
+	})
+
+	// sets the global default loader for go-openapi/spec
+	spec.PathLoader = loaders.Load
+}
+
+// DocLoader represents a doc loader type
+type DocLoader func(string) (json.RawMessage, error)
+
+// DocMatcher represents a predicate to check if a loader matches
+type DocMatcher func(string) bool
+
+// DocLoaderWithMatch describes a loading function for a given extension match.
+type DocLoaderWithMatch struct {
+	Fn    DocLoader
+	Match DocMatcher
+}
+
+// NewDocLoaderWithMatch builds a DocLoaderWithMatch to be used in load options
+func NewDocLoaderWithMatch(fn DocLoader, matcher DocMatcher) DocLoaderWithMatch {
+	return DocLoaderWithMatch{
+		Fn:    fn,
+		Match: matcher,
+	}
+}
+
+type loader struct {
+	DocLoaderWithMatch
+	Next *loader
+}
+
+// WithHead adds a loader at the head of the current stack
+func (l *loader) WithHead(head *loader) *loader {
+	if head == nil {
+		return l
+	}
+	head.Next = l
+	return head
+}
+
+// WithNext adds a loader at the trail of the current stack
+func (l *loader) WithNext(next *loader) *loader {
+	l.Next = next
+	return next
+}
+
+// Load the raw document from path
+func (l *loader) Load(path string) (json.RawMessage, error) {
+	_, erp := url.Parse(path)
+	if erp != nil {
+		return nil, erp
+	}
+
+	var lastErr error = errors.New("no loader matched") // default error if no match was found
+	for ldr := l; ldr != nil; ldr = ldr.Next {
+		if ldr.Match != nil && !ldr.Match(path) {
+			continue
+		}
+
+		// try then move to next one if there is an error
+		b, err := ldr.Fn(path)
+		if err == nil {
+			return b, nil
+		}
+
+		lastErr = err
+	}
+
+	return nil, lastErr
+}
+
+// JSONDoc loads a json document from either a file or a remote url
+func JSONDoc(path string) (json.RawMessage, error) {
+	data, err := swag.LoadFromFileOrHTTP(path)
+	if err != nil {
+		return nil, err
+	}
+	return json.RawMessage(data), nil
+}
+
+// AddLoader for a document, executed before other previously set loaders.
+//
+// This sets the configuration at the package level.
+//
+// NOTE:
+//  * this updates the default loader used by github.com/go-openapi/spec
+//  * since this sets package level globals, you shouln't call this concurrently
+//
+func AddLoader(predicate DocMatcher, load DocLoader) {
+	loaders = loaders.WithHead(&loader{
+		DocLoaderWithMatch: DocLoaderWithMatch{
+			Match: predicate,
+			Fn:    load,
+		},
+	})
+
+	// sets the global default loader for go-openapi/spec
+	spec.PathLoader = loaders.Load
+}

vendor/github.com/go-openapi/loads/options.go

@@ -0,0 +1,61 @@
+package loads
+
+type options struct {
+	loader *loader
+}
+
+func defaultOptions() *options {
+	return &options{
+		loader: loaders,
+	}
+}
+
+func loaderFromOptions(options []LoaderOption) *loader {
+	opts := defaultOptions()
+	for _, apply := range options {
+		apply(opts)
+	}
+
+	return opts.loader
+}
+
+// LoaderOption allows to fine-tune the spec loader behavior
+type LoaderOption func(*options)
+
+// WithDocLoader sets a custom loader for loading specs
+func WithDocLoader(l DocLoader) LoaderOption {
+	return func(opt *options) {
+		if l == nil {
+			return
+		}
+		opt.loader = &loader{
+			DocLoaderWithMatch: DocLoaderWithMatch{
+				Fn: l,
+			},
+		}
+	}
+}
+
+// WithDocLoaderMatches sets a chain of custom loaders for loading specs
+// for different extension matches.
+//
+// Loaders are executed in the order of provided DocLoaderWithMatch'es.
+func WithDocLoaderMatches(l ...DocLoaderWithMatch) LoaderOption {
+	return func(opt *options) {
+		var final, prev *loader
+		for _, ldr := range l {
+			if ldr.Fn == nil {
+				continue
+			}
+
+			if prev == nil {
+				final = &loader{DocLoaderWithMatch: ldr}
+				prev = final
+				continue
+			}
+
+			prev = prev.WithNext(&loader{DocLoaderWithMatch: ldr})
+		}
+		opt.loader = final
+	}
+}

vendor/github.com/go-openapi/loads/spec.go

@@ -19,69 +19,15 @@ import (
 	"encoding/gob"
 	"encoding/json"
 	"fmt"
-	"net/url"
 
 	"github.com/go-openapi/analysis"
 	"github.com/go-openapi/spec"
 	"github.com/go-openapi/swag"
 )
 
-// JSONDoc loads a json document from either a file or a remote url
-func JSONDoc(path string) (json.RawMessage, error) {
-	data, err := swag.LoadFromFileOrHTTP(path)
-	if err != nil {
-		return nil, err
-	}
-	return json.RawMessage(data), nil
-}
-
-// DocLoader represents a doc loader type
-type DocLoader func(string) (json.RawMessage, error)
-
-// DocMatcher represents a predicate to check if a loader matches
-type DocMatcher func(string) bool
-
-var (
-	loaders       *loader
-	defaultLoader *loader
-)
-
 func init() {
-	defaultLoader = &loader{Match: func(_ string) bool { return true }, Fn: JSONDoc}
-	loaders = defaultLoader
-	spec.PathLoader = loaders.Fn
-	AddLoader(swag.YAMLMatcher, swag.YAMLDoc)
-
 	gob.Register(map[string]interface{}{})
 	gob.Register([]interface{}{})
-	//gob.Register(spec.Refable{})
-}
-
-// AddLoader for a document
-func AddLoader(predicate DocMatcher, load DocLoader) {
-	prev := loaders
-	loaders = &loader{
-		Match: predicate,
-		Fn:    load,
-		Next:  prev,
-	}
-	spec.PathLoader = loaders.Fn
-}
-
-type loader struct {
-	Fn    DocLoader
-	Match DocMatcher
-	Next  *loader
-}
-
-// JSONSpec loads a spec from a json document
-func JSONSpec(path string) (*Document, error) {
-	data, err := JSONDoc(path)
-	if err != nil {
-		return nil, err
-	}
-	// convert to json
-	return Analyzed(data, "")
 }
 
 // Document represents a swagger spec document
@@ -93,10 +39,21 @@ type Document struct {
 	origSpec     *spec.Swagger
 	schema       *spec.Schema
 	raw          json.RawMessage
+	pathLoader   *loader
+}
+
+// JSONSpec loads a spec from a json document
+func JSONSpec(path string, options ...LoaderOption) (*Document, error) {
+	data, err := JSONDoc(path)
+	if err != nil {
+		return nil, err
+	}
+	// convert to json
+	return Analyzed(data, "", options...)
 }
 
 // Embedded returns a Document based on embedded specs. No analysis is required
-func Embedded(orig, flat json.RawMessage) (*Document, error) {
+func Embedded(orig, flat json.RawMessage, options ...LoaderOption) (*Document, error) {
 	var origSpec, flatSpec spec.Swagger
 	if err := json.Unmarshal(orig, &origSpec); err != nil {
 		return nil, err
@@ -105,54 +62,38 @@ func Embedded(orig, flat json.RawMessage) (*Document, error) {
 		return nil, err
 	}
 	return &Document{
-		raw:      orig,
-		origSpec: &origSpec,
-		spec:     &flatSpec,
+		raw:        orig,
+		origSpec:   &origSpec,
+		spec:       &flatSpec,
+		pathLoader: loaderFromOptions(options),
 	}, nil
 }
 
-// Spec loads a new spec document
-func Spec(path string) (*Document, error) {
-	specURL, err := url.Parse(path)
-	if err != nil {
-		return nil, err
-	}
-	var lastErr error
-	for l := loaders.Next; l != nil; l = l.Next {
-		if loaders.Match(specURL.Path) {
-			b, err2 := loaders.Fn(path)
-			if err2 != nil {
-				lastErr = err2
-				continue
-			}
-			doc, err3 := Analyzed(b, "")
-			if err3 != nil {
-				return nil, err3
-			}
-			if doc != nil {
-				doc.specFilePath = path
-			}
-			return doc, nil
-		}
-	}
-	if lastErr != nil {
-		return nil, lastErr
-	}
-	b, err := defaultLoader.Fn(path)
+// Spec loads a new spec document from a local or remote path
+func Spec(path string, options ...LoaderOption) (*Document, error) {
+
+	ldr := loaderFromOptions(options)
+
+	b, err := ldr.Load(path)
+	if err != nil {
+		return nil, err
+	}
+
+	document, err := Analyzed(b, "", options...)
 	if err != nil {
 		return nil, err
 	}
 
-	document, err := Analyzed(b, "")
 	if document != nil {
 		document.specFilePath = path
+		document.pathLoader = ldr
 	}
 
 	return document, err
 }
 
-// Analyzed creates a new analyzed spec document
-func Analyzed(data json.RawMessage, version string) (*Document, error) {
+// Analyzed creates a new analyzed spec document for a root json.RawMessage.
+func Analyzed(data json.RawMessage, version string, options ...LoaderOption) (*Document, error) {
 	if version == "" {
 		version = "2.0"
 	}
@@ -160,24 +101,13 @@ func Analyzed(data json.RawMessage, version string) (*Document, error) {
 		return nil, fmt.Errorf("spec version %q is not supported", version)
 	}
 
-	raw := data
-	trimmed := bytes.TrimSpace(data)
-	if len(trimmed) > 0 {
-		if trimmed[0] != '{' && trimmed[0] != '[' {
-			yml, err := swag.BytesToYAMLDoc(trimmed)
-			if err != nil {
-				return nil, fmt.Errorf("analyzed: %v", err)
-			}
-			d, err := swag.YAMLToJSON(yml)
-			if err != nil {
-				return nil, fmt.Errorf("analyzed: %v", err)
-			}
-			raw = d
-		}
+	raw, err := trimData(data) // trim blanks, then convert yaml docs into json
+	if err != nil {
+		return nil, err
 	}
 
 	swspec := new(spec.Swagger)
-	if err := json.Unmarshal(raw, swspec); err != nil {
+	if err = json.Unmarshal(raw, swspec); err != nil {
 		return nil, err
 	}
 
@@ -187,17 +117,44 @@ func Analyzed(data json.RawMessage, version string) (*Document, error) {
 	}
 
 	d := &Document{
-		Analyzer: analysis.New(swspec),
-		schema:   spec.MustLoadSwagger20Schema(),
-		spec:     swspec,
-		raw:      raw,
-		origSpec: origsqspec,
+		Analyzer:   analysis.New(swspec),
+		schema:     spec.MustLoadSwagger20Schema(),
+		spec:       swspec,
+		raw:        raw,
+		origSpec:   origsqspec,
+		pathLoader: loaderFromOptions(options),
 	}
+
+	return d, nil
+}
+
+func trimData(in json.RawMessage) (json.RawMessage, error) {
+	trimmed := bytes.TrimSpace(in)
+	if len(trimmed) == 0 {
+		return in, nil
+	}
+
+	if trimmed[0] == '{' || trimmed[0] == '[' {
+		return trimmed, nil
+	}
+
+	// assume yaml doc: convert it to json
+	yml, err := swag.BytesToYAMLDoc(trimmed)
+	if err != nil {
+		return nil, fmt.Errorf("analyzed: %v", err)
+	}
+
+	d, err := swag.YAMLToJSON(yml)
+	if err != nil {
+		return nil, fmt.Errorf("analyzed: %v", err)
+	}
+
 	return d, nil
 }
 
 // Expanded expands the ref fields in the spec document and returns a new spec document
 func (d *Document) Expanded(options ...*spec.ExpandOptions) (*Document, error) {
+
 	swspec := new(spec.Swagger)
 	if err := json.Unmarshal(d.raw, swspec); err != nil {
 		return nil, err
@@ -212,6 +169,16 @@ func (d *Document) Expanded(options ...*spec.ExpandOptions) (*Document, error) {
 		}
 	}
 
+	if expandOptions.PathLoader == nil {
+		if d.pathLoader != nil {
+			// use loader from Document options
+			expandOptions.PathLoader = d.pathLoader.Load
+		} else {
+			// use package level loader
+			expandOptions.PathLoader = loaders.Load
+		}
+	}
+
 	if err := spec.ExpandSpec(swspec, expandOptions); err != nil {
 		return nil, err
 	}
@@ -262,7 +229,7 @@ func (d *Document) OrigSpec() *spec.Swagger {
 	return d.origSpec
 }
 
-// ResetDefinitions gives a shallow copy with the models reset
+// ResetDefinitions gives a shallow copy with the models reset to the original spec
 func (d *Document) ResetDefinitions() *Document {
 	defs := make(map[string]spec.Schema, len(d.origSpec.Definitions))
 	for k, v := range d.origSpec.Definitions {
@@ -276,6 +243,7 @@ func (d *Document) ResetDefinitions() *Document {
 // Pristine creates a new pristine document instance based on the input data
 func (d *Document) Pristine() *Document {
 	dd, _ := Analyzed(d.Raw(), d.Version())
+	dd.pathLoader = d.pathLoader
 	return dd
 }