Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate console go client and plural go client #527

Merged
merged 2 commits into from
Jul 30, 2024
+89 −87
Merged

Migrate console go client and plural go client #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
566ed0e
migrate console GO client
zreigz Jul 29, 2024
acb1925
use new WithFiles
zreigz Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/plural/cd_clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/cd_contexts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/cd_credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/cd_notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/cd_providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/cd_repositories.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/cd_services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/cd_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/cd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
30 changes: 15 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading