diff --git a/cmd/common.go b/cmd/common.go index a55500752..c32288b94 100644 --- a/cmd/common.go +++ b/cmd/common.go @@ -6,7 +6,7 @@ import ( "net/http" "os" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/fatih/color" "github.com/kong/deck/diff" "github.com/kong/deck/dump" diff --git a/dump/dump.go b/dump/dump.go index f6d79e9c0..adcb722cb 100644 --- a/dump/dump.go +++ b/dump/dump.go @@ -693,7 +693,7 @@ func GetAllMTLSAuths(ctx context.Context, func GetAllRBACRoles(ctx context.Context, client *kong.Client) ([]*kong.RBACRole, error) { - roles, err := client.RBACRoles.List(ctx) + roles, err := client.RBACRoles.ListAll(ctx) if err != nil { return nil, err } @@ -708,7 +708,7 @@ func GetAllRBACREndpointPermissions(ctx context.Context, client *kong.Client) ([]*kong.RBACEndpointPermission, error) { var eps = []*kong.RBACEndpointPermission{} - roles, err := client.RBACRoles.List(ctx) + roles, err := client.RBACRoles.ListAll(ctx) if err != nil { return nil, err } diff --git a/file/builder.go b/file/builder.go index 203848b0b..7094a20e0 100644 --- a/file/builder.go +++ b/file/builder.go @@ -1,7 +1,7 @@ package file import ( - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/kong/deck/konnect" "github.com/kong/deck/state" "github.com/kong/deck/utils" diff --git a/file/builder_test.go b/file/builder_test.go index de432cc77..476a4d2d5 100644 --- a/file/builder_test.go +++ b/file/builder_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/kong/deck/state" "github.com/kong/deck/utils" "github.com/kong/go-kong/kong" diff --git a/file/reader.go b/file/reader.go index fc11e3b10..74ba075e1 100644 --- a/file/reader.go +++ b/file/reader.go @@ -3,7 +3,7 @@ package file import ( "fmt" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/kong/deck/state" "github.com/kong/deck/utils" "github.com/pkg/errors" diff --git a/file/schema.go b/file/schema.go index 45a4b78cf..9988b291e 100644 --- a/file/schema.go +++ b/file/schema.go @@ -1378,6 +1378,9 @@ const contentSchema = `{ "updated_at": { "type": "integer" }, + "url": { + "type": "string" + }, "write_timeout": { "type": "integer" } diff --git a/go.mod b/go.mod index bf8de776f..a9a964dbe 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,20 @@ module github.com/kong/deck +go 1.16 + require ( github.com/alecthomas/jsonschema v0.0.0-20191017121752-4bb6e3fae4f2 - github.com/blang/semver v0.0.0-20190414102917-ba2c2ddd8906 + github.com/blang/semver/v4 v4.0.0 github.com/cenkalti/backoff/v4 v4.1.0 github.com/fatih/color v1.10.0 github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/ghodss/yaml v1.0.0 github.com/google/go-querystring v1.1.0 - github.com/hashicorp/go-immutable-radix v1.2.0 // indirect + github.com/hashicorp/go-immutable-radix v1.3.0 // indirect github.com/hashicorp/go-memdb v1.1.2 github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/imdario/mergo v0.3.9 - github.com/kong/go-kong v0.15.0 + github.com/kong/go-kong v0.17.0 github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/mapstructure v1.2.2 // indirect github.com/onsi/ginkgo v1.7.0 // indirect @@ -25,7 +27,7 @@ require ( github.com/spf13/cobra v0.0.7 github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/viper v1.6.2 - github.com/stretchr/testify v1.6.1 + github.com/stretchr/testify v1.7.0 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonschema v1.2.0 github.com/yudai/gojsondiff v1.0.0 @@ -36,5 +38,3 @@ require ( gopkg.in/yaml.v2 v2.2.8 k8s.io/code-generator v0.20.5 ) - -go 1.16 diff --git a/go.sum b/go.sum index f627dcb79..f7f859dab 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/blang/semver v0.0.0-20190414102917-ba2c2ddd8906 h1:KGe2go3VELJLcQfKBUlviUzERqg79dO6VYzCvQxF01w= -github.com/blang/semver v0.0.0-20190414102917-ba2c2ddd8906/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/cenkalti/backoff/v4 v4.1.0 h1:c8LkOFQTzuO0WBM/ae5HdGQuZPfPxp7lqBRwQRm4fSc= github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -76,7 +76,6 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -90,8 +89,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmg github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.2.0 h1:l6UW37iCXwZkZoAbEYnptSHVE/cQ5bOTPYG5W3vf9+8= -github.com/hashicorp/go-immutable-radix v1.2.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE= +github.com/hashicorp/go-immutable-radix v1.3.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-memdb v1.1.2 h1:/xeGrWlD1+X26mLdgLDKzQHPsMG8Z3u7N/S1M7/Gjk8= github.com/hashicorp/go-memdb v1.1.2/go.mod h1:LWQ8R70vPrS4OEY9k28D2z8/Zzyu34NVzeRibGAzHO0= github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM= @@ -117,8 +116,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kong/go-kong v0.15.0 h1:9Y+7iqh7/0z8/BppAaLEV7ueSSyqK6lJOHFvqJnSSqM= -github.com/kong/go-kong v0.15.0/go.mod h1:oF4kdI9l/a8ndDW2ayJA0yhDBpO8Qt2aLiJEv10hqnQ= +github.com/kong/go-kong v0.17.0 h1:AMSR5D56TZ1hLlV7COyCdUNOFmF/mEVD+Can7phQh3k= +github.com/kong/go-kong v0.17.0/go.mod h1:T/MHPd5NzX68Kn8zSIWOjpEBbiMKAyoEps9yYukTZck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -217,8 +216,9 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=