fix: Various fixes and improvements (#616)

* ask for gcp project id instead of name

* list subscription locations

* update messages

* remove splitn contract

* ask only for subdomain

* survey improvements

* survey improvements

* lint

Author: maciaszczykm

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v1.0.0
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/subscription/armsubscription v1.2.0
 	github.com/Azure/azure-storage-blob-go v0.15.0
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/Yamashou/gqlgenc v0.30.2
@@ -28,17 +29,12 @@ require (
 	github.com/gofrs/flock v0.12.1
 	github.com/google/go-github/v45 v45.2.0
 	github.com/hashicorp/go-bexpr v0.1.14
-	github.com/hashicorp/go-retryablehttp v0.7.7
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
-	github.com/joho/godotenv v1.5.1
 	github.com/ktrysmt/go-bitbucket v0.9.81
 	github.com/likexian/doh v0.7.1
-	github.com/linode/linodego v1.44.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/olekukonko/tablewriter v0.0.5
-	github.com/packethost/packngo v0.31.0
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 	github.com/pluralsh/console/go/client v1.27.1
 	github.com/pluralsh/console/go/controller v0.0.0-20250131003334-70da5fba4a49
@@ -115,7 +111,6 @@ require (
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-resty/resty/v2 v2.16.2 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
@@ -124,7 +119,7 @@ require (
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/likexian/gokit v0.25.15 // indirect
 	github.com/mitchellh/pointerstructure v1.2.1 // indirect
@@ -156,7 +151,6 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
 )
 
@@ -210,9 +204,6 @@ require (
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-hclog v1.6.3 // indirect
-	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -234,7 +225,6 @@ require (
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/locker v1.0.1 // indirect
@@ -257,7 +247,7 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rubenv/sql-migrate v1.7.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/schollz/progressbar/v3 v3.18.0 // indirect
+	github.com/schollz/progressbar/v3 v3.18.0
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect

go.sum

@@ -159,7 +159,7 @@ func (p *Plural) HandleInit(c *cli.Context) error {
 		return err
 	}
 
-	if !git && common.Affirm("you're attempting to setup plural outside a git repository. would you like us to set one up for you here?", "PLURAL_INIT_AFFIRM_SETUP_REPO") {
+	if !git && common.Affirm("You're attempting to setup plural outside a git repository. Would you like us to set one up for you here?", "PLURAL_INIT_AFFIRM_SETUP_REPO") {
 		repo, err = scm.Setup()
 		if err != nil {
 			return err

pkg/client/plural.go

@@ -80,7 +80,7 @@ func postLogin(conf *config.Config, client api.Client, c *cli.Context, persist b
 	}
 
 	conf.Email = me.Email
-	fmt.Printf("\nlogged in as %s!\n", me.Email)
+	fmt.Printf("\nLogged in as %s!\n", me.Email)
 
 	saEmail := c.String("service-account")
 	if saEmail != "" {

pkg/common/common.go

@@ -92,15 +92,21 @@ func (man *Manifest) Write(path string) error {
 }
 
 func (pMan *ProjectManifest) Configure(cloud bool, cluster string) Writer {
-	utils.Highlight("\nLet's get some final information about your workspace set up\n\n")
-
 	pMan.BucketPrefix = cluster
 	pMan.Bucket = fmt.Sprintf("plrl-cloud-%s", cluster)
 
 	if !cloud {
-		res, _ := utils.ReadAlphaNum("Give us a unique, memorable string to use for bucket naming, eg an abbreviation for your company: ")
-		pMan.BucketPrefix = res
-		pMan.Bucket = fmt.Sprintf("%s-tf-state", res)
+		answer := ""
+		input := &survey.Input{Message: "Enter a unique, memorable string to use for bucket naming, e.g. an abbreviation for your company:"}
+		if err := survey.AskOne(input, &answer, survey.WithValidator(func(val interface{}) error {
+			res, _ := val.(string)
+			return utils.ValidateRegex(res, "[a-z][0-9\\-a-z]+", "String can only contain alphanumeric characters or hyphens")
+		})); err != nil {
+			return nil
+		}
+
+		pMan.BucketPrefix = answer
+		pMan.Bucket = fmt.Sprintf("%s-tf-state", answer)
 		if err := pMan.ConfigureNetwork(); err != nil {
 			return nil
 		}
@@ -113,20 +119,17 @@ func (pMan *ProjectManifest) ConfigureNetwork() error {
 		return nil
 	}
 
-	utils.Highlight("\nOk, let's get your network configuration set up now...\n")
-
-	modifier := ", must be a subdomain under onplural.sh"
-
 	subdomain := ""
-	input := &survey.Input{Message: fmt.Sprintf("\nWhat do you want to use as your domain%s: ", modifier)}
+	input := &survey.Input{Message: fmt.Sprintf("Enter subdomain of %s domain that you want to use:", pluralDomain)}
 	if err := survey.AskOne(input, &subdomain, survey.WithValidator(func(val interface{}) error {
 		res, _ := val.(string)
-		if err := utils.ValidateDns(res); err != nil {
-			return err
-		}
 
 		if !strings.HasSuffix(res, pluralDomain) {
-			return fmt.Errorf("Not an onplural.sh domain")
+			res += "." + pluralDomain
+		}
+
+		if err := utils.ValidateDns(res); err != nil {
+			return err
 		}
 
 		client := api.NewClient()

pkg/manifest/manifest.go

@@ -19,6 +19,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/subscription/armsubscription"
 	"github.com/Azure/azure-storage-blob-go/azblob"
 	v1 "k8s.io/api/core/v1"
 
@@ -50,10 +51,15 @@ type ContainerClient interface {
 	Create(ctx context.Context, metadata azblob.Metadata, publicAccessType azblob.PublicAccessType) (*azblob.ContainerCreateResponse, error)
 }
 
+type SubscriptionClient interface {
+	NewListLocationsPager(subscriptionID string, options *armsubscription.SubscriptionsClientListLocationsOptions) *runtime.Pager[armsubscription.SubscriptionsClientListLocationsResponse]
+}
+
 type ClientSet struct {
-	Groups     ResourceGroupClient
-	Accounts   AccountsClient
-	Containers ContainerClient
+	Subscriptions SubscriptionClient
+	Groups        ResourceGroupClient
+	Accounts      AccountsClient
+	Containers    ContainerClient
 }
 
 func GetClientSet(subscriptionId string) (*ClientSet, error) {
@@ -62,6 +68,11 @@ func GetClientSet(subscriptionId string) (*ClientSet, error) {
 		return nil, err
 	}
 
+	subscriptionsClient, err := armsubscription.NewSubscriptionsClient(cred, nil)
+	if err != nil {
+		return nil, err
+	}
+
 	resourceGroupClient, err := armresources.NewResourceGroupsClient(subscriptionId, cred, nil)
 	if err != nil {
 		return nil, err
@@ -73,8 +84,9 @@ func GetClientSet(subscriptionId string) (*ClientSet, error) {
 	}
 
 	return &ClientSet{
-		Groups:   resourceGroupClient,
-		Accounts: storageAccountsClient,
+		Subscriptions: subscriptionsClient,
+		Groups:        resourceGroupClient,
+		Accounts:      storageAccountsClient,
 	}, nil
 }
 
@@ -88,34 +100,33 @@ type AzureProvider struct {
 	clients       *ClientSet
 }
 
-var (
-	azureRegions = []string{
-		"eastus",
-		"eastus2",
-		"southcentralus",
-		"westus2",
-		"westus3",
-		"australiaeast",
-		"southeastasia",
-		"northeurope",
-		"swedencentral",
-		"uksouth",
-		"westeurope",
-		"centralus",
-		"southafricanorth",
-		"centralindia",
-		"eastasia",
-		"japaneast",
-		"koreacentral",
-		"canadacentral",
-		"francecentral",
-		"germanywestcentral",
-		"norwayeast",
-		"brazilsouth",
+func mkAzure(conf config.Config) (prov *AzureProvider, err error) {
+	subId, tenID, err := GetAzureAccount()
+	if err != nil {
+		return
+	}
+
+	clients, err := GetClientSet(subId)
+	if err != nil {
+		return
+	}
+
+	ctx := context.Background()
+	locations := []string{}
+	locationsPager := clients.Subscriptions.NewListLocationsPager(subId, nil)
+	for locationsPager.More() {
+		page, err := locationsPager.NextPage(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, v := range page.Value {
+			if v != nil {
+				locations = append(locations, *v.Name)
+			}
+		}
 	}
-)
 
-func mkAzure(conf config.Config) (prov *AzureProvider, err error) {
 	var resp struct {
 		Cluster  string
 		Storage  string
@@ -130,17 +141,17 @@ func mkAzure(conf config.Config) (prov *AzureProvider, err error) {
 		},
 		{
 			Name:     "storage",
-			Prompt:   &survey.Input{Message: "Enter the name of the storage account to use for your stage, must be globally unique or already owned by your subscription: "},
+			Prompt:   &survey.Input{Message: "Enter the name of the storage account to use for your stage, must be globally unique or already owned by your subscription:"},
 			Validate: utils.ValidateStorageAccountName,
 		},
 		{
 			Name:     "region",
-			Prompt:   &survey.Select{Message: "Enter the region you want to deploy to:", Default: "eastus", Options: azureRegions},
+			Prompt:   &survey.Select{Message: "Enter the region you want to deploy to:", Default: "eastus", Options: locations},
 			Validate: survey.Required,
 		},
 		{
 			Name:     "resource",
-			Prompt:   &survey.Input{Message: "Enter the name of the resource group to use as default: "},
+			Prompt:   &survey.Input{Message: "Enter the name of the resource group to use:"},
 			Validate: utils.ValidateResourceGroupName,
 		},
 	}
@@ -150,16 +161,6 @@ func mkAzure(conf config.Config) (prov *AzureProvider, err error) {
 		return
 	}
 
-	subId, tenID, err := GetAzureAccount()
-	if err != nil {
-		return
-	}
-
-	clients, err := GetClientSet(subId)
-	if err != nil {
-		return
-	}
-
 	prov = &AzureProvider{
 		resp.Cluster,
 		resp.Resource,

pkg/provider/azure.go

@@ -108,10 +108,10 @@ func getGCPSurvey() []*survey.Question {
 func setProject() (survey.Prompt, survey.Validator) {
 	projects, err := getGcpProjects()
 	if err != nil {
-		return &survey.Input{Message: "Enter the name of its gcp project"}, utils.ValidateAlphaNumeric
+		return &survey.Input{Message: "Enter the GCP project ID: "}, utils.ValidateAlphaNumeric
 	}
 
-	return &survey.Select{Message: "Select the name of gcp project?", Options: projects}, survey.Required
+	return &survey.Select{Message: "Select the GCP project ID:", Options: projects}, survey.Required
 }
 
 func getGcpProjects() ([]string, error) {

pkg/provider/gcp.go

@@ -69,13 +69,12 @@ func GetProvider() (Provider, error) {
 
 	provider := ""
 	prompt := &survey.Select{
-		Message: "Select one of the following providers:",
+		Message: "Select the cloud provider:",
 		Options: providers.AvailableProviders,
 	}
 	if err := survey.AskOne(prompt, &provider, survey.WithValidator(survey.Required)); err != nil {
 		return nil, err
 	}
-	utils.Success("Using provider %s\n", provider)
 	return New(provider)
 }
 

pkg/provider/provider.go

@@ -19,24 +19,6 @@ func ReadLine(prompt string) (string, error) {
 	return strings.TrimSpace(res), err
 }
 
-func ReadAlphaNum(prompt string) (string, error) {
-	val, err := ReadLine(prompt)
-	if err != nil {
-		return val, err
-	}
-
-	return val, ValidateRegex(val, "[a-z][0-9\\-a-z]+", "String can only contain alphanumeric characters or hyphens")
-}
-
-func ReadAlphaNumDefault(prompt string, def string) (string, error) {
-	result, err := ReadAlphaNum(fmt.Sprintf("%s [%s]: ", prompt, def))
-	if result == "" {
-		return def, nil
-	}
-
-	return result, err
-}
-
 func ReadLineDefault(prompt string, def string) (string, error) {
 	result, err := ReadLine(fmt.Sprintf("%s [%s]: ", prompt, def))
 	if result == "" {

pkg/utils/print.go

@@ -17,7 +17,7 @@ func Preflight() (bool, error) {
 			return true, utils.HighlightError(fmt.Errorf("%s not installed", req))
 		}
 	}
-	fmt.Print("\ntesting if git ssh is properly configured ")
+	fmt.Print("\nTesting if git ssh is properly configured...")
 	if err := checkGitSSH(); err != nil {
 		return true, err
 	}