From 2745592de44428d856e98669cb307a3ab7cca219 Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Mon, 9 Mar 2020 16:37:02 +0100 Subject: [PATCH 1/5] feat(k8s): add wait flag to cluster actions Signed-off-by: Patrik Cyvoct --- ...age-k8s-cluster-create-usage.stderr.golden | 1 + ...age-k8s-cluster-delete-usage.stderr.golden | 1 + ...age-k8s-cluster-update-usage.stderr.golden | 1 + ...ge-k8s-cluster-upgrade-usage.stderr.golden | 1 + go.mod | 1 + go.sum | 2 + internal/namespaces/k8s/v1beta4/custom.go | 4 ++ .../namespaces/k8s/v1beta4/custom_cluster.go | 47 +++++++++++++++++++ 8 files changed, 58 insertions(+) diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.stderr.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.stderr.golden index fe1b784204..c27e19c67e 100644 --- a/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.stderr.golden +++ b/cmd/scw/testdata/test-all-usage-k8s-cluster-create-usage.stderr.golden @@ -37,6 +37,7 @@ ARGS: FLAGS: -h, --help help for create + -w, --wait wait until the cluster is ready GLOBAL FLAGS: -D, --debug Enable debug mode diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.stderr.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.stderr.golden index 856b9ce7ea..f9b7883905 100644 --- a/cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.stderr.golden +++ b/cmd/scw/testdata/test-all-usage-k8s-cluster-delete-usage.stderr.golden @@ -9,6 +9,7 @@ ARGS: FLAGS: -h, --help help for delete + -w, --wait wait until the cluster is ready GLOBAL FLAGS: -D, --debug Enable debug mode diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.stderr.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.stderr.golden index 7a3619f21c..d607e4305f 100644 --- a/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.stderr.golden +++ b/cmd/scw/testdata/test-all-usage-k8s-cluster-update-usage.stderr.golden @@ -33,6 +33,7 @@ ARGS: FLAGS: -h, --help help for update + -w, --wait wait until the cluster is ready GLOBAL FLAGS: -D, --debug Enable debug mode diff --git a/cmd/scw/testdata/test-all-usage-k8s-cluster-upgrade-usage.stderr.golden b/cmd/scw/testdata/test-all-usage-k8s-cluster-upgrade-usage.stderr.golden index 337a4a9cfd..3beca0f15b 100644 --- a/cmd/scw/testdata/test-all-usage-k8s-cluster-upgrade-usage.stderr.golden +++ b/cmd/scw/testdata/test-all-usage-k8s-cluster-upgrade-usage.stderr.golden @@ -11,6 +11,7 @@ ARGS: FLAGS: -h, --help help for upgrade + -w, --wait wait until the cluster is ready GLOBAL FLAGS: -D, --debug Enable debug mode diff --git a/go.mod b/go.mod index 3847ae37ce..bc5754d29f 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.4.0 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v2 v2.2.5 // indirect ) diff --git a/go.sum b/go.sum index 270545c836..cb9d269594 100644 --- a/go.sum +++ b/go.sum @@ -127,6 +127,8 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= diff --git a/internal/namespaces/k8s/v1beta4/custom.go b/internal/namespaces/k8s/v1beta4/custom.go index 5b9c64e3fd..a8d7f5c826 100644 --- a/internal/namespaces/k8s/v1beta4/custom.go +++ b/internal/namespaces/k8s/v1beta4/custom.go @@ -18,6 +18,10 @@ func GetCommands() *core.Commands { human.RegisterMarshalerFunc(k8s.ClusterStatus(0), human.BindAttributesMarshalFunc(clusterStatusAttributes)) cmds.MustFind("k8s", "cluster", "list-available-versions").Override(clusterAvailableVersionsListBuilder) + cmds.MustFind("k8s", "cluster", "create").Override(clusterCreateBuilder) + cmds.MustFind("k8s", "cluster", "update").Override(clusterUpdateBuilder) + cmds.MustFind("k8s", "cluster", "upgrade").Override(clusterUpgradeBuilder) + cmds.MustFind("k8s", "cluster", "delete").Override(clusterDeleteBuilder) return cmds } diff --git a/internal/namespaces/k8s/v1beta4/custom_cluster.go b/internal/namespaces/k8s/v1beta4/custom_cluster.go index c87cb4328d..03df6027cd 100644 --- a/internal/namespaces/k8s/v1beta4/custom_cluster.go +++ b/internal/namespaces/k8s/v1beta4/custom_cluster.go @@ -2,11 +2,20 @@ package k8s import ( "context" + "fmt" + "net/http" + "time" "github.com/fatih/color" "github.com/scaleway/scaleway-cli/internal/core" "github.com/scaleway/scaleway-cli/internal/human" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1beta4" + "github.com/scaleway/scaleway-sdk-go/scw" + "golang.org/x/xerrors" +) + +const ( + clusterActionTimeout = 10 * time.Minute ) // @@ -40,3 +49,41 @@ func clusterAvailableVersionsListBuilder(c *core.Command) *core.Command { return c } + +func clusterCreateBuilder(c *core.Command) *core.Command { + c.WaitFunc = waitForClusterFunc() + return c +} + +func clusterDeleteBuilder(c *core.Command) *core.Command { + c.WaitFunc = waitForClusterFunc() + return c +} + +func clusterUpgradeBuilder(c *core.Command) *core.Command { + c.WaitFunc = waitForClusterFunc() + return c +} + +func clusterUpdateBuilder(c *core.Command) *core.Command { + c.WaitFunc = waitForClusterFunc() + return c +} + +func waitForClusterFunc() core.WaitFunc { + return func(ctx context.Context, _, respI interface{}) (interface{}, error) { + cluster, err := k8s.NewAPI(core.ExtractClient(ctx)).WaitForCluster(&k8s.WaitForClusterRequest{ + Region: respI.(*k8s.Cluster).Region, + ClusterID: respI.(*k8s.Cluster).ID, + Timeout: scw.DurationPtr(clusterActionTimeout), + }) + if err != nil { + notFoundError := &scw.ResourceNotFoundError{} + responseError := &scw.ResponseError{} + if xerrors.As(err, &responseError) && responseError.StatusCode == http.StatusNotFound || xerrors.As(err, ¬FoundError) { + return fmt.Sprintf("Cluster %s successfully deleted.", respI.(*k8s.Cluster).ID), nil + } + } + return cluster, nil + } +} From be1dfdeb779a1b1702d3f5ac87ab3f4cd6fd3da0 Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Tue, 10 Mar 2020 18:35:21 +0100 Subject: [PATCH 2/5] fix review Signed-off-by: Patrik Cyvoct --- go.mod | 1 - go.sum | 52 ------------------- .../namespaces/k8s/v1beta4/custom_cluster.go | 39 +++++++++----- 3 files changed, 26 insertions(+), 66 deletions(-) diff --git a/go.mod b/go.mod index bc5754d29f..3847ae37ce 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,6 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.4.0 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v2 v2.2.5 // indirect ) diff --git a/go.sum b/go.sum index cb9d269594..2ef8bf4d05 100644 --- a/go.sum +++ b/go.sum @@ -1,28 +1,17 @@ -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U= github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= -github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo= github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= -github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 h1:GDQdwm/gAcJcLAKQQZGOJ4knlw+7rfEQQcmwTbt4p5E= github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 h1:G1bPvciwNyF7IUmKXNt9Ak3m6u9DE1rF+RmtIkBpVdA= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/certifi/gocertifi v0.0.0-20200104152315-a6d78f326758 h1:epkmRmrjzR0Km6DrVMk/ZQwDdMY2w31I3kQT91DbxS0= github.com/certifi/gocertifi v0.0.0-20200104152315-a6d78f326758/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible h1:bXhRBIXoTm9BYHS3gE0TtQuyNZyeEMux2sDi4oo5YOo= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -31,11 +20,8 @@ github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= @@ -45,95 +31,57 @@ github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uP github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200212160027-75ab2f6aeda3 h1:BQb9gbsenI8ZwZmfN7O93VrlXW8eiDlL7Mz+glsK/os= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200212160027-75ab2f6aeda3/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200226081452-7bdc7806b035 h1:PGuOvUWTkkNFh/cN4IIR45YaFWfbLgijvarr7mBqUFg= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200226081452-7bdc7806b035/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= -github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 h1:mKdxBk7AujPs8kU4m80U72y/zjbZ3UcXC7dClwKbUI0= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a h1:1n5lsVfiQW3yfsRGu98756EH1YthsFqr/5mxHduZW2A= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47 h1:/XfQ9z7ib8eEJX2hdgFTZJ/ntt0swNk5oYBziWeTCvY= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/internal/namespaces/k8s/v1beta4/custom_cluster.go b/internal/namespaces/k8s/v1beta4/custom_cluster.go index 03df6027cd..edf8695665 100644 --- a/internal/namespaces/k8s/v1beta4/custom_cluster.go +++ b/internal/namespaces/k8s/v1beta4/custom_cluster.go @@ -2,6 +2,7 @@ package k8s import ( "context" + "errors" "fmt" "net/http" "time" @@ -11,7 +12,6 @@ import ( "github.com/scaleway/scaleway-cli/internal/human" k8s "github.com/scaleway/scaleway-sdk-go/api/k8s/v1beta4" "github.com/scaleway/scaleway-sdk-go/scw" - "golang.org/x/xerrors" ) const ( @@ -32,6 +32,10 @@ var ( k8s.ClusterStatusUpdating: color.FgBlue, k8s.ClusterStatusWarning: color.FgHiYellow, } + clusterActionCreate = "create" + clusterActionUpdate = "update" + clusterActionUpgrade = "upgrade" + clusterActionDelete = "delete" ) func clusterAvailableVersionsListBuilder(c *core.Command) *core.Command { @@ -51,39 +55,48 @@ func clusterAvailableVersionsListBuilder(c *core.Command) *core.Command { } func clusterCreateBuilder(c *core.Command) *core.Command { - c.WaitFunc = waitForClusterFunc() + c.WaitFunc = waitForClusterFunc(clusterActionCreate) return c } func clusterDeleteBuilder(c *core.Command) *core.Command { - c.WaitFunc = waitForClusterFunc() + c.WaitFunc = waitForClusterFunc(clusterActionDelete) return c } func clusterUpgradeBuilder(c *core.Command) *core.Command { - c.WaitFunc = waitForClusterFunc() + c.WaitFunc = waitForClusterFunc(clusterActionUpgrade) return c } func clusterUpdateBuilder(c *core.Command) *core.Command { - c.WaitFunc = waitForClusterFunc() + c.WaitFunc = waitForClusterFunc(clusterActionUpdate) return c } -func waitForClusterFunc() core.WaitFunc { +func waitForClusterFunc(action string) core.WaitFunc { return func(ctx context.Context, _, respI interface{}) (interface{}, error) { - cluster, err := k8s.NewAPI(core.ExtractClient(ctx)).WaitForCluster(&k8s.WaitForClusterRequest{ + _, err := k8s.NewAPI(core.ExtractClient(ctx)).WaitForCluster(&k8s.WaitForClusterRequest{ Region: respI.(*k8s.Cluster).Region, ClusterID: respI.(*k8s.Cluster).ID, Timeout: scw.DurationPtr(clusterActionTimeout), }) - if err != nil { - notFoundError := &scw.ResourceNotFoundError{} - responseError := &scw.ResponseError{} - if xerrors.As(err, &responseError) && responseError.StatusCode == http.StatusNotFound || xerrors.As(err, ¬FoundError) { - return fmt.Sprintf("Cluster %s successfully deleted.", respI.(*k8s.Cluster).ID), nil + switch action { + case clusterActionCreate: + return fmt.Sprintf("Custer %s successfully created.", respI.(*k8s.Cluster).ID), nil + case clusterActionUpdate: + return fmt.Sprintf("Custer %s successfully updated.", respI.(*k8s.Cluster).ID), nil + case clusterActionUpgrade: + return fmt.Sprintf("Custer %s successfully upgraded.", respI.(*k8s.Cluster).ID), nil + case clusterActionDelete: + if err != nil { + notFoundError := &scw.ResourceNotFoundError{} + responseError := &scw.ResponseError{} + if errors.As(err, &responseError) && responseError.StatusCode == http.StatusNotFound || errors.As(err, ¬FoundError) { + return fmt.Sprintf("Custer %s successfully deleted.", respI.(*k8s.Cluster).ID), nil + } } } - return cluster, nil + return nil, err } } From e280a6cc93e41792ff9a41e964b74e96a75aec2e Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Wed, 11 Mar 2020 09:29:28 +0100 Subject: [PATCH 3/5] fix review bis Signed-off-by: Patrik Cyvoct --- .../namespaces/k8s/v1beta4/custom_cluster.go | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/internal/namespaces/k8s/v1beta4/custom_cluster.go b/internal/namespaces/k8s/v1beta4/custom_cluster.go index edf8695665..d98646d6da 100644 --- a/internal/namespaces/k8s/v1beta4/custom_cluster.go +++ b/internal/namespaces/k8s/v1beta4/custom_cluster.go @@ -32,10 +32,13 @@ var ( k8s.ClusterStatusUpdating: color.FgBlue, k8s.ClusterStatusWarning: color.FgHiYellow, } - clusterActionCreate = "create" - clusterActionUpdate = "update" - clusterActionUpgrade = "upgrade" - clusterActionDelete = "delete" +) + +const ( + clusterActionCreate = iota + clusterActionUpdate + clusterActionUpgrade + clusterActionDelete ) func clusterAvailableVersionsListBuilder(c *core.Command) *core.Command { @@ -74,7 +77,7 @@ func clusterUpdateBuilder(c *core.Command) *core.Command { return c } -func waitForClusterFunc(action string) core.WaitFunc { +func waitForClusterFunc(action int) core.WaitFunc { return func(ctx context.Context, _, respI interface{}) (interface{}, error) { _, err := k8s.NewAPI(core.ExtractClient(ctx)).WaitForCluster(&k8s.WaitForClusterRequest{ Region: respI.(*k8s.Cluster).Region, @@ -83,17 +86,17 @@ func waitForClusterFunc(action string) core.WaitFunc { }) switch action { case clusterActionCreate: - return fmt.Sprintf("Custer %s successfully created.", respI.(*k8s.Cluster).ID), nil + return fmt.Sprintf("Cluster %s successfully created.", respI.(*k8s.Cluster).ID), nil case clusterActionUpdate: - return fmt.Sprintf("Custer %s successfully updated.", respI.(*k8s.Cluster).ID), nil + return fmt.Sprintf("Cluster %s successfully updated.", respI.(*k8s.Cluster).ID), nil case clusterActionUpgrade: - return fmt.Sprintf("Custer %s successfully upgraded.", respI.(*k8s.Cluster).ID), nil + return fmt.Sprintf("Cluster %s successfully upgraded.", respI.(*k8s.Cluster).ID), nil case clusterActionDelete: if err != nil { notFoundError := &scw.ResourceNotFoundError{} responseError := &scw.ResponseError{} if errors.As(err, &responseError) && responseError.StatusCode == http.StatusNotFound || errors.As(err, ¬FoundError) { - return fmt.Sprintf("Custer %s successfully deleted.", respI.(*k8s.Cluster).ID), nil + return fmt.Sprintf("Cluster %s successfully deleted.", respI.(*k8s.Cluster).ID), nil } } } From cba20cd7422e25350e3ed23fae3afcc0ea8cb29a Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Wed, 11 Mar 2020 09:54:44 +0100 Subject: [PATCH 4/5] fix review ter Signed-off-by: Patrik Cyvoct --- internal/namespaces/k8s/v1beta4/custom_cluster.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/namespaces/k8s/v1beta4/custom_cluster.go b/internal/namespaces/k8s/v1beta4/custom_cluster.go index d98646d6da..fa3852996a 100644 --- a/internal/namespaces/k8s/v1beta4/custom_cluster.go +++ b/internal/namespaces/k8s/v1beta4/custom_cluster.go @@ -93,6 +93,8 @@ func waitForClusterFunc(action int) core.WaitFunc { return fmt.Sprintf("Cluster %s successfully upgraded.", respI.(*k8s.Cluster).ID), nil case clusterActionDelete: if err != nil { + // if we get a 404 here, it means the resource was successfully deleted + // so we return a successfull message notFoundError := &scw.ResourceNotFoundError{} responseError := &scw.ResponseError{} if errors.As(err, &responseError) && responseError.StatusCode == http.StatusNotFound || errors.As(err, ¬FoundError) { From d92341f32f03269ba8381bb89fc3dca928732ca8 Mon Sep 17 00:00:00 2001 From: Patrik Date: Wed, 11 Mar 2020 09:57:36 +0100 Subject: [PATCH 5/5] Update internal/namespaces/k8s/v1beta4/custom_cluster.go Co-Authored-By: Bot from GolangCI <42910462+golangcibot@users.noreply.github.com> --- internal/namespaces/k8s/v1beta4/custom_cluster.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/namespaces/k8s/v1beta4/custom_cluster.go b/internal/namespaces/k8s/v1beta4/custom_cluster.go index fa3852996a..d902d8e4a0 100644 --- a/internal/namespaces/k8s/v1beta4/custom_cluster.go +++ b/internal/namespaces/k8s/v1beta4/custom_cluster.go @@ -94,7 +94,6 @@ func waitForClusterFunc(action int) core.WaitFunc { case clusterActionDelete: if err != nil { // if we get a 404 here, it means the resource was successfully deleted - // so we return a successfull message notFoundError := &scw.ResourceNotFoundError{} responseError := &scw.ResponseError{} if errors.As(err, &responseError) && responseError.StatusCode == http.StatusNotFound || errors.As(err, ¬FoundError) {