Skip to content

feat: Implement DNS zone selection for AWS and Azure and update polly to the latest version #713

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

Merged
maciaszczykm merged 5 commits into from
Mar 18, 2026
Merged

feat: Implement DNS zone selection for AWS and Azure and update polly to the latest version #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2d22d1
use latest version of polly
maciaszczykm Mar 18, 2026
aae53c9
implement dropdown selection for Azure DNS zones in domain setup
maciaszczykm Mar 18, 2026
0f7e0db
implement dropdown selection for AWS hosted zones in domain setup
maciaszczykm Mar 18, 2026
990af86
remove redundant DNS zone selection logic for AWS and Azure
maciaszczykm Mar 18, 2026
e4cba83
streamline GCP provider logic in DNS zone selection
maciaszczykm Mar 18, 2026
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
4 changes: 2 additions & 2 deletions cmd/command/cd/cd_clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/AlecAivazis/survey/v2"
gqlclient "github.com/pluralsh/console/go/client"
"github.com/pluralsh/polly/algorithms"
"github.com/pluralsh/polly/containers"
"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/console/go/polly/containers"
"github.com/samber/lo"
"github.com/urfave/cli"
"sigs.k8s.io/yaml"
Expand Down
2 changes: 1 addition & 1 deletion cmd/command/cd/cd_notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package cd
import (
"github.com/AlecAivazis/survey/v2"
consoleclient "github.com/pluralsh/console/go/client"
"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/plural-cli/pkg/common"
"github.com/pluralsh/plural-cli/pkg/utils"
"github.com/pluralsh/polly/algorithms"
"github.com/urfave/cli"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/command/cd/cd_services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import (
"sort"
"strings"

"github.com/pluralsh/console/go/polly/fs"
"github.com/pluralsh/plural-cli/pkg/common"
"github.com/pluralsh/polly/fs"
lua "github.com/yuin/gopher-lua"

gqlclient "github.com/pluralsh/console/go/client"
"github.com/pluralsh/console/go/polly/containers"
"github.com/pluralsh/console/go/polly/luautils"
"github.com/pluralsh/plural-cli/pkg/cd/template"
"github.com/pluralsh/plural-cli/pkg/console"
"github.com/pluralsh/plural-cli/pkg/utils"
"github.com/pluralsh/polly/containers"
"github.com/pluralsh/polly/luautils"
"github.com/samber/lo"
"github.com/urfave/cli"
"k8s.io/apimachinery/pkg/util/yaml"
Expand Down
71 changes: 49 additions & 22 deletions cmd/command/up/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/AlecAivazis/survey/v2"
"github.com/pluralsh/polly/algorithms"
"github.com/pluralsh/console/go/polly/algorithms"
"github.com/samber/lo"
"github.com/urfave/cli"

Expand All @@ -26,6 +26,7 @@ import (

const (
defaultBootstrapBranch = "main"
noneOption = "None"
)

type Plural struct {
Expand Down Expand Up @@ -244,15 +245,52 @@ func askAppDomain(project *manifest.ProjectManifest) error {
}

var domain string
message := "Enter the domain for your application. It's expected that the root domain already exist in your clouds DNS provider. Leave empty to ignore:"
if project.Provider == api.ProviderGCP {
message = "Enter the DNS zone name for your application. This should be the DNS zone name already configured in your cloud's DNS provider. Leave empty to ignore:"
}
prompt := &survey.Input{
Message: message,
}
if err := survey.AskOne(prompt, &domain); err != nil {
return err

switch project.Provider {
case api.ProviderAWS:
hostedZones, err := provider.AWSHostedZones(context.Background(), project.Region)
if err != nil {
return err
}

if err := survey.AskOne(
&survey.Select{Message: "Select hosted zone (leave as None to skip):", Options: append([]string{noneOption}, hostedZones...)},
&domain,
); err != nil {
return err
}

if domain == noneOption {
domain = ""
}
case api.ProviderAzure:
dnsZones, err := provider.AzureDNSZones(context.Background(), project.Project)
if err != nil {
return err
}

if err := survey.AskOne(
&survey.Select{Message: "Select DNS zone (leave as None to skip):", Options: append([]string{noneOption}, dnsZones...)},
&domain,
); err != nil {
return err
}

if domain == noneOption {
domain = ""
}
case api.ProviderGCP:
if err := survey.AskOne(&survey.Input{
Message: "Enter the DNS zone name for your application. This should be the DNS zone name already configured in your cloud's DNS provider. Leave empty to ignore:",
}, &domain); err != nil {
return err
}
default:
if err := survey.AskOne(&survey.Input{
Message: "Enter the domain for your application. It's expected that the root domain already exist in your clouds DNS provider. Leave empty to ignore:",
}, &domain); err != nil {
return err
}
}

return processAppDomain(domain, project)
Expand All @@ -264,18 +302,7 @@ func processAppDomain(domain string, project *manifest.ProjectManifest) error {
return nil
}

switch project.Provider {
case api.ProviderAWS:
// For AWS, we need to validate that the domain is set up in Route 53.
if err := provider.ValidateAWSDomainRegistration(context.Background(), domain, project.Region); err != nil {
return err
}
case api.ProviderAzure:
// For Azure, we need to validate that the domain is set up in Azure DNS.
if err := provider.ValidateAzureDomainRegistration(context.Background(), domain, project.Project); err != nil {
return err
}
case api.ProviderGCP:
if project.Provider == api.ProviderGCP {
// For GCP, besides just validating that the domain is set up,
// we also need to determine the managed DNS zone to use.
// If there is one it will be automatically selected, if there are multiple,
Expand Down
12 changes: 7 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ require (
github.com/likexian/doh v0.7.1
github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/mapstructure v1.5.0
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
github.com/olekukonko/tablewriter v0.0.5
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
github.com/pluralsh/console/go/client v1.61.0
github.com/pluralsh/console/go/controller v0.0.0-20260129150042-18e31f596bd7
github.com/pluralsh/console/go/polly v1.0.0
github.com/pluralsh/gqlclient v1.12.2
github.com/pluralsh/plural-operator v0.5.5
github.com/pluralsh/polly v0.3.7
github.com/posthog/posthog-go v1.4.10
github.com/samber/lo v1.52.0
github.com/urfave/cli v1.22.16
Expand All @@ -60,7 +60,7 @@ require (
gotest.tools/v3 v3.5.1
helm.sh/helm/v3 v3.20.0
k8s.io/api v0.35.1
k8s.io/apimachinery v0.35.1
k8s.io/apimachinery v0.35.2
k8s.io/client-go v0.35.1
sigs.k8s.io/controller-runtime v0.23.1
sigs.k8s.io/yaml v1.6.0
Expand Down Expand Up @@ -172,13 +172,14 @@ require (
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
github.com/mitchellh/pointerstructure v1.2.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/osteele/liquid v1.6.0 // indirect
github.com/osteele/tuesday v1.0.3 // indirect
github.com/osteele/liquid v1.8.1 // indirect
github.com/osteele/tuesday v1.0.4 // indirect
github.com/outcaste-io/ristretto v0.2.3 // indirect
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
github.com/pjbgf/sha1cd v0.5.0 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pluralsh/controller-reconcile-helper v0.1.0 // indirect
github.com/pluralsh/polly v0.3.6 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
Expand Down Expand Up @@ -224,6 +225,7 @@ require (
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
golang.org/x/mod v0.33.0 // indirect
golang.org/x/tools v0.42.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto v0.0.0-20260217215200-42d3e9bedb6d // indirect
Expand Down
25 changes: 14 additions & 11 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN
github.com/distribution/distribution/v3 v3.0.0/go.mod h1:tRNuFoZsUdyRVegq8xGNeds4KLjwLCRin/tTo6i1DhU=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
github.com/docker/cli v29.2.0+incompatible h1:9oBd9+YM7rxjZLfyMGxjraKBKE4/nVyvVfN4qNl9XRM=
github.com/docker/cli v29.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
Expand Down Expand Up @@ -565,8 +565,9 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE=
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw=
github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
Expand Down Expand Up @@ -600,10 +601,10 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
github.com/osteele/liquid v1.6.0 h1:bTsbZjPIr7F+pU+K6o//Y5//W4McMzvUlMXWGOVvpc0=
github.com/osteele/liquid v1.6.0/go.mod h1:xU0Z2dn2hOQIEFEWNmeltOmCtfhtoW/2fCyiNQeNG+U=
github.com/osteele/tuesday v1.0.3 h1:SrCmo6sWwSgnvs1bivmXLvD7Ko9+aJvvkmDjB5G4FTU=
github.com/osteele/tuesday v1.0.3/go.mod h1:pREKpE+L03UFuR+hiznj3q7j3qB1rUZ4XfKejwWFF2M=
github.com/osteele/liquid v1.8.1 h1:b+uxMOkD1OOLxueaSvrE0yx6nMqf023DZPPAjPWT5eI=
github.com/osteele/liquid v1.8.1/go.mod h1:SFqQ9ddbCoKceuG6RckCLJ0hcxUbGhLpvcXJGmHlCWA=
github.com/osteele/tuesday v1.0.4 h1:iX0xOLW08/FJtXUCr20ngYwOwBE6l/mf7mz8NIv4yl8=
github.com/osteele/tuesday v1.0.4/go.mod h1:5fgEemYhErJF09RNEwU+PdYiwm5Ar7Bknlhs1CD/Ol8=
github.com/outcaste-io/ristretto v0.2.3 h1:AK4zt/fJ76kjlYObOeNwh4T3asEuaCmp26pOvUOL9w0=
github.com/outcaste-io/ristretto v0.2.3/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
Expand All @@ -625,6 +626,8 @@ github.com/pluralsh/console/go/client v1.61.0 h1:gy5tglnBLoMA6iBgXoCxXJFGpTUvRWh
github.com/pluralsh/console/go/client v1.61.0/go.mod h1:lqN15ajFf+0MtnNQNb9rvQpxkdsuMg47Yd9dSdQDIAk=
github.com/pluralsh/console/go/controller v0.0.0-20260129150042-18e31f596bd7 h1:CwBTb7Tvt11nO/XJ1PA9fbCsJSlz9/nDN1OJU0Pddsg=
github.com/pluralsh/console/go/controller v0.0.0-20260129150042-18e31f596bd7/go.mod h1:bbAQqSq+Rne2mBzUwAVAaGOcR75sJZhnHdpDmHLTq2U=
github.com/pluralsh/console/go/polly v1.0.0 h1:NRg8CMITGllEJ08oYidNuuG/gJGDdDuga8TM+gdIcFA=
github.com/pluralsh/console/go/polly v1.0.0/go.mod h1:eH42iPlRip2bs6tB+Vg6fxC/sz6oWxyNGVDE9uyA5EY=
github.com/pluralsh/controller-reconcile-helper v0.1.0 h1:BV3dYZFH5rn8ZvZjtpkACSv/GmLEtRftNQj/Y4ddHEo=
github.com/pluralsh/controller-reconcile-helper v0.1.0/go.mod h1:RxAbvSB4/jkvx616krCdNQXPbpGJXW3J1L3rASxeFOA=
github.com/pluralsh/gqlclient v1.12.2 h1:BrEFAASktf4quFw57CIaLAd+NZUTLhG08fe6tnhBQN4=
Expand All @@ -633,8 +636,8 @@ github.com/pluralsh/oauth v0.9.2 h1:tM9hBK4tCnJUeCOgX0ctxBBCS3hiCDPoxkJLODtedmQ=
github.com/pluralsh/oauth v0.9.2/go.mod h1:aTUw/75rzcsbvW+/TLvWtHVDXFIdtFrDtUncOq9vHyM=
github.com/pluralsh/plural-operator v0.5.5 h1:57GxniNjUa3hpHgvFr9oDonFgvDUC8XDD5B0e7Xduzk=
github.com/pluralsh/plural-operator v0.5.5/go.mod h1:WIXiz26/WDcUn0FA7Q1jPxmfsm98U1/JL8YpIdKVLX0=
github.com/pluralsh/polly v0.3.7 h1:Nc7tvCbKdOGDABRa4jUE+FLifrPOgA2u49hQSCHESoo=
github.com/pluralsh/polly v0.3.7/go.mod h1:R58Twx1xxoc5a5o8ZDsaVJxqcqQp16Aajd/iqmOw3ak=
github.com/pluralsh/polly v0.3.6 h1:mzPz+xqszE/WxM75GpL2OjaRIeIa/2tvV9yETJqQ28k=
github.com/pluralsh/polly v0.3.6/go.mod h1:R58Twx1xxoc5a5o8ZDsaVJxqcqQp16Aajd/iqmOw3ak=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down Expand Up @@ -1042,8 +1045,8 @@ k8s.io/api v0.35.1 h1:0PO/1FhlK/EQNVK5+txc4FuhQibV25VLSdLMmGpDE/Q=
k8s.io/api v0.35.1/go.mod h1:28uR9xlXWml9eT0uaGo6y71xK86JBELShLy4wR1XtxM=
k8s.io/apiextensions-apiserver v0.35.1 h1:p5vvALkknlOcAqARwjS20kJffgzHqwyQRM8vHLwgU7w=
k8s.io/apiextensions-apiserver v0.35.1/go.mod h1:2CN4fe1GZ3HMe4wBr25qXyJnJyZaquy4nNlNmb3R7AQ=
k8s.io/apimachinery v0.35.1 h1:yxO6gV555P1YV0SANtnTjXYfiivaTPvCTKX6w6qdDsU=
k8s.io/apimachinery v0.35.1/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
k8s.io/apimachinery v0.35.2 h1:NqsM/mmZA7sHW02JZ9RTtk3wInRgbVxL8MPfzSANAK8=
k8s.io/apimachinery v0.35.2/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
k8s.io/apiserver v0.35.1 h1:potxdhhTL4i6AYAa2QCwtlhtB1eCdWQFvJV6fXgJzxs=
k8s.io/apiserver v0.35.1/go.mod h1:BiL6Dd3A2I/0lBnteXfWmCFobHM39vt5+hJQd7Lbpi4=
k8s.io/cli-runtime v0.35.1 h1:uKcXFe8J7AMAM4Gm2JDK4mp198dBEq2nyeYtO+JfGJE=
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package api
import (
"fmt"

"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/gqlclient"
"github.com/pluralsh/polly/algorithms"
"github.com/samber/lo"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cd/control_plane_install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"gopkg.in/yaml.v3"

"github.com/AlecAivazis/survey/v2"
pollytemplate "github.com/pluralsh/polly/template"
pollytemplate "github.com/pluralsh/console/go/polly/template"

"github.com/pluralsh/plural-cli/pkg/api"
"github.com/pluralsh/plural-cli/pkg/bundle"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cd/template/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

console "github.com/pluralsh/console/go/client"
"github.com/pluralsh/polly/template"
"github.com/pluralsh/console/go/polly/template"
)

func RenderYaml(path string, bindings map[string]interface{}) ([]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/plural.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os/exec"
"strings"

"github.com/pluralsh/console/go/polly/algorithms"
gitutils "github.com/pluralsh/plural-cli/pkg/utils/git"
"github.com/pluralsh/polly/algorithms"
"github.com/samber/lo"
apierrors "k8s.io/apimachinery/pkg/api/errors"

Expand Down
2 changes: 1 addition & 1 deletion pkg/common/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/plural-cli/pkg/provider"
"github.com/pluralsh/polly/algorithms"

"github.com/AlecAivazis/survey/v2"
"github.com/pluralsh/plural-cli/pkg/api"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

"github.com/pkg/errors"
"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/plural-cli/pkg/helm"
"github.com/pluralsh/plural-cli/pkg/utils"
"github.com/pluralsh/polly/algorithms"
"helm.sh/helm/v3/pkg/action"
"helm.sh/helm/v3/pkg/chart"
"helm.sh/helm/v3/pkg/chart/loader"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/pipelines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"strings"

gqlclient "github.com/pluralsh/console/go/client"
"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/plural-cli/pkg/api"
"github.com/pluralsh/plural-cli/pkg/utils"
"github.com/pluralsh/polly/algorithms"
"github.com/samber/lo"
"sigs.k8s.io/yaml"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/crypto/age.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"time"

"filippo.io/age"
"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/console/go/polly/containers"
"github.com/pluralsh/plural-cli/pkg/api"
"github.com/pluralsh/plural-cli/pkg/config"
"github.com/pluralsh/plural-cli/pkg/utils"
"github.com/pluralsh/plural-cli/pkg/utils/git"
"github.com/pluralsh/plural-cli/pkg/utils/pathing"
"github.com/pluralsh/polly/algorithms"
"github.com/pluralsh/polly/containers"
"github.com/samber/lo"
"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/AlecAivazis/survey/v2"
"gopkg.in/yaml.v2"

"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/plural-cli/pkg/api"
"github.com/pluralsh/plural-cli/pkg/utils"
"github.com/pluralsh/plural-cli/pkg/utils/pathing"
"github.com/pluralsh/polly/algorithms"
)

const pluralDomain = "onplural.sh"
Expand Down
2 changes: 1 addition & 1 deletion pkg/pr/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"testing"

"github.com/pluralsh/polly/algorithms"
"github.com/pluralsh/console/go/polly/algorithms"
"github.com/samber/lo"
"gotest.tools/v3/assert"

Expand Down
2 changes: 1 addition & 1 deletion pkg/pr/crd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/pluralsh/plural-cli/pkg/utils"

"github.com/pluralsh/console/go/controller/api/v1alpha1"
"github.com/pluralsh/polly/algorithms"
"github.com/pluralsh/console/go/polly/algorithms"
"sigs.k8s.io/yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/pr/creates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package pr
import (
"path/filepath"

"github.com/pluralsh/console/go/polly/algorithms"
"github.com/pluralsh/plural-cli/pkg/utils"
"github.com/pluralsh/polly/algorithms"
)

type replacement struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/pr/lua.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"

"dario.cat/mergo"
"github.com/pluralsh/polly/luautils"
"github.com/pluralsh/console/go/polly/luautils"
lua "github.com/yuin/gopher-lua"
)

Expand Down
Loading
Loading