diff --git a/go.mod b/go.mod
index b782d2c8b9..aadcae83fa 100644
--- a/go.mod
+++ b/go.mod
@@ -45,6 +45,7 @@ require (
github.com/yuin/goldmark v1.7.10
go.mongodb.org/atlas v0.38.0
go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0
+ go.mongodb.org/atlas-sdk/v20250312002 v20250312002.0.0
go.mongodb.org/mongo-driver v1.17.3
go.opentelemetry.io/otel v1.35.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
@@ -61,10 +62,6 @@ require (
gopkg.in/yaml.v3 v3.0.1
)
-require go.mongodb.org/atlas-sdk/v20250312002 v20250312002.0.0
-
-require github.com/minio/minlz v1.0.0 // indirect
-
require (
cloud.google.com/go v0.120.0 // indirect
cloud.google.com/go/auth v0.16.0 // indirect
@@ -127,6 +124,7 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+ github.com/minio/minlz v1.0.0 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/montanaflynn/stats v0.7.1 // indirect
github.com/nwaples/rardecode/v2 v2.1.0 // indirect
diff --git a/internal/api/config.go b/internal/api/config.go
index e03d2a43e6..6f11004746 100644
--- a/internal/api/config.go
+++ b/internal/api/config.go
@@ -17,7 +17,6 @@ package api
import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
- "go.mongodb.org/atlas/mongodbatlas"
)
type AuthenticatedConfigWrapper struct {
@@ -51,5 +50,5 @@ func (c *AuthenticatedConfigWrapper) GetBaseURL() (string, error) {
}
// By default, return the default base URL
- return mongodbatlas.CloudURL, nil
+ return store.CloudServiceURL, nil
}
diff --git a/internal/cli/backup/exports/buckets/list.go b/internal/cli/backup/exports/buckets/list.go
index c3829b779a..7921b5bcad 100644
--- a/internal/cli/backup/exports/buckets/list.go
+++ b/internal/cli/backup/exports/buckets/list.go
@@ -46,7 +46,7 @@ var listTemplate = `ID BUCKET NAME CLOUD PROVIDER IAM ROLE ID{{range valueOrEmpt
`
func (opts *ListOpts) Run() error {
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
r, err := opts.store.ExportBuckets(opts.ConfigProjectID(), listOpts)
if err != nil {
return err
diff --git a/internal/cli/backup/exports/buckets/list_test.go b/internal/cli/backup/exports/buckets/list_test.go
index 4e81f896e7..f32eb9e848 100644
--- a/internal/cli/backup/exports/buckets/list_test.go
+++ b/internal/cli/backup/exports/buckets/list_test.go
@@ -51,7 +51,7 @@ func TestListOpts_Run(t *testing.T) {
mockStore.
EXPECT().
- ExportBuckets(listOpts.ProjectID, listOpts.NewListOptions()).
+ ExportBuckets(listOpts.ProjectID, listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/backup/exports/jobs/list.go b/internal/cli/backup/exports/jobs/list.go
index 41a7b95183..6eb222d8d0 100644
--- a/internal/cli/backup/exports/jobs/list.go
+++ b/internal/cli/backup/exports/jobs/list.go
@@ -47,7 +47,7 @@ var listTemplate = `ID EXPORT BUCKET ID STATE SNAPSHOT ID{{range valueOrEmptySli
`
func (opts *ListOpts) Run() error {
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
r, err := opts.store.ExportJobs(opts.ConfigProjectID(), opts.clusterName, listOpts)
if err != nil {
return err
diff --git a/internal/cli/backup/exports/jobs/list_test.go b/internal/cli/backup/exports/jobs/list_test.go
index 32f1581e4e..5023ba9f9c 100644
--- a/internal/cli/backup/exports/jobs/list_test.go
+++ b/internal/cli/backup/exports/jobs/list_test.go
@@ -38,7 +38,7 @@ func TestListOpts_Run(t *testing.T) {
mockStore.
EXPECT().
- ExportJobs(listOpts.ProjectID, "Cluster0", listOpts.NewListOptions()).
+ ExportJobs(listOpts.ProjectID, "Cluster0", listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/backup/restores/list.go b/internal/cli/backup/restores/list.go
index 1354d6faed..3e2cf32375 100644
--- a/internal/cli/backup/restores/list.go
+++ b/internal/cli/backup/restores/list.go
@@ -66,7 +66,7 @@ func (opts *ListOpts) Run() error {
return err
}
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
restoreJobs, err := opts.store.RestoreJobs(opts.ConfigProjectID(), opts.clusterName, listOpts)
if err != nil {
return err
diff --git a/internal/cli/backup/restores/list_test.go b/internal/cli/backup/restores/list_test.go
index 9b84ddbbb5..e59909ff4d 100644
--- a/internal/cli/backup/restores/list_test.go
+++ b/internal/cli/backup/restores/list_test.go
@@ -48,7 +48,7 @@ func TestListOpts_Run(t *testing.T) {
mockStore.
EXPECT().
- RestoreJobs(listOpts.ProjectID, "Cluster0", listOpts.NewListOptions()).
+ RestoreJobs(listOpts.ProjectID, "Cluster0", listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/backup/snapshots/list.go b/internal/cli/backup/snapshots/list.go
index f1e44b51f4..177540ae1a 100644
--- a/internal/cli/backup/snapshots/list.go
+++ b/internal/cli/backup/snapshots/list.go
@@ -66,7 +66,7 @@ func (opts *ListOpts) Run() error {
return err
}
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
snapshotsList, err := opts.store.Snapshots(opts.ConfigProjectID(), opts.clusterName, listOpts)
if err != nil {
return err
diff --git a/internal/cli/backup/snapshots/list_test.go b/internal/cli/backup/snapshots/list_test.go
index 056671b292..4137547f43 100644
--- a/internal/cli/backup/snapshots/list_test.go
+++ b/internal/cli/backup/snapshots/list_test.go
@@ -64,7 +64,7 @@ func TestList_Run(t *testing.T) {
mockStore.
EXPECT().
- Snapshots(listOpts.ProjectID, "Cluster0", listOpts.NewListOptions()).
+ Snapshots(listOpts.ProjectID, "Cluster0", listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/cloudproviders/accessroles/aws/authorize.go b/internal/cli/cloudproviders/accessroles/aws/authorize.go
index cc430cab2c..17d774ccd0 100644
--- a/internal/cli/cloudproviders/accessroles/aws/authorize.go
+++ b/internal/cli/cloudproviders/accessroles/aws/authorize.go
@@ -24,7 +24,7 @@ import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
"github.com/spf13/cobra"
- atlas "go.mongodb.org/atlas/mongodbatlas"
+ atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
)
const authorizeTemplate = "AWS IAM role '{{.RoleId}} successfully authorized.\n"
@@ -54,10 +54,10 @@ func (opts *AuthorizeOpts) Run() error {
return opts.Print(r)
}
-func (opts *AuthorizeOpts) newCloudProviderAuthorizationRequest() *atlas.CloudProviderAccessRoleRequest {
- return &atlas.CloudProviderAccessRoleRequest{
+func (opts *AuthorizeOpts) newCloudProviderAuthorizationRequest() *atlasv2.CloudProviderAccessRoleRequestUpdate {
+ return &atlasv2.CloudProviderAccessRoleRequestUpdate{
ProviderName: provider,
- IAMAssumedRoleARN: &opts.IAMAssumedRoleARN,
+ IamAssumedRoleArn: &opts.IAMAssumedRoleARN,
}
}
diff --git a/internal/cli/cloudproviders/accessroles/aws/deauthorize.go b/internal/cli/cloudproviders/accessroles/aws/deauthorize.go
index 3e6f7673f7..2dc12844ec 100644
--- a/internal/cli/cloudproviders/accessroles/aws/deauthorize.go
+++ b/internal/cli/cloudproviders/accessroles/aws/deauthorize.go
@@ -25,7 +25,6 @@ import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
"github.com/spf13/cobra"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
const (
@@ -54,7 +53,7 @@ func (opts *DeauthorizeOpts) Run() error {
return opts.Print(deauthorizeFail)
}
- err := opts.store.DeauthorizeCloudProviderAccessRoles(opts.newCloudProviderDeauthorizationRequest())
+ err := opts.store.DeauthorizeCloudProviderAccessRoles(opts.ConfigProjectID(), provider, opts.Entry)
if err != nil {
return err
}
@@ -62,14 +61,6 @@ func (opts *DeauthorizeOpts) Run() error {
return opts.Print(deauthorizeSuccess)
}
-func (opts *DeauthorizeOpts) newCloudProviderDeauthorizationRequest() *atlas.CloudProviderDeauthorizationRequest {
- return &atlas.CloudProviderDeauthorizationRequest{
- ProviderName: provider,
- GroupID: opts.ConfigProjectID(),
- RoleID: opts.Entry,
- }
-}
-
// atlas cloudProvider aws accessRoles deauthorize <roleId> [--projectId projectId].
func DeauthorizeBuilder() *cobra.Command {
opts := &DeauthorizeOpts{
diff --git a/internal/cli/cloudproviders/accessroles/aws/deauthorize_test.go b/internal/cli/cloudproviders/accessroles/aws/deauthorize_test.go
index db6d4d1cb1..e0ac2b1dbd 100644
--- a/internal/cli/cloudproviders/accessroles/aws/deauthorize_test.go
+++ b/internal/cli/cloudproviders/accessroles/aws/deauthorize_test.go
@@ -50,7 +50,7 @@ func TestDeauthorizeOpts_Run(t *testing.T) {
mockStore.
EXPECT().
- DeauthorizeCloudProviderAccessRoles(opts.newCloudProviderDeauthorizationRequest()).
+ DeauthorizeCloudProviderAccessRoles(opts.ProjectID, provider, opts.Entry).
Return(nil).
Times(1)
diff --git a/internal/cli/clusters/onlinearchive/list.go b/internal/cli/clusters/onlinearchive/list.go
index 03f4df921b..2b2ea7f4bc 100644
--- a/internal/cli/clusters/onlinearchive/list.go
+++ b/internal/cli/clusters/onlinearchive/list.go
@@ -48,7 +48,7 @@ var listTemplate = `ID DATABASE COLLECTION STATE{{range valueOrEmptySlice .Resul
`
func (opts *ListOpts) Run() error {
- lst := opts.NewListOptions()
+ lst := opts.NewAtlasListOptions()
r, err := opts.store.OnlineArchives(opts.ConfigProjectID(), opts.clusterName, lst)
if err != nil {
return err
diff --git a/internal/cli/clusters/onlinearchive/list_test.go b/internal/cli/clusters/onlinearchive/list_test.go
index 0e9e414767..397d87a7a4 100644
--- a/internal/cli/clusters/onlinearchive/list_test.go
+++ b/internal/cli/clusters/onlinearchive/list_test.go
@@ -44,7 +44,7 @@ func TestList_Run(t *testing.T) {
mockStore.
EXPECT().
- OnlineArchives(listOpts.ProjectID, listOpts.clusterName, listOpts.NewListOptions()).
+ OnlineArchives(listOpts.ProjectID, listOpts.clusterName, listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/datalakepipelines/availablesnapshots/list.go b/internal/cli/datalakepipelines/availablesnapshots/list.go
index 7777e23a85..4a9d1b170e 100644
--- a/internal/cli/datalakepipelines/availablesnapshots/list.go
+++ b/internal/cli/datalakepipelines/availablesnapshots/list.go
@@ -71,7 +71,7 @@ func (opts *ListOpts) validate() error {
}
func (opts *ListOpts) Run() error {
- r, err := opts.store.PipelineAvailableSnapshots(opts.ConfigProjectID(), opts.pipelineName, convertTime(opts.completedAfter), opts.NewListOptions())
+ r, err := opts.store.PipelineAvailableSnapshots(opts.ConfigProjectID(), opts.pipelineName, convertTime(opts.completedAfter), opts.NewAtlasListOptions())
if err != nil {
return err
}
diff --git a/internal/cli/datalakepipelines/availablesnapshots/list_test.go b/internal/cli/datalakepipelines/availablesnapshots/list_test.go
index 004ed72a1b..c946322efa 100644
--- a/internal/cli/datalakepipelines/availablesnapshots/list_test.go
+++ b/internal/cli/datalakepipelines/availablesnapshots/list_test.go
@@ -67,7 +67,7 @@ func TestListOpts_Run(t *testing.T) {
mockStore.
EXPECT().
- PipelineAvailableSnapshots(listOpts.ProjectID, listOpts.pipelineName, convertTime(listOpts.completedAfter), listOpts.NewListOptions()).
+ PipelineAvailableSnapshots(listOpts.ProjectID, listOpts.pipelineName, convertTime(listOpts.completedAfter), listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/default_setter_opts.go b/internal/cli/default_setter_opts.go
index 68597297ea..219b0b5623 100644
--- a/internal/cli/default_setter_opts.go
+++ b/internal/cli/default_setter_opts.go
@@ -93,8 +93,7 @@ func (opts *DefaultSetterOpts) projects() (ids, names []string, err error) {
}
if err != nil {
err = commonerrors.Check(err)
- var atlasErr *atlas.ErrorResponse
- if errors.As(err, &atlasErr) && atlasErr.HTTPCode == 404 {
+ if atlasErr, ok := atlasv2.AsError(err); ok && atlasErr.GetError() == 404 {
return nil, nil, errNoResults
}
return nil, nil, err
@@ -118,8 +117,7 @@ func (opts *DefaultSetterOpts) orgs(filter string) (results []atlasv2.AtlasOrgan
pagination := &atlasv2.ListOrganizationsApiParams{Name: &filter, ItemsPerPage: pointer.Get(resultsLimit)}
orgs, err := opts.Store.Organizations(pagination)
if err != nil {
- var atlasErr *atlas.ErrorResponse
- if errors.As(err, &atlasErr) && atlasErr.HTTPCode == 404 {
+ if atlasErr, ok := atlasv2.AsError(err); ok && atlasErr.GetError() == 404 {
return nil, errNoResults
}
return nil, commonerrors.Check(err)
diff --git a/internal/cli/list_opts.go b/internal/cli/list_opts.go
index e6a468fe6b..dabefad357 100644
--- a/internal/cli/list_opts.go
+++ b/internal/cli/list_opts.go
@@ -19,7 +19,6 @@ import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
"github.com/spf13/cobra"
- "go.mongodb.org/atlas/mongodbatlas"
)
const (
@@ -33,14 +32,6 @@ type ListOpts struct {
OmitCount bool
}
-func (opts *ListOpts) NewListOptions() *mongodbatlas.ListOptions {
- return &mongodbatlas.ListOptions{
- PageNum: opts.PageNum,
- ItemsPerPage: opts.ItemsPerPage,
- IncludeCount: !opts.OmitCount,
- }
-}
-
func (opts *ListOpts) NewAtlasListOptions() *store.ListOptions {
return &store.ListOptions{
PageNum: opts.PageNum,
diff --git a/internal/cli/metrics/databases/list.go b/internal/cli/metrics/databases/list.go
index 00b4898cd7..bffd2cb8a7 100644
--- a/internal/cli/metrics/databases/list.go
+++ b/internal/cli/metrics/databases/list.go
@@ -48,7 +48,7 @@ var databasesListTemplate = `DATABASE NAME{{range valueOrEmptySlice .Results}}
`
func (opts *ListsOpts) Run() error {
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
r, err := opts.store.ProcessDatabases(opts.ConfigProjectID(), opts.host, opts.port, listOpts)
if err != nil {
return err
diff --git a/internal/cli/metrics/databases/list_test.go b/internal/cli/metrics/databases/list_test.go
index e8600266ae..5d0c0949a1 100644
--- a/internal/cli/metrics/databases/list_test.go
+++ b/internal/cli/metrics/databases/list_test.go
@@ -44,7 +44,7 @@ func TestDatabasesListsOpts_Run(t *testing.T) {
store: mockStore,
}
- opts := listOpts.NewListOptions()
+ opts := listOpts.NewAtlasListOptions()
mockStore.
EXPECT().ProcessDatabases(listOpts.ProjectID, listOpts.host, listOpts.port, opts).
Return(expected, nil).
diff --git a/internal/cli/metrics/disks/list.go b/internal/cli/metrics/disks/list.go
index 56f7c11939..22987461ac 100644
--- a/internal/cli/metrics/disks/list.go
+++ b/internal/cli/metrics/disks/list.go
@@ -44,7 +44,7 @@ func (opts *ListsOpts) initStore(ctx context.Context) func() error {
}
func (opts *ListsOpts) Run() error {
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
r, err := opts.store.ProcessDisks(opts.ConfigProjectID(), opts.host, opts.port, listOpts)
if err != nil {
return err
diff --git a/internal/cli/metrics/disks/list_test.go b/internal/cli/metrics/disks/list_test.go
index 330decd891..f082c03f68 100644
--- a/internal/cli/metrics/disks/list_test.go
+++ b/internal/cli/metrics/disks/list_test.go
@@ -44,7 +44,7 @@ func TestDisksListsOpts_Run(t *testing.T) {
store: mockStore,
}
- opts := listOpts.NewListOptions()
+ opts := listOpts.NewAtlasListOptions()
mockStore.
EXPECT().ProcessDisks(listOpts.ProjectID, listOpts.host, listOpts.port, opts).
Return(expected, nil).
diff --git a/internal/cli/networking/containers/list.go b/internal/cli/networking/containers/list.go
index cc55aa1124..d53bb771a8 100644
--- a/internal/cli/networking/containers/list.go
+++ b/internal/cli/networking/containers/list.go
@@ -53,7 +53,7 @@ func (opts *ListOpts) Run() error {
var r []atlasv2.CloudProviderContainer
var err error
if opts.provider == "" {
- r, err = opts.store.AllContainers(opts.ConfigProjectID(), opts.NewListOptions())
+ r, err = opts.store.AllContainers(opts.ConfigProjectID(), opts.NewAtlasListOptions())
} else {
listOpts := opts.newContainerListOptions()
r, err = opts.store.ContainersByProvider(opts.ConfigProjectID(), listOpts)
@@ -66,9 +66,14 @@ func (opts *ListOpts) Run() error {
}
func (opts *ListOpts) newContainerListOptions() *atlas.ContainersListOptions {
+ lst := opts.NewAtlasListOptions()
return &atlas.ContainersListOptions{
ProviderName: opts.provider,
- ListOptions: *opts.NewListOptions(),
+ ListOptions: atlas.ListOptions{
+ PageNum: lst.PageNum,
+ ItemsPerPage: lst.ItemsPerPage,
+ IncludeCount: lst.IncludeCount,
+ },
}
}
diff --git a/internal/cli/networking/containers/list_test.go b/internal/cli/networking/containers/list_test.go
index 492e02057a..0c5a67d30e 100644
--- a/internal/cli/networking/containers/list_test.go
+++ b/internal/cli/networking/containers/list_test.go
@@ -52,7 +52,7 @@ func TestList_Run(t *testing.T) {
mockStore.
EXPECT().
- AllContainers(listOpts.ProjectID, listOpts.NewListOptions()).
+ AllContainers(listOpts.ProjectID, listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/organizations/apikeys/accesslists/list.go b/internal/cli/organizations/apikeys/accesslists/list.go
index 161b1c85ee..ebd5726074 100644
--- a/internal/cli/organizations/apikeys/accesslists/list.go
+++ b/internal/cli/organizations/apikeys/accesslists/list.go
@@ -21,7 +21,6 @@ import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/cli"
"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/pointer"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
"github.com/spf13/cobra"
@@ -49,13 +48,13 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
}
func (opts *ListOpts) Run() error {
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
params := &admin.ListApiKeyAccessListsEntriesApiParams{
OrgId: opts.ConfigOrgID(),
ApiUserId: opts.id,
- PageNum: pointer.Get(listOpts.PageNum),
- ItemsPerPage: pointer.Get(listOpts.ItemsPerPage),
- IncludeCount: pointer.Get(listOpts.IncludeCount),
+ PageNum: &listOpts.PageNum,
+ ItemsPerPage: &listOpts.ItemsPerPage,
+ IncludeCount: &listOpts.IncludeCount,
}
result, err := opts.store.OrganizationAPIKeyAccessLists(params)
if err != nil {
diff --git a/internal/cli/organizations/apikeys/accesslists/list_test.go b/internal/cli/organizations/apikeys/accesslists/list_test.go
index afe1d484bb..b43f81d132 100644
--- a/internal/cli/organizations/apikeys/accesslists/list_test.go
+++ b/internal/cli/organizations/apikeys/accesslists/list_test.go
@@ -33,7 +33,7 @@ func TestListOpts_Run(t *testing.T) {
opts := &ListOpts{
store: mockStore,
}
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
params := &admin.ListApiKeyAccessListsEntriesApiParams{
OrgId: opts.OrgID,
diff --git a/internal/cli/organizations/apikeys/list.go b/internal/cli/organizations/apikeys/list.go
index 4a9619fe33..ca7141f772 100644
--- a/internal/cli/organizations/apikeys/list.go
+++ b/internal/cli/organizations/apikeys/list.go
@@ -48,7 +48,7 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
}
func (opts *ListOpts) Run() error {
- r, err := opts.store.OrganizationAPIKeys(opts.ConfigOrgID(), opts.NewListOptions())
+ r, err := opts.store.OrganizationAPIKeys(opts.ConfigOrgID(), opts.NewAtlasListOptions())
if err != nil {
return err
diff --git a/internal/cli/organizations/apikeys/list_test.go b/internal/cli/organizations/apikeys/list_test.go
index 5c822ccee6..e6002825b5 100644
--- a/internal/cli/organizations/apikeys/list_test.go
+++ b/internal/cli/organizations/apikeys/list_test.go
@@ -37,7 +37,7 @@ func TestListOpts_Run(t *testing.T) {
mockStore.
EXPECT().
- OrganizationAPIKeys(opts.OrgID, opts.NewListOptions()).
+ OrganizationAPIKeys(opts.OrgID, opts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/organizations/list.go b/internal/cli/organizations/list.go
index 49b8cc3769..6b62801752 100644
--- a/internal/cli/organizations/list.go
+++ b/internal/cli/organizations/list.go
@@ -61,7 +61,7 @@ func (opts *ListOpts) newOrganizationListOptions() *atlasv2.ListOrganizationsApi
params := &atlasv2.ListOrganizationsApiParams{
Name: &opts.name,
}
- if listOpt := opts.NewListOptions(); listOpt != nil {
+ if listOpt := opts.NewAtlasListOptions(); listOpt != nil {
params.PageNum = &listOpt.PageNum
params.ItemsPerPage = &listOpt.ItemsPerPage
params.IncludeCount = &listOpt.IncludeCount
diff --git a/internal/cli/organizations/users/list.go b/internal/cli/organizations/users/list.go
index dd30383431..1c4dfce077 100644
--- a/internal/cli/organizations/users/list.go
+++ b/internal/cli/organizations/users/list.go
@@ -46,7 +46,7 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
}
func (opts *ListOpts) Run() error {
- listOptions := opts.NewListOptions()
+ listOptions := opts.NewAtlasListOptions()
r, err := opts.store.OrganizationUsers(opts.ConfigOrgID(), listOptions)
if err != nil {
diff --git a/internal/cli/organizations/users/list_test.go b/internal/cli/organizations/users/list_test.go
index 72e98c8b28..f02c3dad42 100644
--- a/internal/cli/organizations/users/list_test.go
+++ b/internal/cli/organizations/users/list_test.go
@@ -47,7 +47,7 @@ func TestList_Run(t *testing.T) {
mockStore.
EXPECT().
- OrganizationUsers(listOpts.ConfigOrgID(), listOpts.NewListOptions()).
+ OrganizationUsers(listOpts.ConfigOrgID(), listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/privateendpoints/list.go b/internal/cli/privateendpoints/list.go
index 7614f72bdc..a126aa23bd 100644
--- a/internal/cli/privateendpoints/list.go
+++ b/internal/cli/privateendpoints/list.go
@@ -44,7 +44,7 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
}
func (opts *ListOpts) Run() error {
- r, err := opts.store.PrivateEndpointsDeprecated(opts.ConfigProjectID(), opts.NewListOptions())
+ r, err := opts.store.PrivateEndpointsDeprecated(opts.ConfigProjectID(), opts.NewAtlasListOptions())
if err != nil {
return err
diff --git a/internal/cli/privateendpoints/list_test.go b/internal/cli/privateendpoints/list_test.go
index 4540ae99dc..5ce68e107f 100644
--- a/internal/cli/privateendpoints/list_test.go
+++ b/internal/cli/privateendpoints/list_test.go
@@ -37,7 +37,7 @@ func TestList_Run(t *testing.T) {
mockStore.
EXPECT().
- PrivateEndpointsDeprecated(listOpts.ProjectID, listOpts.NewListOptions()).
+ PrivateEndpointsDeprecated(listOpts.ProjectID, listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/processes/list.go b/internal/cli/processes/list.go
index 921fa88772..f92fc7a255 100644
--- a/internal/cli/processes/list.go
+++ b/internal/cli/processes/list.go
@@ -63,7 +63,7 @@ func (opts *ListOpts) Run() error {
}
func (opts *ListOpts) newProcessesListParams() *atlasv2.ListAtlasProcessesApiParams {
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
processesList := &atlasv2.ListAtlasProcessesApiParams{
GroupId: opts.ConfigProjectID(),
}
diff --git a/internal/cli/projects/apikeys/list.go b/internal/cli/projects/apikeys/list.go
index 691a159199..8e8bd9410c 100644
--- a/internal/cli/projects/apikeys/list.go
+++ b/internal/cli/projects/apikeys/list.go
@@ -48,7 +48,7 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
}
func (opts *ListOpts) Run() error {
- listOptions := opts.NewListOptions()
+ listOptions := opts.NewAtlasListOptions()
r, err := opts.store.ProjectAPIKeys(opts.ConfigProjectID(), listOptions)
if err != nil {
diff --git a/internal/cli/projects/apikeys/list_test.go b/internal/cli/projects/apikeys/list_test.go
index 75184e2da8..3466aea4fc 100644
--- a/internal/cli/projects/apikeys/list_test.go
+++ b/internal/cli/projects/apikeys/list_test.go
@@ -44,7 +44,7 @@ func TestList_Run(t *testing.T) {
mockStore.
EXPECT().
- ProjectAPIKeys(listOpts.ProjectID, listOpts.NewListOptions()).
+ ProjectAPIKeys(listOpts.ProjectID, listOpts.NewAtlasListOptions()).
Return(&expected, nil).
Times(1)
diff --git a/internal/cli/serverless/backup/restores/list.go b/internal/cli/serverless/backup/restores/list.go
index 12a4ab31e3..9826d5ba1b 100644
--- a/internal/cli/serverless/backup/restores/list.go
+++ b/internal/cli/serverless/backup/restores/list.go
@@ -47,7 +47,7 @@ var restoreListTemplate = `ID SNAPSHOT CLUSTER TYPE EXPIRES AT{{range valueOrEmp
`
func (opts *ListOpts) Run() error {
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
r, err := opts.store.ServerlessRestoreJobs(opts.ConfigProjectID(), opts.clusterName, listOpts)
if err != nil {
return err
diff --git a/internal/cli/serverless/backup/restores/list_test.go b/internal/cli/serverless/backup/restores/list_test.go
index fdd204eaf6..b381cf6cfe 100644
--- a/internal/cli/serverless/backup/restores/list_test.go
+++ b/internal/cli/serverless/backup/restores/list_test.go
@@ -46,7 +46,7 @@ func TestListOpts_Run(t *testing.T) {
mockStore.
EXPECT().
- ServerlessRestoreJobs(listOpts.ProjectID, "Cluster0", listOpts.NewListOptions()).
+ ServerlessRestoreJobs(listOpts.ProjectID, "Cluster0", listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/serverless/backup/snapshots/list.go b/internal/cli/serverless/backup/snapshots/list.go
index 36f7559965..9cd7eebb19 100644
--- a/internal/cli/serverless/backup/snapshots/list.go
+++ b/internal/cli/serverless/backup/snapshots/list.go
@@ -47,7 +47,7 @@ var listTemplate = `ID TYPE STATUS CREATED AT EXPIRES AT{{range valueOrEmptySlic
`
func (opts *ListOpts) Run() error {
- listOpts := opts.NewListOptions()
+ listOpts := opts.NewAtlasListOptions()
r, err := opts.store.ServerlessSnapshots(opts.ConfigProjectID(), opts.clusterName, listOpts)
if err != nil {
return err
diff --git a/internal/cli/serverless/backup/snapshots/list_test.go b/internal/cli/serverless/backup/snapshots/list_test.go
index 32a5e96a2b..b8ec91c5bb 100644
--- a/internal/cli/serverless/backup/snapshots/list_test.go
+++ b/internal/cli/serverless/backup/snapshots/list_test.go
@@ -45,7 +45,7 @@ func TestList_Run(t *testing.T) {
mockStore.
EXPECT().
- ServerlessSnapshots(listOpts.ProjectID, "Cluster0", listOpts.NewListOptions()).
+ ServerlessSnapshots(listOpts.ProjectID, "Cluster0", listOpts.NewAtlasListOptions()).
Return(expected, nil).
Times(1)
diff --git a/internal/cli/teams/list.go b/internal/cli/teams/list.go
index 18669a39dc..8a22b7ca2b 100644
--- a/internal/cli/teams/list.go
+++ b/internal/cli/teams/list.go
@@ -48,7 +48,7 @@ func (opts *ListOpts) initStore(ctx context.Context) func() error {
}
func (opts *ListOpts) Run() error {
- listOptions := opts.NewListOptions()
+ listOptions := opts.NewAtlasListOptions()
r, err := opts.store.Teams(opts.ConfigOrgID(), listOptions)
if err != nil {
diff --git a/internal/cli/teams/list_test.go b/internal/cli/teams/list_test.go
index ba1c91846e..e1ec2a2d95 100644
--- a/internal/cli/teams/list_test.go
+++ b/internal/cli/teams/list_test.go
@@ -44,7 +44,7 @@ func TestList_Run(t *testing.T) {
mockStore.
EXPECT().
- Teams(listOpts.OrgID, listOpts.NewListOptions()).
+ Teams(listOpts.OrgID, listOpts.NewAtlasListOptions()).
Return(&expected, nil).
Times(1)
diff --git a/internal/mocks/mock_access_role.go b/internal/mocks/mock_access_role.go
index c7445aa4e5..40c7970b82 100644
--- a/internal/mocks/mock_access_role.go
+++ b/internal/mocks/mock_access_role.go
@@ -9,7 +9,6 @@ import (
gomock "github.com/golang/mock/gomock"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockCloudProviderAccessRoleCreator is a mock of CloudProviderAccessRoleCreator interface.
@@ -74,7 +73,7 @@ func (m *MockCloudProviderAccessRoleAuthorizer) EXPECT() *MockCloudProviderAcces
}
// AuthorizeCloudProviderAccessRole mocks base method.
-func (m *MockCloudProviderAccessRoleAuthorizer) AuthorizeCloudProviderAccessRole(arg0, arg1 string, arg2 *mongodbatlas.CloudProviderAccessRoleRequest) (*admin.CloudProviderAccessRole, error) {
+func (m *MockCloudProviderAccessRoleAuthorizer) AuthorizeCloudProviderAccessRole(arg0, arg1 string, arg2 *admin.CloudProviderAccessRoleRequestUpdate) (*admin.CloudProviderAccessRole, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "AuthorizeCloudProviderAccessRole", arg0, arg1, arg2)
ret0, _ := ret[0].(*admin.CloudProviderAccessRole)
@@ -150,15 +149,15 @@ func (m *MockCloudProviderAccessRoleDeauthorizer) EXPECT() *MockCloudProviderAcc
}
// DeauthorizeCloudProviderAccessRoles mocks base method.
-func (m *MockCloudProviderAccessRoleDeauthorizer) DeauthorizeCloudProviderAccessRoles(arg0 *mongodbatlas.CloudProviderDeauthorizationRequest) error {
+func (m *MockCloudProviderAccessRoleDeauthorizer) DeauthorizeCloudProviderAccessRoles(arg0, arg1, arg2 string) error {
m.ctrl.T.Helper()
- ret := m.ctrl.Call(m, "DeauthorizeCloudProviderAccessRoles", arg0)
+ ret := m.ctrl.Call(m, "DeauthorizeCloudProviderAccessRoles", arg0, arg1, arg2)
ret0, _ := ret[0].(error)
return ret0
}
// DeauthorizeCloudProviderAccessRoles indicates an expected call of DeauthorizeCloudProviderAccessRoles.
-func (mr *MockCloudProviderAccessRoleDeauthorizerMockRecorder) DeauthorizeCloudProviderAccessRoles(arg0 interface{}) *gomock.Call {
+func (mr *MockCloudProviderAccessRoleDeauthorizerMockRecorder) DeauthorizeCloudProviderAccessRoles(arg0, arg1, arg2 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
- return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeauthorizeCloudProviderAccessRoles", reflect.TypeOf((*MockCloudProviderAccessRoleDeauthorizer)(nil).DeauthorizeCloudProviderAccessRoles), arg0)
+ return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeauthorizeCloudProviderAccessRoles", reflect.TypeOf((*MockCloudProviderAccessRoleDeauthorizer)(nil).DeauthorizeCloudProviderAccessRoles), arg0, arg1, arg2)
}
diff --git a/internal/mocks/mock_api_keys.go b/internal/mocks/mock_api_keys.go
index 4409f06009..24b7a7d270 100644
--- a/internal/mocks/mock_api_keys.go
+++ b/internal/mocks/mock_api_keys.go
@@ -8,8 +8,8 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockProjectAPIKeyLister is a mock of ProjectAPIKeyLister interface.
@@ -36,7 +36,7 @@ func (m *MockProjectAPIKeyLister) EXPECT() *MockProjectAPIKeyListerMockRecorder
}
// ProjectAPIKeys mocks base method.
-func (m *MockProjectAPIKeyLister) ProjectAPIKeys(arg0 string, arg1 *mongodbatlas.ListOptions) (*admin.PaginatedApiApiUser, error) {
+func (m *MockProjectAPIKeyLister) ProjectAPIKeys(arg0 string, arg1 *store.ListOptions) (*admin.PaginatedApiApiUser, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ProjectAPIKeys", arg0, arg1)
ret0, _ := ret[0].(*admin.PaginatedApiApiUser)
@@ -112,7 +112,7 @@ func (m *MockOrganizationAPIKeyLister) EXPECT() *MockOrganizationAPIKeyListerMoc
}
// OrganizationAPIKeys mocks base method.
-func (m *MockOrganizationAPIKeyLister) OrganizationAPIKeys(arg0 string, arg1 *mongodbatlas.ListOptions) (*admin.PaginatedApiApiUser, error) {
+func (m *MockOrganizationAPIKeyLister) OrganizationAPIKeys(arg0 string, arg1 *store.ListOptions) (*admin.PaginatedApiApiUser, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "OrganizationAPIKeys", arg0, arg1)
ret0, _ := ret[0].(*admin.PaginatedApiApiUser)
diff --git a/internal/mocks/mock_cloud_provider_backup.go b/internal/mocks/mock_cloud_provider_backup.go
index 27e2222b2a..7e78f6806f 100644
--- a/internal/mocks/mock_cloud_provider_backup.go
+++ b/internal/mocks/mock_cloud_provider_backup.go
@@ -8,9 +8,9 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20240530005/admin"
admin0 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockRestoreJobsLister is a mock of RestoreJobsLister interface.
@@ -52,7 +52,7 @@ func (mr *MockRestoreJobsListerMockRecorder) RestoreFlexClusterJobs(arg0 interfa
}
// RestoreJobs mocks base method.
-func (m *MockRestoreJobsLister) RestoreJobs(arg0, arg1 string, arg2 *mongodbatlas.ListOptions) (*admin0.PaginatedCloudBackupRestoreJob, error) {
+func (m *MockRestoreJobsLister) RestoreJobs(arg0, arg1 string, arg2 *store.ListOptions) (*admin0.PaginatedCloudBackupRestoreJob, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "RestoreJobs", arg0, arg1, arg2)
ret0, _ := ret[0].(*admin0.PaginatedCloudBackupRestoreJob)
@@ -226,7 +226,7 @@ func (mr *MockSnapshotsListerMockRecorder) FlexClusterSnapshots(arg0 interface{}
}
// Snapshots mocks base method.
-func (m *MockSnapshotsLister) Snapshots(arg0, arg1 string, arg2 *mongodbatlas.ListOptions) (*admin0.PaginatedCloudBackupReplicaSet, error) {
+func (m *MockSnapshotsLister) Snapshots(arg0, arg1 string, arg2 *store.ListOptions) (*admin0.PaginatedCloudBackupReplicaSet, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Snapshots", arg0, arg1, arg2)
ret0, _ := ret[0].(*admin0.PaginatedCloudBackupReplicaSet)
@@ -392,7 +392,7 @@ func (m *MockExportJobsLister) EXPECT() *MockExportJobsListerMockRecorder {
}
// ExportJobs mocks base method.
-func (m *MockExportJobsLister) ExportJobs(arg0, arg1 string, arg2 *mongodbatlas.ListOptions) (*admin0.PaginatedApiAtlasDiskBackupExportJob, error) {
+func (m *MockExportJobsLister) ExportJobs(arg0, arg1 string, arg2 *store.ListOptions) (*admin0.PaginatedApiAtlasDiskBackupExportJob, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ExportJobs", arg0, arg1, arg2)
ret0, _ := ret[0].(*admin0.PaginatedApiAtlasDiskBackupExportJob)
@@ -506,7 +506,7 @@ func (m *MockExportBucketsLister) EXPECT() *MockExportBucketsListerMockRecorder
}
// ExportBuckets mocks base method.
-func (m *MockExportBucketsLister) ExportBuckets(arg0 string, arg1 *mongodbatlas.ListOptions) (*admin0.PaginatedBackupSnapshotExportBuckets, error) {
+func (m *MockExportBucketsLister) ExportBuckets(arg0 string, arg1 *store.ListOptions) (*admin0.PaginatedBackupSnapshotExportBuckets, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ExportBuckets", arg0, arg1)
ret0, _ := ret[0].(*admin0.PaginatedBackupSnapshotExportBuckets)
diff --git a/internal/mocks/mock_cloud_provider_backup_serverless.go b/internal/mocks/mock_cloud_provider_backup_serverless.go
index b51d9dd403..151a446625 100644
--- a/internal/mocks/mock_cloud_provider_backup_serverless.go
+++ b/internal/mocks/mock_cloud_provider_backup_serverless.go
@@ -8,8 +8,8 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockServerlessSnapshotsLister is a mock of ServerlessSnapshotsLister interface.
@@ -36,7 +36,7 @@ func (m *MockServerlessSnapshotsLister) EXPECT() *MockServerlessSnapshotsListerM
}
// ServerlessSnapshots mocks base method.
-func (m *MockServerlessSnapshotsLister) ServerlessSnapshots(arg0, arg1 string, arg2 *mongodbatlas.ListOptions) (*admin.PaginatedApiAtlasServerlessBackupSnapshot, error) {
+func (m *MockServerlessSnapshotsLister) ServerlessSnapshots(arg0, arg1 string, arg2 *store.ListOptions) (*admin.PaginatedApiAtlasServerlessBackupSnapshot, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ServerlessSnapshots", arg0, arg1, arg2)
ret0, _ := ret[0].(*admin.PaginatedApiAtlasServerlessBackupSnapshot)
@@ -112,7 +112,7 @@ func (m *MockServerlessRestoreJobsLister) EXPECT() *MockServerlessRestoreJobsLis
}
// ServerlessRestoreJobs mocks base method.
-func (m *MockServerlessRestoreJobsLister) ServerlessRestoreJobs(arg0, arg1 string, arg2 *mongodbatlas.ListOptions) (*admin.PaginatedApiAtlasServerlessBackupRestoreJob, error) {
+func (m *MockServerlessRestoreJobsLister) ServerlessRestoreJobs(arg0, arg1 string, arg2 *store.ListOptions) (*admin.PaginatedApiAtlasServerlessBackupRestoreJob, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ServerlessRestoreJobs", arg0, arg1, arg2)
ret0, _ := ret[0].(*admin.PaginatedApiAtlasServerlessBackupRestoreJob)
diff --git a/internal/mocks/mock_data_lake_pipelines.go b/internal/mocks/mock_data_lake_pipelines.go
index 90485501ee..f3789508b3 100644
--- a/internal/mocks/mock_data_lake_pipelines.go
+++ b/internal/mocks/mock_data_lake_pipelines.go
@@ -9,8 +9,8 @@ import (
time "time"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockPipelinesLister is a mock of PipelinesLister interface.
@@ -226,7 +226,7 @@ func (m *MockPipelineAvailableSnapshotsLister) EXPECT() *MockPipelineAvailableSn
}
// PipelineAvailableSnapshots mocks base method.
-func (m *MockPipelineAvailableSnapshotsLister) PipelineAvailableSnapshots(arg0, arg1 string, arg2 *time.Time, arg3 *mongodbatlas.ListOptions) (*admin.PaginatedBackupSnapshot, error) {
+func (m *MockPipelineAvailableSnapshotsLister) PipelineAvailableSnapshots(arg0, arg1 string, arg2 *time.Time, arg3 *store.ListOptions) (*admin.PaginatedBackupSnapshot, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "PipelineAvailableSnapshots", arg0, arg1, arg2, arg3)
ret0, _ := ret[0].(*admin.PaginatedBackupSnapshot)
diff --git a/internal/mocks/mock_deprecated_private_endpoints.go b/internal/mocks/mock_deprecated_private_endpoints.go
index f5894795ad..b1d1f60389 100644
--- a/internal/mocks/mock_deprecated_private_endpoints.go
+++ b/internal/mocks/mock_deprecated_private_endpoints.go
@@ -8,6 +8,7 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
@@ -35,7 +36,7 @@ func (m *MockPrivateEndpointListerDeprecated) EXPECT() *MockPrivateEndpointListe
}
// PrivateEndpointsDeprecated mocks base method.
-func (m *MockPrivateEndpointListerDeprecated) PrivateEndpointsDeprecated(arg0 string, arg1 *mongodbatlas.ListOptions) ([]mongodbatlas.PrivateEndpointConnectionDeprecated, error) {
+func (m *MockPrivateEndpointListerDeprecated) PrivateEndpointsDeprecated(arg0 string, arg1 *store.ListOptions) ([]mongodbatlas.PrivateEndpointConnectionDeprecated, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "PrivateEndpointsDeprecated", arg0, arg1)
ret0, _ := ret[0].([]mongodbatlas.PrivateEndpointConnectionDeprecated)
diff --git a/internal/mocks/mock_online_archives.go b/internal/mocks/mock_online_archives.go
index 2062ac14d3..caafa33430 100644
--- a/internal/mocks/mock_online_archives.go
+++ b/internal/mocks/mock_online_archives.go
@@ -8,8 +8,8 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockOnlineArchiveLister is a mock of OnlineArchiveLister interface.
@@ -36,7 +36,7 @@ func (m *MockOnlineArchiveLister) EXPECT() *MockOnlineArchiveListerMockRecorder
}
// OnlineArchives mocks base method.
-func (m *MockOnlineArchiveLister) OnlineArchives(arg0, arg1 string, arg2 *mongodbatlas.ListOptions) (*admin.PaginatedOnlineArchive, error) {
+func (m *MockOnlineArchiveLister) OnlineArchives(arg0, arg1 string, arg2 *store.ListOptions) (*admin.PaginatedOnlineArchive, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "OnlineArchives", arg0, arg1, arg2)
ret0, _ := ret[0].(*admin.PaginatedOnlineArchive)
diff --git a/internal/mocks/mock_peering_connections.go b/internal/mocks/mock_peering_connections.go
index 9f8d9ff403..585ac8bc9a 100644
--- a/internal/mocks/mock_peering_connections.go
+++ b/internal/mocks/mock_peering_connections.go
@@ -407,7 +407,7 @@ func (m *MockContainersLister) EXPECT() *MockContainersListerMockRecorder {
}
// AllContainers mocks base method.
-func (m *MockContainersLister) AllContainers(arg0 string, arg1 *mongodbatlas.ListOptions) ([]admin.CloudProviderContainer, error) {
+func (m *MockContainersLister) AllContainers(arg0 string, arg1 *store.ListOptions) ([]admin.CloudProviderContainer, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "AllContainers", arg0, arg1)
ret0, _ := ret[0].([]admin.CloudProviderContainer)
diff --git a/internal/mocks/mock_process_databases.go b/internal/mocks/mock_process_databases.go
index bdfa12247c..ff7c178e9a 100644
--- a/internal/mocks/mock_process_databases.go
+++ b/internal/mocks/mock_process_databases.go
@@ -8,8 +8,8 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockProcessDatabaseLister is a mock of ProcessDatabaseLister interface.
@@ -36,7 +36,7 @@ func (m *MockProcessDatabaseLister) EXPECT() *MockProcessDatabaseListerMockRecor
}
// ProcessDatabases mocks base method.
-func (m *MockProcessDatabaseLister) ProcessDatabases(arg0, arg1 string, arg2 int, arg3 *mongodbatlas.ListOptions) (*admin.PaginatedDatabase, error) {
+func (m *MockProcessDatabaseLister) ProcessDatabases(arg0, arg1 string, arg2 int, arg3 *store.ListOptions) (*admin.PaginatedDatabase, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ProcessDatabases", arg0, arg1, arg2, arg3)
ret0, _ := ret[0].(*admin.PaginatedDatabase)
diff --git a/internal/mocks/mock_process_disks.go b/internal/mocks/mock_process_disks.go
index d97022a76e..8c3fc13e13 100644
--- a/internal/mocks/mock_process_disks.go
+++ b/internal/mocks/mock_process_disks.go
@@ -8,8 +8,8 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockProcessDisksLister is a mock of ProcessDisksLister interface.
@@ -36,7 +36,7 @@ func (m *MockProcessDisksLister) EXPECT() *MockProcessDisksListerMockRecorder {
}
// ProcessDisks mocks base method.
-func (m *MockProcessDisksLister) ProcessDisks(arg0, arg1 string, arg2 int, arg3 *mongodbatlas.ListOptions) (*admin.PaginatedDiskPartition, error) {
+func (m *MockProcessDisksLister) ProcessDisks(arg0, arg1 string, arg2 int, arg3 *store.ListOptions) (*admin.PaginatedDiskPartition, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ProcessDisks", arg0, arg1, arg2, arg3)
ret0, _ := ret[0].(*admin.PaginatedDiskPartition)
diff --git a/internal/mocks/mock_teams.go b/internal/mocks/mock_teams.go
index 4f0f40581d..2f6463700a 100644
--- a/internal/mocks/mock_teams.go
+++ b/internal/mocks/mock_teams.go
@@ -8,8 +8,8 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockTeamLister is a mock of TeamLister interface.
@@ -36,7 +36,7 @@ func (m *MockTeamLister) EXPECT() *MockTeamListerMockRecorder {
}
// Teams mocks base method.
-func (m *MockTeamLister) Teams(arg0 string, arg1 *mongodbatlas.ListOptions) (*admin.PaginatedTeam, error) {
+func (m *MockTeamLister) Teams(arg0 string, arg1 *store.ListOptions) (*admin.PaginatedTeam, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Teams", arg0, arg1)
ret0, _ := ret[0].(*admin.PaginatedTeam)
diff --git a/internal/mocks/mock_users.go b/internal/mocks/mock_users.go
index a16a7f2496..b95567336d 100644
--- a/internal/mocks/mock_users.go
+++ b/internal/mocks/mock_users.go
@@ -8,8 +8,8 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
+ store "github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store"
admin "go.mongodb.org/atlas-sdk/v20250312002/admin"
- mongodbatlas "go.mongodb.org/atlas/mongodbatlas"
)
// MockUserCreator is a mock of UserCreator interface.
@@ -127,7 +127,7 @@ func (m *MockUserLister) EXPECT() *MockUserListerMockRecorder {
}
// OrganizationUsers mocks base method.
-func (m *MockUserLister) OrganizationUsers(arg0 string, arg1 *mongodbatlas.ListOptions) (*admin.PaginatedOrgUser, error) {
+func (m *MockUserLister) OrganizationUsers(arg0 string, arg1 *store.ListOptions) (*admin.PaginatedOrgUser, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "OrganizationUsers", arg0, arg1)
ret0, _ := ret[0].(*admin.PaginatedOrgUser)
diff --git a/internal/store/access_role.go b/internal/store/access_role.go
index bb702e1e2c..38eaa3ce66 100644
--- a/internal/store/access_role.go
+++ b/internal/store/access_role.go
@@ -16,7 +16,6 @@ package store
import (
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_access_role.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store CloudProviderAccessRoleCreator,CloudProviderAccessRoleAuthorizer,CloudProviderAccessRoleLister,CloudProviderAccessRoleDeauthorizer
@@ -30,12 +29,12 @@ type CloudProviderAccessRoleLister interface {
}
type CloudProviderAccessRoleDeauthorizer interface {
- DeauthorizeCloudProviderAccessRoles(*atlas.CloudProviderDeauthorizationRequest) error
+ DeauthorizeCloudProviderAccessRoles(string, string, string) error
}
// CloudProviderAccessRoleAuthorizer encapsulates the logic to manage different cloud providers.
type CloudProviderAccessRoleAuthorizer interface {
- AuthorizeCloudProviderAccessRole(string, string, *atlas.CloudProviderAccessRoleRequest) (*atlasv2.CloudProviderAccessRole, error)
+ AuthorizeCloudProviderAccessRole(string, string, *atlasv2.CloudProviderAccessRoleRequestUpdate) (*atlasv2.CloudProviderAccessRole, error)
}
// CreateCloudProviderAccessRole encapsulates the logic to manage different cloud providers.
@@ -54,17 +53,13 @@ func (s *Store) CloudProviderAccessRoles(groupID string) (*atlasv2.CloudProvider
}
// DeauthorizeCloudProviderAccessRoles encapsulates the logic to manage different cloud providers.
-func (s *Store) DeauthorizeCloudProviderAccessRoles(req *atlas.CloudProviderDeauthorizationRequest) error {
- _, err := s.clientv2.CloudProviderAccessApi.DeauthorizeCloudProviderAccessRole(s.ctx, req.GroupID, req.ProviderName, req.RoleID).Execute()
+func (s *Store) DeauthorizeCloudProviderAccessRoles(groupID string, cloudProvider string, roleID string) error {
+ _, err := s.clientv2.CloudProviderAccessApi.DeauthorizeCloudProviderAccessRole(s.ctx, groupID, cloudProvider, roleID).Execute()
return err
}
// AuthorizeCloudProviderAccessRole encapsulates the logic to manage different cloud providers.
-func (s *Store) AuthorizeCloudProviderAccessRole(groupID, roleID string, req *atlas.CloudProviderAccessRoleRequest) (*atlasv2.CloudProviderAccessRole, error) {
- role := atlasv2.CloudProviderAccessRoleRequestUpdate{
- ProviderName: req.ProviderName,
- IamAssumedRoleArn: req.IAMAssumedRoleARN,
- }
- result, _, err := s.clientv2.CloudProviderAccessApi.AuthorizeCloudProviderAccessRole(s.ctx, groupID, roleID, &role).Execute()
+func (s *Store) AuthorizeCloudProviderAccessRole(groupID, roleID string, req *atlasv2.CloudProviderAccessRoleRequestUpdate) (*atlasv2.CloudProviderAccessRole, error) {
+ result, _, err := s.clientv2.CloudProviderAccessApi.AuthorizeCloudProviderAccessRole(s.ctx, groupID, roleID, req).Execute()
return result, err
}
diff --git a/internal/store/api_keys.go b/internal/store/api_keys.go
index 9a4b028b09..82a7d893ee 100644
--- a/internal/store/api_keys.go
+++ b/internal/store/api_keys.go
@@ -16,13 +16,12 @@ package store
import (
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_api_keys.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store ProjectAPIKeyLister,ProjectAPIKeyCreator,OrganizationAPIKeyLister,OrganizationAPIKeyDescriber,OrganizationAPIKeyUpdater,OrganizationAPIKeyCreator,OrganizationAPIKeyDeleter,ProjectAPIKeyDeleter,ProjectAPIKeyAssigner
type ProjectAPIKeyLister interface {
- ProjectAPIKeys(string, *atlas.ListOptions) (*atlasv2.PaginatedApiApiUser, error)
+ ProjectAPIKeys(string, *ListOptions) (*atlasv2.PaginatedApiApiUser, error)
}
type ProjectAPIKeyCreator interface {
@@ -38,7 +37,7 @@ type ProjectAPIKeyAssigner interface {
}
type OrganizationAPIKeyLister interface {
- OrganizationAPIKeys(string, *atlas.ListOptions) (*atlasv2.PaginatedApiApiUser, error)
+ OrganizationAPIKeys(string, *ListOptions) (*atlasv2.PaginatedApiApiUser, error)
}
type OrganizationAPIKeyDescriber interface {
@@ -58,7 +57,7 @@ type OrganizationAPIKeyDeleter interface {
}
// OrganizationAPIKeys encapsulates the logic to manage different cloud providers.
-func (s *Store) OrganizationAPIKeys(orgID string, opts *atlas.ListOptions) (*atlasv2.PaginatedApiApiUser, error) {
+func (s *Store) OrganizationAPIKeys(orgID string, opts *ListOptions) (*atlasv2.PaginatedApiApiUser, error) {
res := s.clientv2.ProgrammaticAPIKeysApi.ListApiKeys(s.ctx, orgID)
if opts != nil {
res = res.ItemsPerPage(opts.ItemsPerPage).PageNum(opts.PageNum).IncludeCount(opts.IncludeCount)
@@ -92,7 +91,7 @@ func (s *Store) DeleteOrganizationAPIKey(orgID, id string) error {
}
// ProjectAPIKeys returns the API Keys for a specific project.
-func (s *Store) ProjectAPIKeys(projectID string, opts *atlas.ListOptions) (*atlasv2.PaginatedApiApiUser, error) {
+func (s *Store) ProjectAPIKeys(projectID string, opts *ListOptions) (*atlasv2.PaginatedApiApiUser, error) {
res := s.clientv2.ProgrammaticAPIKeysApi.ListProjectApiKeys(s.ctx, projectID)
if opts != nil {
res = res.PageNum(opts.PageNum).ItemsPerPage(opts.ItemsPerPage).IncludeCount(opts.IncludeCount)
diff --git a/internal/store/cloud_provider_backup.go b/internal/store/cloud_provider_backup.go
index b6d1b5fd31..36b63b18a5 100644
--- a/internal/store/cloud_provider_backup.go
+++ b/internal/store/cloud_provider_backup.go
@@ -20,13 +20,12 @@ import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
atlasClustersPinned "go.mongodb.org/atlas-sdk/v20240530005/admin"
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_cloud_provider_backup.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store RestoreJobsLister,RestoreJobsDescriber,RestoreJobsCreator,SnapshotsLister,SnapshotsCreator,SnapshotsDescriber,SnapshotsDeleter,ExportJobsLister,ExportJobsDescriber,ExportJobsCreator,ExportBucketsLister,ExportBucketsCreator,ExportBucketsDeleter,ExportBucketsDescriber,ScheduleDescriber,ScheduleDescriberUpdater,ScheduleDeleter,SnapshotsDownloader
type RestoreJobsLister interface {
- RestoreJobs(string, string, *atlas.ListOptions) (*atlasv2.PaginatedCloudBackupRestoreJob, error)
+ RestoreJobs(string, string, *ListOptions) (*atlasv2.PaginatedCloudBackupRestoreJob, error)
RestoreFlexClusterJobs(args *atlasv2.ListFlexBackupRestoreJobsApiParams) (*atlasv2.PaginatedApiAtlasFlexBackupRestoreJob20241113, error)
}
@@ -42,7 +41,7 @@ type RestoreJobsCreator interface {
}
type SnapshotsLister interface {
- Snapshots(string, string, *atlas.ListOptions) (*atlasv2.PaginatedCloudBackupReplicaSet, error)
+ Snapshots(string, string, *ListOptions) (*atlasv2.PaginatedCloudBackupReplicaSet, error)
FlexClusterSnapshots(*atlasv2.ListFlexBackupsApiParams) (*atlasv2.PaginatedApiAtlasFlexBackupSnapshot20241113, error)
}
@@ -64,7 +63,7 @@ type SnapshotsDeleter interface {
}
type ExportJobsLister interface {
- ExportJobs(string, string, *atlas.ListOptions) (*atlasv2.PaginatedApiAtlasDiskBackupExportJob, error)
+ ExportJobs(string, string, *ListOptions) (*atlasv2.PaginatedApiAtlasDiskBackupExportJob, error)
}
type ExportJobsCreator interface {
@@ -72,7 +71,7 @@ type ExportJobsCreator interface {
}
type ExportBucketsLister interface {
- ExportBuckets(string, *atlas.ListOptions) (*atlasv2.PaginatedBackupSnapshotExportBuckets, error)
+ ExportBuckets(string, *ListOptions) (*atlasv2.PaginatedBackupSnapshotExportBuckets, error)
}
type ExportJobsDescriber interface {
@@ -105,7 +104,7 @@ type ScheduleDeleter interface {
}
// RestoreJobs encapsulates the logic to manage different cloud providers.
-func (s *Store) RestoreJobs(projectID, clusterName string, opts *atlas.ListOptions) (*atlasv2.PaginatedCloudBackupRestoreJob, error) {
+func (s *Store) RestoreJobs(projectID, clusterName string, opts *ListOptions) (*atlasv2.PaginatedCloudBackupRestoreJob, error) {
res := s.clientv2.CloudBackupsApi.ListBackupRestoreJobs(s.ctx, projectID, clusterName)
if opts != nil {
res = res.PageNum(opts.PageNum).ItemsPerPage(opts.ItemsPerPage).IncludeCount(opts.IncludeCount)
@@ -159,7 +158,7 @@ func (s *Store) CreateSnapshot(projectID, clusterName string, request *atlasv2.D
}
// Snapshots encapsulates the logic to manage different cloud providers.
-func (s *Store) Snapshots(projectID, clusterName string, opts *atlas.ListOptions) (*atlasv2.PaginatedCloudBackupReplicaSet, error) {
+func (s *Store) Snapshots(projectID, clusterName string, opts *ListOptions) (*atlasv2.PaginatedCloudBackupReplicaSet, error) {
res := s.clientv2.CloudBackupsApi.ListReplicaSetBackups(s.ctx, projectID, clusterName)
if opts != nil {
res = res.PageNum(opts.PageNum).ItemsPerPage(opts.ItemsPerPage).IncludeCount(opts.IncludeCount)
@@ -210,7 +209,7 @@ func (s *Store) DeleteSnapshot(projectID, clusterName, snapshotID string) error
}
// ExportJobs encapsulates the logic to manage different cloud providers.
-func (s *Store) ExportJobs(projectID, clusterName string, opts *atlas.ListOptions) (*atlasv2.PaginatedApiAtlasDiskBackupExportJob, error) {
+func (s *Store) ExportJobs(projectID, clusterName string, opts *ListOptions) (*atlasv2.PaginatedApiAtlasDiskBackupExportJob, error) {
res := s.clientv2.CloudBackupsApi.ListBackupExportJobs(s.ctx, projectID, clusterName)
if opts != nil {
res = res.PageNum(opts.PageNum).ItemsPerPage(opts.ItemsPerPage)
@@ -232,7 +231,7 @@ func (s *Store) CreateExportJob(projectID, clusterName string, job *atlasv2.Disk
}
// ExportBuckets encapsulates the logic to manage different cloud providers.
-func (s *Store) ExportBuckets(projectID string, opts *atlas.ListOptions) (*atlasv2.PaginatedBackupSnapshotExportBuckets, error) {
+func (s *Store) ExportBuckets(projectID string, opts *ListOptions) (*atlasv2.PaginatedBackupSnapshotExportBuckets, error) {
res := s.clientv2.CloudBackupsApi.ListExportBuckets(s.ctx, projectID)
if opts != nil {
res = res.ItemsPerPage(opts.ItemsPerPage).PageNum(opts.PageNum).IncludeCount(opts.IncludeCount)
diff --git a/internal/store/cloud_provider_backup_serverless.go b/internal/store/cloud_provider_backup_serverless.go
index 4340d12ba3..3419dcbd18 100644
--- a/internal/store/cloud_provider_backup_serverless.go
+++ b/internal/store/cloud_provider_backup_serverless.go
@@ -19,13 +19,12 @@ import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_cloud_provider_backup_serverless.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store ServerlessSnapshotsLister,ServerlessSnapshotsDescriber,ServerlessRestoreJobsLister,ServerlessRestoreJobsDescriber,ServerlessRestoreJobsCreator
type ServerlessSnapshotsLister interface {
- ServerlessSnapshots(string, string, *atlas.ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupSnapshot, error)
+ ServerlessSnapshots(string, string, *ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupSnapshot, error)
}
type ServerlessSnapshotsDescriber interface {
@@ -33,7 +32,7 @@ type ServerlessSnapshotsDescriber interface {
}
type ServerlessRestoreJobsLister interface {
- ServerlessRestoreJobs(string, string, *atlas.ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupRestoreJob, error)
+ ServerlessRestoreJobs(string, string, *ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupRestoreJob, error)
}
type ServerlessRestoreJobsDescriber interface {
@@ -45,7 +44,7 @@ type ServerlessRestoreJobsCreator interface {
}
// ServerlessSnapshots encapsulates the logic to manage different cloud providers.
-func (s *Store) ServerlessSnapshots(projectID, clusterName string, opts *atlas.ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupSnapshot, error) {
+func (s *Store) ServerlessSnapshots(projectID, clusterName string, opts *ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupSnapshot, error) {
if s.service == config.CloudGovService {
return nil, fmt.Errorf("%w: %s", errUnsupportedService, s.service)
}
@@ -67,7 +66,7 @@ func (s *Store) ServerlessSnapshot(projectID, instanceName, snapshotID string) (
}
// ServerlessRestoreJobs encapsulates the logic to manage different cloud providers.
-func (s *Store) ServerlessRestoreJobs(projectID, instanceName string, opts *atlas.ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupRestoreJob, error) {
+func (s *Store) ServerlessRestoreJobs(projectID, instanceName string, opts *ListOptions) (*atlasv2.PaginatedApiAtlasServerlessBackupRestoreJob, error) {
if s.service == config.CloudGovService {
return nil, fmt.Errorf("%w: %s", errUnsupportedService, s.service)
}
@@ -88,7 +87,7 @@ func (s *Store) ServerlessRestoreJob(projectID, instanceName string, jobID strin
return result, err
}
-// CreateRestoreJobs encapsulates the logic to manage different cloud providers.
+// ServerlessCreateRestoreJobs encapsulates the logic to manage different cloud providers.
func (s *Store) ServerlessCreateRestoreJobs(projectID, clusterName string, request *atlasv2.ServerlessBackupRestoreJob) (*atlasv2.ServerlessBackupRestoreJob, error) {
result, _, err := s.clientv2.CloudBackupsApi.CreateServerlessBackupRestoreJob(s.ctx, projectID, clusterName, request).Execute()
return result, err
diff --git a/internal/store/data_lake_pipelines.go b/internal/store/data_lake_pipelines.go
index a9d0a634f1..2e87040675 100644
--- a/internal/store/data_lake_pipelines.go
+++ b/internal/store/data_lake_pipelines.go
@@ -20,7 +20,6 @@ import (
"time"
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_data_lake_pipelines.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store PipelinesLister,PipelinesDescriber,PipelinesCreator,PipelinesUpdater,PipelinesDeleter,PipelineAvailableSnapshotsLister,PipelineAvailableSchedulesLister,PipelinesTriggerer,PipelinesPauser,PipelinesResumer
@@ -46,7 +45,7 @@ type PipelinesUpdater interface {
}
type PipelineAvailableSnapshotsLister interface {
- PipelineAvailableSnapshots(string, string, *time.Time, *atlas.ListOptions) (*atlasv2.PaginatedBackupSnapshot, error)
+ PipelineAvailableSnapshots(string, string, *time.Time, *ListOptions) (*atlasv2.PaginatedBackupSnapshot, error)
}
type PipelineAvailableSchedulesLister interface {
@@ -102,7 +101,7 @@ func (s *Store) PipelineAvailableSchedules(projectID, pipelineName string) ([]at
}
// PipelineAvailableSnapshots encapsulates the logic to manage different cloud providers.
-func (s *Store) PipelineAvailableSnapshots(projectID, pipelineName string, completedAfter *time.Time, listOps *atlas.ListOptions) (*atlasv2.PaginatedBackupSnapshot, error) {
+func (s *Store) PipelineAvailableSnapshots(projectID, pipelineName string, completedAfter *time.Time, listOps *ListOptions) (*atlasv2.PaginatedBackupSnapshot, error) {
request := s.clientv2.DataLakePipelinesApi.ListPipelineSnapshots(s.ctx, projectID, pipelineName)
if completedAfter != nil {
request = request.CompletedAfter(*completedAfter)
diff --git a/internal/store/deprected_private_endpoints.go b/internal/store/deprected_private_endpoints.go
index 4ef727fb9c..2da5d41b00 100644
--- a/internal/store/deprected_private_endpoints.go
+++ b/internal/store/deprected_private_endpoints.go
@@ -21,7 +21,7 @@ import (
//go:generate mockgen -destination=../mocks/mock_deprecated_private_endpoints.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store PrivateEndpointListerDeprecated,PrivateEndpointDescriberDeprecated,PrivateEndpointCreatorDeprecated,PrivateEndpointDeleterDeprecated,InterfaceEndpointCreatorDeprecated,InterfaceEndpointDescriberDeprecated,InterfaceEndpointDeleterDeprecated
type PrivateEndpointListerDeprecated interface {
- PrivateEndpointsDeprecated(string, *atlas.ListOptions) ([]atlas.PrivateEndpointConnectionDeprecated, error)
+ PrivateEndpointsDeprecated(string, *ListOptions) ([]atlas.PrivateEndpointConnectionDeprecated, error)
}
type PrivateEndpointDescriberDeprecated interface {
@@ -49,8 +49,13 @@ type InterfaceEndpointDeleterDeprecated interface {
}
// PrivateEndpointsDeprecated encapsulates the logic to manage different cloud providers.
-func (s *Store) PrivateEndpointsDeprecated(projectID string, opts *atlas.ListOptions) ([]atlas.PrivateEndpointConnectionDeprecated, error) {
- result, _, err := s.client.PrivateEndpointsDeprecated.List(s.ctx, projectID, opts)
+func (s *Store) PrivateEndpointsDeprecated(projectID string, opts *ListOptions) ([]atlas.PrivateEndpointConnectionDeprecated, error) {
+ lst := &atlas.ListOptions{
+ PageNum: opts.PageNum,
+ ItemsPerPage: opts.ItemsPerPage,
+ IncludeCount: opts.IncludeCount,
+ }
+ result, _, err := s.client.PrivateEndpointsDeprecated.List(s.ctx, projectID, lst)
return result, err
}
diff --git a/internal/store/online_archives.go b/internal/store/online_archives.go
index 3c9483b805..d9c57c8624 100644
--- a/internal/store/online_archives.go
+++ b/internal/store/online_archives.go
@@ -19,13 +19,12 @@ import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/config"
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_online_archives.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store OnlineArchiveLister,OnlineArchiveDescriber,OnlineArchiveCreator,OnlineArchiveUpdater,OnlineArchiveDeleter
type OnlineArchiveLister interface {
- OnlineArchives(string, string, *atlas.ListOptions) (*atlasv2.PaginatedOnlineArchive, error)
+ OnlineArchives(string, string, *ListOptions) (*atlasv2.PaginatedOnlineArchive, error)
}
type OnlineArchiveDescriber interface {
@@ -45,7 +44,7 @@ type OnlineArchiveDeleter interface {
}
// OnlineArchives encapsulate the logic to manage different cloud providers.
-func (s *Store) OnlineArchives(projectID, clusterName string, lstOpt *atlas.ListOptions) (*atlasv2.PaginatedOnlineArchive, error) {
+func (s *Store) OnlineArchives(projectID, clusterName string, lstOpt *ListOptions) (*atlasv2.PaginatedOnlineArchive, error) {
if s.service == config.CloudGovService {
return nil, fmt.Errorf("%w: %s", errUnsupportedService, s.service)
}
diff --git a/internal/store/peering_connections.go b/internal/store/peering_connections.go
index 3417904c0b..d3e32171f7 100644
--- a/internal/store/peering_connections.go
+++ b/internal/store/peering_connections.go
@@ -55,7 +55,7 @@ type PeeringConnectionDeleter interface {
type ContainersLister interface {
ContainersByProvider(string, *atlas.ContainersListOptions) ([]atlasv2.CloudProviderContainer, error)
- AllContainers(string, *atlas.ListOptions) ([]atlasv2.CloudProviderContainer, error)
+ AllContainers(string, *ListOptions) ([]atlasv2.CloudProviderContainer, error)
}
type ContainersDeleter interface {
@@ -159,7 +159,7 @@ func (s *Store) GCPContainers(projectID string) ([]atlasv2.CloudProviderContaine
}
// AllContainers encapsulates the logic to manage different cloud providers.
-func (s *Store) AllContainers(projectID string, opts *atlas.ListOptions) ([]atlasv2.CloudProviderContainer, error) {
+func (s *Store) AllContainers(projectID string, opts *ListOptions) ([]atlasv2.CloudProviderContainer, error) {
res := s.clientv2.NetworkPeeringApi.ListPeeringContainers(s.ctx, projectID)
if opts != nil {
res = res.PageNum(opts.PageNum).ItemsPerPage(opts.ItemsPerPage)
diff --git a/internal/store/process_databases.go b/internal/store/process_databases.go
index b001f18e33..f5599c5f42 100644
--- a/internal/store/process_databases.go
+++ b/internal/store/process_databases.go
@@ -18,17 +18,16 @@ import (
"strconv"
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_process_databases.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store ProcessDatabaseLister
type ProcessDatabaseLister interface {
- ProcessDatabases(string, string, int, *atlas.ListOptions) (*atlasv2.PaginatedDatabase, error)
+ ProcessDatabases(string, string, int, *ListOptions) (*atlasv2.PaginatedDatabase, error)
}
// ProcessDatabases encapsulate the logic to manage different cloud providers.
-func (s *Store) ProcessDatabases(groupID, host string, port int, opts *atlas.ListOptions) (*atlasv2.PaginatedDatabase, error) {
+func (s *Store) ProcessDatabases(groupID, host string, port int, opts *ListOptions) (*atlasv2.PaginatedDatabase, error) {
process := host + ":" + strconv.Itoa(port)
result, _, err := s.clientv2.MonitoringAndLogsApi.ListDatabases(s.ctx, groupID, process).
PageNum(opts.PageNum).ItemsPerPage(opts.ItemsPerPage).IncludeCount(opts.IncludeCount).Execute()
diff --git a/internal/store/process_disks.go b/internal/store/process_disks.go
index 9612dc99f4..4e902346a4 100644
--- a/internal/store/process_disks.go
+++ b/internal/store/process_disks.go
@@ -18,17 +18,16 @@ import (
"strconv"
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_process_disks.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store ProcessDisksLister
type ProcessDisksLister interface {
- ProcessDisks(string, string, int, *atlas.ListOptions) (*atlasv2.PaginatedDiskPartition, error)
+ ProcessDisks(string, string, int, *ListOptions) (*atlasv2.PaginatedDiskPartition, error)
}
// ProcessDisks encapsulates the logic to manage different cloud providers.
-func (s *Store) ProcessDisks(groupID, host string, port int, opts *atlas.ListOptions) (*atlasv2.PaginatedDiskPartition, error) {
+func (s *Store) ProcessDisks(groupID, host string, port int, opts *ListOptions) (*atlasv2.PaginatedDiskPartition, error) {
processID := host + ":" + strconv.Itoa(port)
result, _, err := s.clientv2.MonitoringAndLogsApi.ListDiskPartitions(s.ctx, groupID, processID).
ItemsPerPage(opts.ItemsPerPage).PageNum(opts.PageNum).IncludeCount(opts.IncludeCount).Execute()
diff --git a/internal/store/store.go b/internal/store/store.go
index 8bed1a6183..bf6c969a87 100644
--- a/internal/store/store.go
+++ b/internal/store/store.go
@@ -33,6 +33,7 @@ import (
)
const (
+ CloudServiceURL = "https://cloud.mongodb.com/"
CloudGovServiceURL = "https://cloud.mongodbgov.com/"
)
diff --git a/internal/store/teams.go b/internal/store/teams.go
index 9330706160..6479cd79c2 100644
--- a/internal/store/teams.go
+++ b/internal/store/teams.go
@@ -16,13 +16,12 @@ package store
import (
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_teams.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store TeamLister,TeamDescriber,TeamCreator,TeamRenamer,TeamDeleter,TeamAdder,TeamUserRemover,TeamRolesUpdater
type TeamLister interface {
- Teams(string, *atlas.ListOptions) (*atlasv2.PaginatedTeam, error)
+ Teams(string, *ListOptions) (*atlasv2.PaginatedTeam, error)
}
type TeamDescriber interface {
@@ -67,7 +66,7 @@ func (s *Store) TeamByName(orgID, teamName string) (*atlasv2.TeamResponse, error
}
// Teams encapsulates the logic to manage different cloud providers.
-func (s *Store) Teams(orgID string, opts *atlas.ListOptions) (*atlasv2.PaginatedTeam, error) {
+func (s *Store) Teams(orgID string, opts *ListOptions) (*atlasv2.PaginatedTeam, error) {
res := s.clientv2.TeamsApi.ListOrganizationTeams(s.ctx, orgID)
if opts != nil {
res = res.PageNum(opts.PageNum).ItemsPerPage(opts.ItemsPerPage).IncludeCount(opts.IncludeCount)
diff --git a/internal/store/users.go b/internal/store/users.go
index d169554284..11798f858d 100644
--- a/internal/store/users.go
+++ b/internal/store/users.go
@@ -16,7 +16,6 @@ package store
import (
atlasv2 "go.mongodb.org/atlas-sdk/v20250312002/admin"
- atlas "go.mongodb.org/atlas/mongodbatlas"
)
//go:generate mockgen -destination=../mocks/mock_users.go -package=mocks github.com/mongodb/mongodb-atlas-cli/atlascli/internal/store UserCreator,UserDescriber,UserLister,TeamUserLister
@@ -26,7 +25,7 @@ type UserCreator interface {
}
type UserLister interface {
- OrganizationUsers(string, *atlas.ListOptions) (*atlasv2.PaginatedOrgUser, error)
+ OrganizationUsers(string, *ListOptions) (*atlasv2.PaginatedOrgUser, error)
}
type TeamUserLister interface {
@@ -57,7 +56,7 @@ func (s *Store) UserByName(username string) (*atlasv2.CloudAppUser, error) {
}
// OrganizationUsers encapsulates the logic to manage different cloud providers.
-func (s *Store) OrganizationUsers(organizationID string, opts *atlas.ListOptions) (*atlasv2.PaginatedOrgUser, error) {
+func (s *Store) OrganizationUsers(organizationID string, opts *ListOptions) (*atlasv2.PaginatedOrgUser, error) {
res := s.clientv2.MongoDBCloudUsersApi.ListOrganizationUsers(s.ctx, organizationID)
if opts != nil {
res = res.ItemsPerPage(opts.ItemsPerPage).PageNum(opts.PageNum).IncludeCount(opts.IncludeCount)