CLOUDP-138782: [Atlas CLI] Update cluster labelling when creating clusters via Atlas CLI (#1480)

Author: andreaangiolillo

internal/cli/atlas/clusters/clusters.go

@@ -22,10 +22,17 @@ import (
 	"github.com/mongodb/mongodb-atlas-cli/internal/cli/atlas/clusters/indexes"
 	"github.com/mongodb/mongodb-atlas-cli/internal/cli/atlas/clusters/onlinearchive"
 	"github.com/mongodb/mongodb-atlas-cli/internal/cli/atlas/search"
+	"github.com/mongodb/mongodb-atlas-cli/internal/config"
 	"github.com/spf13/cobra"
 	atlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
+const (
+	labelKey           = "Infrastructure Tool"
+	atlasCLILabelValue = "Atlas CLI"
+	mongoCLILabelValue = "mongoCLI"
+)
+
 // MongoCLIBuilder is to split "mongocli atlas clusters" and "atlas clusters".
 func MongoCLIBuilder() *cobra.Command {
 	const use = "clusters"
@@ -87,6 +94,18 @@ func Builder() *cobra.Command {
 	return cmd
 }
 
+func NewCLILabel() atlas.Label {
+	labelValue := atlasCLILabelValue
+	if config.ToolName == config.MongoCLI {
+		labelValue = mongoCLILabelValue
+	}
+
+	return atlas.Label{
+		Key:   labelKey,
+		Value: labelValue,
+	}
+}
+
 func AddLabel(out *atlas.AdvancedCluster, l atlas.Label) {
 	if LabelExists(out.Labels, l) {
 		return

internal/cli/atlas/clusters/create.go

@@ -38,8 +38,6 @@ const (
 	atlasM2    = "M2"
 	atlasM5    = "M5"
 	zoneName   = "Zone 1"
-	labelKey   = "Infrastructure Tool"
-	labelValue = "mongoCLI"
 )
 
 type CreateOpts struct {
@@ -100,10 +98,7 @@ func (opts *CreateOpts) newCluster() (*atlas.AdvancedCluster, error) {
 		cluster.Name = opts.name
 	}
 
-	AddLabel(cluster, atlas.Label{
-		Key:   labelKey,
-		Value: labelValue,
-	})
+	AddLabel(cluster, NewCLILabel())
 
 	cluster.GroupID = opts.ConfigProjectID()
 	return cluster, nil

internal/cli/atlas/clusters/update.go

@@ -98,10 +98,8 @@ func (opts *UpdateOpts) patchOpts(out *atlas.AdvancedCluster) {
 	if opts.tier != "" {
 		opts.addTierToAdvancedCluster(out)
 	}
-	AddLabel(out, atlas.Label{
-		Key:   labelKey,
-		Value: labelValue,
-	})
+
+	AddLabel(out, NewCLILabel())
 }
 
 func (opts *UpdateOpts) addTierToAdvancedCluster(out *atlas.AdvancedCluster) {

internal/cli/atlas/clusters/upgrade.go

@@ -101,10 +101,8 @@ func (opts *UpgradeOpts) patchOpts(out *atlas.Cluster) {
 			}
 		}
 	}
-	AddLabelSharedCluster(out, atlas.Label{
-		Key:   labelKey,
-		Value: labelValue,
-	})
+
+	AddLabelSharedCluster(out, NewCLILabel())
 }
 
 // mongocli atlas cluster(s) upgrade [clusterName] --projectId projectId [--tier M#] [--diskSizeGB N] [--mdbVersion].

internal/cli/atlas/quickstart/cluster_setup.go

@@ -103,8 +103,8 @@ func (opts *Opts) newCluster() *atlas.AdvancedCluster {
 		Name:             opts.ClusterName,
 		Labels: []atlas.Label{
 			{
-				Key:   "Infrastructure Tool",
-				Value: "MongoDB CLI Quickstart",
+				Key:   opts.LabelKey,
+				Value: opts.LabelValue,
 			},
 		},
 	}

internal/cli/atlas/quickstart/quick_start.go

@@ -93,6 +93,9 @@ const (
 	defaultRegionGCP    = "US_EAST_4"
 	defaultRegionAzure  = "US_EAST_2"
 	defaultRegionGov    = "US_GOV_EAST_1"
+	labelKey            = "Infrastructure Tool"
+	atlasCLILabelValue  = "Atlas CLI Quickstart"
+	mongoCLILabelValue  = "MongoDB CLI Quickstart"
 )
 
 type Opts struct {
@@ -110,6 +113,8 @@ type Opts struct {
 	DBUsername          string
 	DBUserPassword      string
 	SampleDataJobID     string
+	LabelKey            string
+	LabelValue          string
 	SkipSampleData      bool
 	SkipMongosh         bool
 	defaultValue        bool
@@ -143,9 +148,15 @@ func NewQuickstartFlow(qsOpts *Opts) Flow {
 }
 
 func NewQuickstartOpts(loginOpts *auth.LoginOpts) *Opts {
+	labelValue := atlasCLILabelValue
+	if config.ToolName == config.MongoCLI {
+		labelValue = mongoCLILabelValue
+	}
 	return &Opts{
-		loginOpts: loginOpts,
-		login:     auth.NewLoginFlow(loginOpts),
+		loginOpts:  loginOpts,
+		login:      auth.NewLoginFlow(loginOpts),
+		LabelKey:   labelKey,
+		LabelValue: labelValue,
 	}
 }
 

internal/cli/atlas/setup/setup_cmd.go

@@ -31,6 +31,8 @@ import (
 
 const (
 	withProfileMsg = `Run "atlas auth setup --profile <profile_name>" to create a new Atlas account on a new Atlas CLI profile.`
+	labelKey       = "Infrastructure Tool"
+	labelValue     = "Atlas CLI Setup"
 )
 
 var errNeedsOrgAndProject = errors.New("please make sure to select or add an org and project to the profile: %s")
@@ -123,6 +125,8 @@ func (opts *Opts) PreRun(ctx context.Context) error {
 func Builder() *cobra.Command {
 	loginOpts := auth.NewLoginOpts()
 	qsOpts := quickstart.NewQuickstartOpts(loginOpts)
+	qsOpts.LabelKey = labelKey
+	qsOpts.LabelValue = labelValue
 	opts := &Opts{
 		register:   auth.NewRegisterFlow(loginOpts),
 		login:      auth.NewLoginFlow(loginOpts),