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.

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

task: remove the atlas folder for commands #2802

Merged
merged 1 commit into from Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions cmd/atlas/atlas.go
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/core"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/root/atlas"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/root"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't this affect go:generate mockgen references as well?

both destination=. and package reference, ok if we want to do a follow-up PR but mock generation may be broken meanwhile so may be worth to get next PR ready

Copy link
Collaborator Author

@gssbzn gssbzn Mar 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't this affect go:generate mockgen references as well?

No, I fixed the mocks and ran make gen-mock after my commit to confirm there are no changes as expected

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/telemetry"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/terminal"
Expand All @@ -35,7 +35,7 @@ import (
// This is called by main.main(). It only needs to happen once to the rootCmd.
func Execute() {
ctx := telemetry.NewContext()
rootCmd := atlas.Builder()
rootCmd := root.Builder()
// append here to avoid a recursive link on generated docs
rootCmd.Long += `

Expand Down Expand Up @@ -158,7 +158,7 @@ func trackInitError(e error) {
if e == nil {
return
}
if cmd, args, err := atlas.Builder().Find(os.Args[1:]); err == nil {
if cmd, args, err := root.Builder().Find(os.Args[1:]); err == nil {
if !telemetry.StartedTrackingCommand() {
telemetry.StartTrackingCommand(cmd, args)
}
Expand All @@ -170,7 +170,7 @@ func trackInitError(e error) {
}

func initTrack() {
cmd, args, _ := atlas.Builder().Find(os.Args[1:])
cmd, args, _ := root.Builder().Find(os.Args[1:])
telemetry.StartTrackingCommand(cmd, args)
}

Expand Down
Expand Up @@ -16,7 +16,7 @@ package alerts

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/alerts/settings"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/alerts/settings"
"github.com/spf13/cobra"
)

Expand Down
File renamed without changes.
Expand Up @@ -16,11 +16,11 @@ package backup

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/exports"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/restores"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/schedule"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/snapshots"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/exports"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/restores"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/schedule"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/snapshots"
"github.com/spf13/cobra"
)

Expand Down
Expand Up @@ -16,10 +16,10 @@ package compliancepolicy

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/copyprotection"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/encryptionatrest"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/pointintimerestore"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/policies"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/copyprotection"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/encryptionatrest"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/pointintimerestore"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/policies"
"github.com/spf13/cobra"
)

Expand Down
Expand Up @@ -16,8 +16,8 @@ package policies

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/policies/ondemand"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/compliancepolicy/policies/scheduled"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/policies/ondemand"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/compliancepolicy/policies/scheduled"
"github.com/spf13/cobra"
)

Expand Down
Expand Up @@ -16,8 +16,8 @@ package exports

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/exports/buckets"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/backup/exports/jobs"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/exports/buckets"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/backup/exports/jobs"
"github.com/spf13/cobra"
)

Expand Down
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
Expand Down
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
Expand Down
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
Expand Down
Expand Up @@ -16,7 +16,7 @@ package accessroles

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/cloudproviders/accessroles/aws"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/cloudproviders/accessroles/aws"
"github.com/spf13/cobra"
)

Expand Down
Expand Up @@ -16,7 +16,7 @@ package cloudproviders

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/cloudproviders/accessroles"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/cloudproviders/accessroles"
"github.com/spf13/cobra"
)

Expand Down
Expand Up @@ -18,7 +18,7 @@ import (
"context"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
Expand Down
Expand Up @@ -16,13 +16,13 @@ package clusters

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/advancedsettings"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/availableregions"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/connectionstring"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/indexes"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/onlinearchive"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/clusters/sampledata"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/search"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/advancedsettings"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/availableregions"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/connectionstring"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/indexes"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/onlinearchive"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/clusters/sampledata"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/search"
"github.com/spf13/cobra"
atlasv2 "go.mongodb.org/atlas-sdk/v20231115008/admin"
atlas "go.mongodb.org/atlas/mongodbatlas"
Expand Down
File renamed without changes.
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
Expand Down
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/flag"
Expand Down
Expand Up @@ -19,7 +19,7 @@ import (
"fmt"

"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/commonerrors"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/require"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/file"
Expand Down
File renamed without changes.
Expand Up @@ -16,7 +16,7 @@ package customdns

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/customdns/aws"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/customdns/aws"
"github.com/spf13/cobra"
)

Expand Down
Expand Up @@ -18,8 +18,8 @@ package datafederation

import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datafederation/privateendpoints"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/atlas/datafederation/querylimits"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datafederation/privateendpoints"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli/datafederation/querylimits"
"github.com/spf13/cobra"
)

Expand Down
File renamed without changes.