зеркало из https://github.com/Azure/ARO-RP.git
update go-cosmosdb; vendor; generate
This commit is contained in:
Родитель
4f0b68928f
Коммит
f865ad815f
3
go.mod
3
go.mod
|
@ -47,7 +47,7 @@ require (
|
|||
github.com/gorilla/mux v1.8.0
|
||||
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
|
||||
github.com/h2non/filetype v1.1.0 // indirect
|
||||
github.com/jim-minter/go-cosmosdb v0.0.0-20200923160222-1528d2db09d6
|
||||
github.com/jim-minter/go-cosmosdb v0.0.0-20201117192055-43b4b21373cc
|
||||
github.com/jstemmer/go-junit-report v0.9.1
|
||||
github.com/klauspost/compress v1.11.3 // indirect
|
||||
github.com/libvirt/libvirt-go v6.9.0+incompatible // indirect
|
||||
|
@ -79,7 +79,6 @@ require (
|
|||
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
|
||||
golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 // indirect
|
||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
|
||||
golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48 // indirect
|
||||
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
|
||||
golang.org/x/tools v0.0.0-20201117021029-3c3a81204b10
|
||||
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
|
||||
|
|
6
go.sum
6
go.sum
|
@ -1078,8 +1078,8 @@ github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0
|
|||
github.com/jessevdk/go-flags v0.0.0-20180331124232-1c38ed7ad0cc/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
|
||||
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
|
||||
github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
|
||||
github.com/jim-minter/go-cosmosdb v0.0.0-20200923160222-1528d2db09d6 h1:4HhzSzhgL1TDsdVqsyifRovCuWwogmz3tL8LQkvqOxQ=
|
||||
github.com/jim-minter/go-cosmosdb v0.0.0-20200923160222-1528d2db09d6/go.mod h1:fTvDmpVqcmolOdtE7NltKskFwy8jLRDKHTczX+ZVHTU=
|
||||
github.com/jim-minter/go-cosmosdb v0.0.0-20201117192055-43b4b21373cc h1:1GuA++1yez1MbiCQqZpov6kTJZSdJgWZ1inVQ+x4X5g=
|
||||
github.com/jim-minter/go-cosmosdb v0.0.0-20201117192055-43b4b21373cc/go.mod h1:n4wXKwl/rXS49qkPRFf3vovG0V6nkwAO4SbRwjGYibM=
|
||||
github.com/jim-minter/installer v0.9.0-master.0.20201116195329-73508e766328 h1:VFj0GDbMBmqHS4wEDPQDBRDvmuyojy08yrL7//ZDU5Q=
|
||||
github.com/jim-minter/installer v0.9.0-master.0.20201116195329-73508e766328/go.mod h1:of/td4KUxV/m+XIW9s801GmNQMXkKr/BshS07qA36vQ=
|
||||
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
|
||||
|
@ -2187,6 +2187,8 @@ golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48 h1:AYCWBZhgIw6XobZ5CibNJr0Rc4ZofGGKvWa1vcx2IGk=
|
||||
golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48 h1:AYCWBZhgIw6XobZ5CibNJr0Rc4ZofGGKvWa1vcx2IGk=
|
||||
golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/term v0.0.0-20201113234701-d7a72108b828 h1:htWEtQEuEVJ4tU/Ngx7Cd/4Q7e3A5Up1owgyBtVsTwk=
|
||||
golang.org/x/term v0.0.0-20201113234701-d7a72108b828/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
|
|
|
@ -112,7 +112,7 @@ func (c *databaseClient) do(ctx context.Context, method, path, resourceType, res
|
|||
}
|
||||
|
||||
func (c *databaseClient) _do(ctx context.Context, method, path, resourceType, resourceLink string, expectedStatusCode int, in, out interface{}, headers http.Header) (*http.Response, error) {
|
||||
req, err := http.NewRequestWithContext(ctx, method, "https://"+c.databaseAccount+".documents.azure.com/"+path, nil)
|
||||
req, err := http.NewRequestWithContext(ctx, method, "https://"+c.databaseHostname+"/"+path, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
@ -30,12 +30,12 @@ type Databases struct {
|
|||
}
|
||||
|
||||
type databaseClient struct {
|
||||
log *logrus.Entry
|
||||
hc *http.Client
|
||||
jsonHandle *codec.JsonHandle
|
||||
databaseAccount string
|
||||
masterKey []byte
|
||||
maxRetries int
|
||||
log *logrus.Entry
|
||||
hc *http.Client
|
||||
jsonHandle *codec.JsonHandle
|
||||
databaseHostname string
|
||||
masterKey []byte
|
||||
maxRetries int
|
||||
}
|
||||
|
||||
// DatabaseClient is a database client
|
||||
|
@ -59,15 +59,15 @@ type DatabaseIterator interface {
|
|||
}
|
||||
|
||||
// NewDatabaseClient returns a new database client
|
||||
func NewDatabaseClient(log *logrus.Entry, hc *http.Client, jsonHandle *codec.JsonHandle, databaseAccount, masterKey string) (DatabaseClient, error) {
|
||||
func NewDatabaseClient(log *logrus.Entry, hc *http.Client, jsonHandle *codec.JsonHandle, databaseHostname, masterKey string) (DatabaseClient, error) {
|
||||
var err error
|
||||
|
||||
c := &databaseClient{
|
||||
log: log,
|
||||
hc: hc,
|
||||
jsonHandle: jsonHandle,
|
||||
databaseAccount: databaseAccount,
|
||||
maxRetries: 10,
|
||||
log: log,
|
||||
hc: hc,
|
||||
jsonHandle: jsonHandle,
|
||||
databaseHostname: databaseHostname,
|
||||
maxRetries: 10,
|
||||
}
|
||||
|
||||
c.masterKey, err = base64.StdEncoding.DecodeString(masterKey)
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -366,7 +366,7 @@ github.com/hashicorp/golang-lru/simplelru
|
|||
github.com/imdario/mergo
|
||||
# github.com/inconshreveable/mousetrap v1.0.0
|
||||
github.com/inconshreveable/mousetrap
|
||||
# github.com/jim-minter/go-cosmosdb v0.0.0-20200923160222-1528d2db09d6
|
||||
# github.com/jim-minter/go-cosmosdb v0.0.0-20201117192055-43b4b21373cc
|
||||
## explicit
|
||||
github.com/jim-minter/go-cosmosdb/cmd/gencosmosdb
|
||||
github.com/jim-minter/go-cosmosdb/pkg/gencosmosdb
|
||||
|
@ -811,7 +811,6 @@ golang.org/x/oauth2/jwt
|
|||
golang.org/x/sync/errgroup
|
||||
golang.org/x/sync/semaphore
|
||||
# golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48
|
||||
## explicit
|
||||
golang.org/x/sys/cpu
|
||||
golang.org/x/sys/internal/unsafeheader
|
||||
golang.org/x/sys/plan9
|
||||
|
|
Загрузка…
Ссылка в новой задаче