diff --git a/cmd/plural/cd_clusters.go b/cmd/plural/cd_clusters.go index 750f5aeb..1f77e0c3 100644 --- a/cmd/plural/cd_clusters.go +++ b/cmd/plural/cd_clusters.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/cd" "github.com/pluralsh/plural-cli/pkg/console" "github.com/pluralsh/plural-cli/pkg/console/errors" diff --git a/cmd/plural/cd_contexts.go b/cmd/plural/cd_contexts.go index 1a6cc434..f2faa79d 100644 --- a/cmd/plural/cd_contexts.go +++ b/cmd/plural/cd_contexts.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/console" "github.com/pluralsh/plural-cli/pkg/utils" "github.com/urfave/cli" diff --git a/cmd/plural/cd_credentials.go b/cmd/plural/cd_credentials.go index 073a42b3..dc68c0a4 100644 --- a/cmd/plural/cd_credentials.go +++ b/cmd/plural/cd_credentials.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/pkg/errors" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/utils" "github.com/urfave/cli" ) diff --git a/cmd/plural/cd_notifications.go b/cmd/plural/cd_notifications.go index 902eeccf..bacceea0 100644 --- a/cmd/plural/cd_notifications.go +++ b/cmd/plural/cd_notifications.go @@ -2,7 +2,7 @@ package plural import ( "github.com/AlecAivazis/survey/v2" - consoleclient "github.com/pluralsh/console-client-go" + consoleclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/utils" "github.com/pluralsh/polly/algorithms" "github.com/urfave/cli" diff --git a/cmd/plural/cd_providers.go b/cmd/plural/cd_providers.go index 1b1520be..13b499af 100644 --- a/cmd/plural/cd_providers.go +++ b/cmd/plural/cd_providers.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/AlecAivazis/survey/v2" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/urfave/cli" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cmd/plural/cd_repositories.go b/cmd/plural/cd_repositories.go index 2840fe6d..162f893e 100644 --- a/cmd/plural/cd_repositories.go +++ b/cmd/plural/cd_repositories.go @@ -3,7 +3,7 @@ package plural import ( "fmt" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/utils" "github.com/samber/lo" "github.com/urfave/cli" diff --git a/cmd/plural/cd_services.go b/cmd/plural/cd_services.go index a03b5d60..1067ff74 100644 --- a/cmd/plural/cd_services.go +++ b/cmd/plural/cd_services.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/cd/template" "github.com/pluralsh/plural-cli/pkg/console" "github.com/pluralsh/plural-cli/pkg/utils" diff --git a/cmd/plural/cd_settings.go b/cmd/plural/cd_settings.go index 5a19bfd4..ec845e13 100644 --- a/cmd/plural/cd_settings.go +++ b/cmd/plural/cd_settings.go @@ -1,7 +1,7 @@ package plural import ( - consoleclient "github.com/pluralsh/console-client-go" + consoleclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/utils" "github.com/urfave/cli" ) diff --git a/cmd/plural/cd_test.go b/cmd/plural/cd_test.go index 04abcf5f..859b6e61 100644 --- a/cmd/plural/cd_test.go +++ b/cmd/plural/cd_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - consoleclient "github.com/pluralsh/console-client-go" + consoleclient "github.com/pluralsh/console/go/client" plural "github.com/pluralsh/plural-cli/cmd/plural" "github.com/pluralsh/plural-cli/pkg/test/mocks" "github.com/stretchr/testify/assert" diff --git a/go.mod b/go.mod index c3a69558..ebb1ad40 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/Azure/go-autorest/autorest v0.11.29 github.com/Masterminds/semver v1.5.0 github.com/Masterminds/sprig/v3 v3.2.3 - github.com/Yamashou/gqlgenc v0.18.1 + github.com/Yamashou/gqlgenc v0.23.2 github.com/aws/aws-sdk-go-v2 v1.27.1 github.com/aws/aws-sdk-go-v2/service/iam v1.32.0 github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 @@ -56,8 +56,8 @@ require ( github.com/packethost/packngo v0.29.0 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 github.com/pluralsh/cluster-api-migration v0.2.16 - github.com/pluralsh/console-client-go v0.12.3 - github.com/pluralsh/gqlclient v1.11.0 + github.com/pluralsh/console/go/client v1.4.0 + github.com/pluralsh/gqlclient v1.12.1 github.com/pluralsh/plural-operator v0.5.5 github.com/pluralsh/polly v0.1.8 github.com/pluralsh/terraform-delinker v0.0.2 @@ -71,9 +71,9 @@ require ( github.com/xanzy/go-gitlab v0.73.1 github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 go.mercari.io/hcledit v0.0.8 - golang.org/x/crypto v0.22.0 + golang.org/x/crypto v0.24.0 golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc - golang.org/x/mod v0.17.0 + golang.org/x/mod v0.18.0 golang.org/x/oauth2 v0.19.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -94,7 +94,7 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/container v1.27.1 // indirect cloud.google.com/go/longrunning v0.5.4 // indirect - github.com/99designs/gqlgen v0.17.43 // indirect + github.com/99designs/gqlgen v0.17.49 // indirect github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect @@ -238,7 +238,7 @@ require ( github.com/sahilm/fuzzy v0.1.0 // indirect github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b // indirect github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 // indirect - github.com/sosodev/duration v1.2.0 // indirect + github.com/sosodev/duration v1.3.1 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/stoewer/go-strcase v1.2.0 // indirect @@ -253,7 +253,7 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect github.com/valyala/fasttemplate v1.2.1 // indirect - github.com/vektah/gqlparser/v2 v2.5.11 // indirect + github.com/vektah/gqlparser/v2 v2.5.16 // indirect github.com/wailsapp/mimetype v1.4.1 // indirect github.com/weaveworks/eksctl v0.177.0 // indirect github.com/weaveworks/goformation/v4 v4.10.2-0.20231113122203-bf1ae633f95c // indirect @@ -266,7 +266,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/arch v0.3.0 // indirect - golang.org/x/tools v0.20.0 // indirect + golang.org/x/tools v0.22.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect @@ -312,7 +312,7 @@ require ( github.com/cli/browser v1.0.0 // indirect github.com/cli/safeexec v1.0.0 // indirect github.com/containerd/containerd v1.7.12 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dimchansky/utfbom v1.1.1 // indirect @@ -411,16 +411,16 @@ require ( github.com/xlab/treeprint v1.2.0 // indirect go.opencensus.io v0.24.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect - golang.org/x/net v0.24.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/term v0.19.0 - golang.org/x/text v0.14.0 + golang.org/x/sys v0.21.0 // indirect + golang.org/x/term v0.21.0 + golang.org/x/text v0.16.0 golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.153.0 google.golang.org/grpc v1.60.1 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect k8s.io/apiextensions-apiserver v0.29.3 diff --git a/go.sum b/go.sum index 24cff5ce..6df5f01c 100644 --- a/go.sum +++ b/go.sum @@ -617,8 +617,8 @@ filippo.io/age v1.1.1 h1:pIpO7l151hCnQ4BdyBujnGP2YlUo0uj6sAVNHGBvXHg= filippo.io/age v1.1.1/go.mod h1:l03SrzDUrBkdBx8+IILdnn2KZysqQdbEBUQ4p3sqEQE= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= -github.com/99designs/gqlgen v0.17.43 h1:I4SYg6ahjowErAQcHFVKy5EcWuwJ3+Xw9z2fLpuFCPo= -github.com/99designs/gqlgen v0.17.43/go.mod h1:lO0Zjy8MkZgBdv4T1U91x09r0e0WFOdhVUutlQs1Rsc= +github.com/99designs/gqlgen v0.17.49 h1:b3hNGexHd33fBSAd4NDT/c3NCcQzcAVkknhN9ym36YQ= +github.com/99designs/gqlgen v0.17.49/go.mod h1:tC8YFVZMed81x7UJ7ORUwXF4Kn6SXuucFqQBhN8+BU0= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/AlecAivazis/survey/v2 v2.3.5 h1:A8cYupsAZkjaUmhtTYv3sSqc7LO5mp1XDfqe5E/9wRQ= @@ -726,8 +726,8 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/Yamashou/gqlgenc v0.18.1 h1:oO8Ao2bV6UlGhe6NcTcJRz3RrstfgDCRPwAxrl+urzc= -github.com/Yamashou/gqlgenc v0.18.1/go.mod h1:CwDJlhl8ZEP2mQarkhnqHn/U26ocokGM8hHmxG426NM= +github.com/Yamashou/gqlgenc v0.23.2 h1:WPxYPrwc6W4Z1eY4qKxoH3nb5PC4jAMWqQA0G8toQMI= +github.com/Yamashou/gqlgenc v0.23.2/go.mod h1:oMc4EQBQeDwLIODvgcvpaSp6rO+KMf47FuOhplv5D3A= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/acomagu/bufpipe v1.0.4 h1:e3H4WUzM3npvo5uv95QuJM3cQspFNtFBzvJ2oNjKIDQ= github.com/acomagu/bufpipe v1.0.4/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= @@ -995,8 +995,9 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -1883,16 +1884,12 @@ github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo= github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= github.com/pluralsh/cluster-api-migration v0.2.16 h1:MQGrLQAhGSSpyjEDamhnJZaQ8MkxlHzR8PZxIVavLIM= github.com/pluralsh/cluster-api-migration v0.2.16/go.mod h1:24PjMsYv3vSlUiYw7BeUQ0GAtK0Jk2B1iwh35WGQLx8= -github.com/pluralsh/console-client-go v0.9.0 h1:2rCPLVeooSV6WKfIKxqssloE1e6AkdP6LWwueQQlBsg= -github.com/pluralsh/console-client-go v0.9.0/go.mod h1:eyCiLA44YbXiYyJh8303jk5JdPkt9McgCo5kBjk4lKo= -github.com/pluralsh/console-client-go v0.9.1 h1:o2khvyRu/d3ndehbX02CjnMbU6i0smhulhe0OYnp8yE= -github.com/pluralsh/console-client-go v0.9.1/go.mod h1:eyCiLA44YbXiYyJh8303jk5JdPkt9McgCo5kBjk4lKo= -github.com/pluralsh/console-client-go v0.12.3 h1:cx/a9eAPgohzcDyNs/5BQXYA9WRWcXCyNzNzLwTd3T8= -github.com/pluralsh/console-client-go v0.12.3/go.mod h1:eyCiLA44YbXiYyJh8303jk5JdPkt9McgCo5kBjk4lKo= +github.com/pluralsh/console/go/client v1.4.0 h1:Mr/gyU20jrLZZ9diEznv3aU/CJ5wk13qLes/4O9unwM= +github.com/pluralsh/console/go/client v1.4.0/go.mod h1:lpoWASYsM9keNePS3dpFiEisUHEfObIVlSL3tzpKn8k= github.com/pluralsh/controller-reconcile-helper v0.0.4 h1:1o+7qYSyoeqKFjx+WgQTxDz4Q2VMpzprJIIKShxqG0E= github.com/pluralsh/controller-reconcile-helper v0.0.4/go.mod h1:AfY0gtteD6veBjmB6jiRx/aR4yevEf6K0M13/pGan/s= -github.com/pluralsh/gqlclient v1.11.0 h1:FfXW7FiEJLHOfTAa7NxDb8jb3aMZNIpCAcG+bg8uHYA= -github.com/pluralsh/gqlclient v1.11.0/go.mod h1:qSXKUlio1F2DRPy8el4oFYsmpKbkUYspgPB87T4it5I= +github.com/pluralsh/gqlclient v1.12.1 h1:JDOkP9jjqkPdTYdpH5hooG4F8T6FDH90XfipeXJmJFY= +github.com/pluralsh/gqlclient v1.12.1/go.mod h1:OEjN9L63x8m3A3eQBv5kVkFgiY9fp2aZ0cgOF0uII58= github.com/pluralsh/helm-docs v1.11.3-0.20230914191425-6d14ebab8817 h1:J7SGxH6nJGdRoNtqdzhyr2VMpbl4asolul7xqqW++EA= github.com/pluralsh/helm-docs v1.11.3-0.20230914191425-6d14ebab8817/go.mod h1:rLqec59NO7YF57Rq9VlubQHMp7wcRTJhzpkcgs4lOG4= github.com/pluralsh/oauth v0.9.2 h1:tM9hBK4tCnJUeCOgX0ctxBBCS3hiCDPoxkJLODtedmQ= @@ -2024,8 +2021,8 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/sosodev/duration v1.2.0 h1:pqK/FLSjsAADWY74SyWDCjOcd5l7H8GSnnOGEB9A1Us= -github.com/sosodev/duration v1.2.0/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg= +github.com/sosodev/duration v1.3.1 h1:qtHBDMQ6lvMQsL15g4aopM4HEfOaYuhWBw3NPTtlqq4= +github.com/sosodev/duration v1.3.1/go.mod h1:RQIBBX0+fMLc/D9+Jb/fwvVmo0eZvDDEERAikUR6SDg= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -2121,8 +2118,8 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/vektah/gqlparser/v2 v2.5.11 h1:JJxLtXIoN7+3x6MBdtIP59TP1RANnY7pXOaDnADQSf8= -github.com/vektah/gqlparser/v2 v2.5.11/go.mod h1:1rCcfwB2ekJofmluGWXMSEnPMZgbxzwj6FaZ/4OT8Cc= +github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0vy5p8= +github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= @@ -2322,8 +2319,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= +golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2391,8 +2388,8 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2485,8 +2482,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2678,8 +2675,8 @@ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= @@ -2701,8 +2698,8 @@ golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2722,8 +2719,9 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -2822,8 +2820,8 @@ golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg= -golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= -golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -3136,8 +3134,9 @@ google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/api/artifacts.go b/pkg/api/artifacts.go index 5e736744..493b1089 100644 --- a/pkg/api/artifacts.go +++ b/pkg/api/artifacts.go @@ -6,6 +6,7 @@ import ( "path/filepath" "github.com/pluralsh/gqlclient" + "github.com/pluralsh/gqlclient/pkg/utils" file "github.com/pluralsh/plural-cli/pkg/utils" "sigs.k8s.io/yaml" @@ -63,11 +64,12 @@ func (client *client) CreateArtifact(repo string, attrs ArtifactAttributes) (Art return artifact, err } - createArtifact, err := client.pluralClient.CreateArtifact(context.Background(), repo, attrs.Name, readme, attrs.Type, attrs.Platform, "blob", &attrs.Arch, gqlclient.WithFiles([]gqlclient.Upload{{ + client.pluralClient.Client.CustomDo = gqlclient.WithFiles([]gqlclient.Upload{{ Field: "blob", Name: attrs.Blob, R: rf, - }})) + }}, client.httpClient) + createArtifact, err := client.pluralClient.CreateArtifact(context.Background(), repo, attrs.Name, readme, attrs.Type, attrs.Platform, "blob", &attrs.Arch) if err != nil { return artifact, err } diff --git a/pkg/api/charts.go b/pkg/api/charts.go index b037f8b2..d61a4b6d 100644 --- a/pkg/api/charts.go +++ b/pkg/api/charts.go @@ -121,11 +121,11 @@ func (client *client) CreateCrd(repo string, chart string, file string) error { Name: file, Field: "blob", } - + client.pluralClient.Client.CustomDo = gqlclient.WithFiles([]gqlclient.Upload{upload}, client.httpClient) _, err = client.pluralClient.CreateCrd(context.Background(), gqlclient.ChartName{ Chart: &chart, Repo: &repo, - }, name, "blob", gqlclient.WithFiles([]gqlclient.Upload{upload})) + }, name, "blob") return err } diff --git a/pkg/api/client.go b/pkg/api/client.go index e2b36c53..1fde814a 100644 --- a/pkg/api/client.go +++ b/pkg/api/client.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - rawclient "github.com/Yamashou/gqlgenc/client" + rawclient "github.com/Yamashou/gqlgenc/clientv2" "github.com/pkg/errors" "github.com/pluralsh/gqlclient" @@ -105,6 +105,7 @@ type client struct { ctx context.Context pluralClient *gqlclient.Client config config.Config + httpClient *http.Client } func NewClient() Client { @@ -121,9 +122,10 @@ func FromConfig(conf *config.Config) Client { } return &client{ - pluralClient: gqlclient.NewClient(&httpClient, conf.Url()), + pluralClient: gqlclient.NewClient(&httpClient, conf.Url(), nil), config: *conf, ctx: context.Background(), + httpClient: &httpClient, } } diff --git a/pkg/api/repos.go b/pkg/api/repos.go index e345004e..38e281e2 100644 --- a/pkg/api/repos.go +++ b/pkg/api/repos.go @@ -143,8 +143,8 @@ func (client *client) CreateRepository(name, publisher string, input *gqlclient. input.Notes = ¬es } - - _, err = client.pluralClient.CreateRepository(context.Background(), name, publisher, *input, gqlclient.WithFiles(uploads)) + client.pluralClient.Client.CustomDo = gqlclient.WithFiles(uploads, client.httpClient) + _, err = client.pluralClient.CreateRepository(context.Background(), name, publisher, *input) return err } diff --git a/pkg/api/terraform.go b/pkg/api/terraform.go index 64c9d714..0b7aa214 100644 --- a/pkg/api/terraform.go +++ b/pkg/api/terraform.go @@ -97,13 +97,14 @@ func (client *client) UploadTerraform(dir, repoName string) (Terraform, error) { defer rf.Close() defer os.Remove(tarFile) - resp, err := client.pluralClient.UploadTerraform(client.ctx, repoName, name, "package", gqlclient.WithFiles([]gqlclient.Upload{ + client.pluralClient.Client.CustomDo = gqlclient.WithFiles([]gqlclient.Upload{ { Field: "package", Name: tarFile, R: rf, }, - })) + }, client.httpClient) + resp, err := client.pluralClient.UploadTerraform(client.ctx, repoName, name, "package") if err != nil { return tf, err } diff --git a/pkg/api/users.go b/pkg/api/users.go index 82dbb6e4..cf786efc 100644 --- a/pkg/api/users.go +++ b/pkg/api/users.go @@ -240,9 +240,7 @@ func (client *client) ListKeyBackups() ([]*KeyBackup, error) { return nil, err } - backups := algorithms.Map(resp.KeyBackups.Edges, func(edge *struct { - Node *gqlclient.KeyBackupFragment "json:\"node\" graphql:\"node\"" - }) *KeyBackup { + backups := algorithms.Map(resp.KeyBackups.Edges, func(edge *gqlclient.Backups_KeyBackups_Edges) *KeyBackup { return convertKeyBackup(edge.Node) }) diff --git a/pkg/cd/clusters_create.go b/pkg/cd/clusters_create.go index 36dd4216..90bdda69 100644 --- a/pkg/cd/clusters_create.go +++ b/pkg/cd/clusters_create.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/AlecAivazis/survey/v2" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" ) diff --git a/pkg/cd/clusters_get_credentials.go b/pkg/cd/clusters_get_credentials.go index 01d3e44f..24dccde1 100644 --- a/pkg/cd/clusters_get_credentials.go +++ b/pkg/cd/clusters_get_credentials.go @@ -3,7 +3,7 @@ package cd import ( "fmt" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/pkg/cd/eject.go b/pkg/cd/eject.go index c6902291..18949444 100644 --- a/pkg/cd/eject.go +++ b/pkg/cd/eject.go @@ -1,7 +1,7 @@ package cd import ( - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" ) func Eject(_ *gqlclient.ClusterFragment) error { diff --git a/pkg/cd/providers_create.go b/pkg/cd/providers_create.go index 8b1a83e2..9b5d8e9e 100644 --- a/pkg/cd/providers_create.go +++ b/pkg/cd/providers_create.go @@ -6,7 +6,7 @@ import ( "os" "github.com/AlecAivazis/survey/v2" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" ) diff --git a/pkg/cd/template/render.go b/pkg/cd/template/render.go index 315d877f..c2735f00 100644 --- a/pkg/cd/template/render.go +++ b/pkg/cd/template/render.go @@ -5,7 +5,7 @@ import ( "os" "strings" - console "github.com/pluralsh/console-client-go" + console "github.com/pluralsh/console/go/client" "github.com/pluralsh/polly/template" ) diff --git a/pkg/cd/template/utils.go b/pkg/cd/template/utils.go index 0cccefc3..86ec061e 100644 --- a/pkg/cd/template/utils.go +++ b/pkg/cd/template/utils.go @@ -3,7 +3,7 @@ package template import ( "strings" - console "github.com/pluralsh/console-client-go" + console "github.com/pluralsh/console/go/client" ) func clusterConfiguration(cluster *console.BaseClusterFragment) map[string]interface{} { diff --git a/pkg/console/clusters.go b/pkg/console/clusters.go index 71d496c8..d8f6b465 100644 --- a/pkg/console/clusters.go +++ b/pkg/console/clusters.go @@ -3,7 +3,7 @@ package console import ( "fmt" - consoleclient "github.com/pluralsh/console-client-go" + consoleclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" "github.com/samber/lo" ) diff --git a/pkg/console/console.go b/pkg/console/console.go index 073019e4..0ba04325 100644 --- a/pkg/console/console.go +++ b/pkg/console/console.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - consoleclient "github.com/pluralsh/console-client-go" + consoleclient "github.com/pluralsh/console/go/client" ) type consoleClient struct { diff --git a/pkg/console/contexts.go b/pkg/console/contexts.go index 2975c27d..493b7393 100644 --- a/pkg/console/contexts.go +++ b/pkg/console/contexts.go @@ -3,7 +3,7 @@ package console import ( "fmt" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" ) diff --git a/pkg/console/describe.go b/pkg/console/describe.go index e477bb72..ba9b9939 100644 --- a/pkg/console/describe.go +++ b/pkg/console/describe.go @@ -9,7 +9,7 @@ import ( "strings" "text/tabwriter" - consoleclient "github.com/pluralsh/console-client-go" + consoleclient "github.com/pluralsh/console/go/client" "k8s.io/cli-runtime/pkg/printers" ) diff --git a/pkg/console/notification.go b/pkg/console/notification.go index 38d7e59a..88e2b428 100644 --- a/pkg/console/notification.go +++ b/pkg/console/notification.go @@ -1,7 +1,7 @@ package console import ( - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" ) func (c *consoleClient) ListNotificationSinks(after *string, first *int64) (*gqlclient.ListNotificationSinks_NotificationSinks, error) { diff --git a/pkg/console/pipelines.go b/pkg/console/pipelines.go index 731e9bc5..8402f281 100644 --- a/pkg/console/pipelines.go +++ b/pkg/console/pipelines.go @@ -3,7 +3,7 @@ package console import ( "strings" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" "github.com/pluralsh/plural-cli/pkg/utils" "github.com/pluralsh/polly/algorithms" diff --git a/pkg/console/providers.go b/pkg/console/providers.go index 9ba3e13d..32752502 100644 --- a/pkg/console/providers.go +++ b/pkg/console/providers.go @@ -1,7 +1,7 @@ package console import ( - consoleclient "github.com/pluralsh/console-client-go" + consoleclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" ) diff --git a/pkg/console/repositories.go b/pkg/console/repositories.go index f3e736bb..cb943f1d 100644 --- a/pkg/console/repositories.go +++ b/pkg/console/repositories.go @@ -1,7 +1,7 @@ package console import ( - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" ) diff --git a/pkg/console/services.go b/pkg/console/services.go index 7729f8f7..47767fae 100644 --- a/pkg/console/services.go +++ b/pkg/console/services.go @@ -3,7 +3,7 @@ package console import ( "fmt" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" ) diff --git a/pkg/console/settings.go b/pkg/console/settings.go index 4ff04c59..3a501121 100644 --- a/pkg/console/settings.go +++ b/pkg/console/settings.go @@ -3,7 +3,7 @@ package console import ( "fmt" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/api" ) diff --git a/pkg/console/stacks.go b/pkg/console/stacks.go index b4403cd0..defac4bf 100644 --- a/pkg/console/stacks.go +++ b/pkg/console/stacks.go @@ -1,7 +1,7 @@ package console import ( - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/samber/lo" ) diff --git a/pkg/stacks/helpers.go b/pkg/stacks/helpers.go index e72ca9b9..089485c5 100644 --- a/pkg/stacks/helpers.go +++ b/pkg/stacks/helpers.go @@ -3,7 +3,7 @@ package stacks import ( "fmt" - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" "github.com/pluralsh/plural-cli/pkg/console" ) diff --git a/pkg/test/mocks/ConsoleClient.go b/pkg/test/mocks/ConsoleClient.go index 158d9a2d..00657aba 100644 --- a/pkg/test/mocks/ConsoleClient.go +++ b/pkg/test/mocks/ConsoleClient.go @@ -3,7 +3,7 @@ package mocks import ( - gqlclient "github.com/pluralsh/console-client-go" + gqlclient "github.com/pluralsh/console/go/client" mock "github.com/stretchr/testify/mock" )