CLOUDP-326352: Fixes backup commands to fallback to flex if not found (#4023)

blva · web-flow · commit 1a8e42d4df81 · 2025-07-03T12:39:50.000+01:00
diff --git a/internal/cli/backup/restores/describe.go b/internal/cli/backup/restores/describe.go
@@ -71,7 +71,7 @@ func (opts *DescribeOpts) Run() error {
 		return err
 	}
 
-	if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {
+	if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {
 		return err
 	}
 
diff --git a/internal/cli/backup/restores/describe_test.go b/internal/cli/backup/restores/describe_test.go
@@ -41,7 +41,7 @@ func TestDescribeOpts_Run(t *testing.T) {
 	}
 
 	expectedError := &atlasv2.GenericOpenAPIError{}
-	expectedError.SetModel(atlasv2.ApiError{ErrorCode: cannotUseNotFlexWithFlexApisErrorCode})
+	expectedError.SetModel(atlasv2.ApiError{ErrorCode: CannotUseNotFlexWithFlexApisErrorCode})
 
 	mockStore.
 		EXPECT().
diff --git a/internal/cli/backup/restores/list.go b/internal/cli/backup/restores/list.go
@@ -69,7 +69,7 @@ func (opts *ListOpts) Run() error {
 		return err
 	}
 
-	if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {
+	if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {
 		return err
 	}
 
diff --git a/internal/cli/backup/restores/list_test.go b/internal/cli/backup/restores/list_test.go
@@ -37,7 +37,7 @@ func TestListOpts_Run(t *testing.T) {
 	}
 
 	expectedError := &atlasv2.GenericOpenAPIError{}
-	expectedError.SetModel(atlasv2.ApiError{ErrorCode: cannotUseNotFlexWithFlexApisErrorCode})
+	expectedError.SetModel(atlasv2.ApiError{ErrorCode: CannotUseNotFlexWithFlexApisErrorCode})
 
 	mockStore.
 		EXPECT().
diff --git a/internal/cli/backup/restores/restores.go b/internal/cli/backup/restores/restores.go
@@ -20,8 +20,10 @@ import (
 )
 
 const (
-	cannotUseNotFlexWithFlexApisErrorCode = "CANNOT_USE_NON_FLEX_CLUSTER_IN_FLEX_API"
-	featureUnsupported                    = "FEATURE_UNSUPPORTED"
+	CannotUseNotFlexWithFlexApisErrorCode = "CANNOT_USE_NON_FLEX_CLUSTER_IN_FLEX_API"
+	FeatureUnsupported                    = "FEATURE_UNSUPPORTED"
+	ClusterNotFoundErrorCode              = "CLUSTER_NOT_FOUND"
+	DeliveryTypeDownload                  = "download"
 )
 
 func Builder() *cobra.Command {
diff --git a/internal/cli/backup/restores/watch.go b/internal/cli/backup/restores/watch.go
@@ -27,7 +27,8 @@ import (
 	atlasv2 "go.mongodb.org/atlas-sdk/v20250312005/admin"
 )
 
-const deliveryTypeDownload = "download"
+var watchTemplate = "\nRestore completed.\n"
+var result *atlasv2.DiskBackupSnapshotRestoreJob
 
 type WatchOpts struct {
 	cli.ProjectOpts
@@ -38,9 +39,6 @@ type WatchOpts struct {
 	store         RestoreJobsDescriber
 }
 
-var watchTemplate = "\nRestore completed.\n"
-var result *atlasv2.DiskBackupSnapshotRestoreJob
-
 func (opts *WatchOpts) initStore(ctx context.Context) func() error {
 	return func() error {
 		var err error
@@ -64,7 +62,7 @@ func stopWatcher(result *atlasv2.DiskBackupSnapshotRestoreJob) bool {
 		return true
 	}
 
-	if result.GetDeliveryType() == deliveryTypeDownload && len(result.GetDeliveryUrl()) > 0 {
+	if result.GetDeliveryType() == DeliveryTypeDownload && len(result.GetDeliveryUrl()) > 0 {
 		return true
 	}
 
@@ -118,7 +116,7 @@ func (opts *WatchOpts) newIsFlexCluster() error {
 		return err
 	}
 
-	if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {
+	if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {
 		return err
 	}
 
diff --git a/internal/cli/backup/snapshots/describe.go b/internal/cli/backup/snapshots/describe.go
@@ -71,7 +71,7 @@ func (opts *DescribeOpts) Run() error {
 		return err
 	}
 
-	if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {
+	if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {
 		return err
 	}
 
diff --git a/internal/cli/backup/snapshots/describe_test.go b/internal/cli/backup/snapshots/describe_test.go
@@ -36,7 +36,7 @@ func TestDescribe_Run(t *testing.T) {
 	}
 
 	expectedError := &atlasv2.GenericOpenAPIError{}
-	expectedError.SetModel(atlasv2.ApiError{ErrorCode: cannotUseNotFlexWithFlexApisErrorCode})
+	expectedError.SetModel(atlasv2.ApiError{ErrorCode: CannotUseNotFlexWithFlexApisErrorCode})
 
 	mockStore.
 		EXPECT().
diff --git a/internal/cli/backup/snapshots/list.go b/internal/cli/backup/snapshots/list.go
@@ -69,7 +69,7 @@ func (opts *ListOpts) Run() error {
 		return err
 	}
 
-	if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {
+	if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {
 		return err
 	}
 
diff --git a/internal/cli/backup/snapshots/list_test.go b/internal/cli/backup/snapshots/list_test.go
@@ -53,7 +53,7 @@ func TestList_Run(t *testing.T) {
 	}
 
 	expectedError := &atlasv2.GenericOpenAPIError{}
-	expectedError.SetModel(atlasv2.ApiError{ErrorCode: cannotUseNotFlexWithFlexApisErrorCode})
+	expectedError.SetModel(atlasv2.ApiError{ErrorCode: CannotUseNotFlexWithFlexApisErrorCode})
 
 	mockStore.
 		EXPECT().
@@ -94,3 +94,46 @@ func TestList_Run_FlexCluster(t *testing.T) {
 	require.NoError(t, listOpts.Run())
 	test.VerifyOutputTemplate(t, listTemplate, expected)
 }
+
+func TestList_Run_ClusterNotFoundFallback(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	mockStore := NewMockLister(ctrl)
+	buf := new(bytes.Buffer)
+	expected := &atlasv2.PaginatedCloudBackupReplicaSet{
+		Results: &[]atlasv2.DiskBackupReplicaSet{
+			{
+				CloudProvider: pointer.Get("AWS"),
+				Id:            pointer.Get("5f9b0b5e0b5e9d6b6e0b5e9d"),
+				SnapshotType:  pointer.Get("cloud"),
+			},
+			*atlasv2.NewDiskBackupReplicaSet(),
+		},
+	}
+
+	listOpts := &ListOpts{
+		store:       mockStore,
+		clusterName: "Cluster0",
+		OutputOpts: cli.OutputOpts{
+			Template:  listTemplate,
+			OutWriter: buf,
+		},
+	}
+
+	expectedError := &atlasv2.GenericOpenAPIError{}
+	expectedError.SetModel(atlasv2.ApiError{ErrorCode: ClusterNotFoundErrorCode})
+
+	mockStore.
+		EXPECT().
+		FlexClusterSnapshots(listOpts.newListFlexBackupsAPIParams()).
+		Return(nil, expectedError).
+		Times(1)
+
+	mockStore.
+		EXPECT().
+		Snapshots(listOpts.ProjectID, "Cluster0", listOpts.NewAtlasListOptions()).
+		Return(expected, nil).
+		Times(1)
+
+	require.NoError(t, listOpts.Run())
+	test.VerifyOutputTemplate(t, listTemplate, expected)
+}
diff --git a/internal/cli/backup/snapshots/snapshots.go b/internal/cli/backup/snapshots/snapshots.go
@@ -20,8 +20,9 @@ import (
 )
 
 const (
-	cannotUseNotFlexWithFlexApisErrorCode = "CANNOT_USE_NON_FLEX_CLUSTER_IN_FLEX_API"
-	featureUnsupported                    = "FEATURE_UNSUPPORTED"
+	CannotUseNotFlexWithFlexApisErrorCode = "CANNOT_USE_NON_FLEX_CLUSTER_IN_FLEX_API"
+	FeatureUnsupported                    = "FEATURE_UNSUPPORTED"
+	ClusterNotFoundErrorCode              = "CLUSTER_NOT_FOUND"
 )
 
 func Builder() *cobra.Command {
diff --git a/internal/cli/backup/snapshots/watch.go b/internal/cli/backup/snapshots/watch.go
@@ -102,7 +102,7 @@ func (opts *WatchOpts) newIsFlexCluster() error {
 		return err
 	}
 
-	if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {
+	if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {
 		return err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func (opts *DescribeOpts) Run() error {`
`71`	`71`	`return err`
`72`	`72`	`}`
`73`	`73`
`74`		`- if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {`
	`74`	`+ if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {`
`75`	`75`	`return err`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func TestDescribeOpts_Run(t *testing.T) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`expectedError := &atlasv2.GenericOpenAPIError{}`
`44`		`- expectedError.SetModel(atlasv2.ApiError{ErrorCode: cannotUseNotFlexWithFlexApisErrorCode})`
	`44`	`+ expectedError.SetModel(atlasv2.ApiError{ErrorCode: CannotUseNotFlexWithFlexApisErrorCode})`
`45`	`45`
`46`	`46`	`mockStore.`
`47`	`47`	`EXPECT().`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (opts *ListOpts) Run() error {`
`69`	`69`	`return err`
`70`	`70`	`}`
`71`	`71`
`72`		`- if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {`
	`72`	`+ if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {`
`73`	`73`	`return err`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func TestListOpts_Run(t *testing.T) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`expectedError := &atlasv2.GenericOpenAPIError{}`
`40`		`- expectedError.SetModel(atlasv2.ApiError{ErrorCode: cannotUseNotFlexWithFlexApisErrorCode})`
	`40`	`+ expectedError.SetModel(atlasv2.ApiError{ErrorCode: CannotUseNotFlexWithFlexApisErrorCode})`
`41`	`41`
`42`	`42`	`mockStore.`
`43`	`43`	`EXPECT().`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,10 @@ import (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`const (`
`23`		`- cannotUseNotFlexWithFlexApisErrorCode = "CANNOT_USE_NON_FLEX_CLUSTER_IN_FLEX_API"`
`24`		`- featureUnsupported = "FEATURE_UNSUPPORTED"`
	`23`	`+ CannotUseNotFlexWithFlexApisErrorCode = "CANNOT_USE_NON_FLEX_CLUSTER_IN_FLEX_API"`
	`24`	`+ FeatureUnsupported = "FEATURE_UNSUPPORTED"`
	`25`	`+ ClusterNotFoundErrorCode = "CLUSTER_NOT_FOUND"`
	`26`	`+ DeliveryTypeDownload = "download"`
`25`	`27`	`)`
`26`	`28`
`27`	`29`	`func Builder() *cobra.Command {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ import (`
`27`	`27`	`atlasv2 "go.mongodb.org/atlas-sdk/v20250312005/admin"`
`28`	`28`	`)`
`29`	`29`
`30`		`-const deliveryTypeDownload = "download"`
	`30`	`+var watchTemplate = "\nRestore completed.\n"`
	`31`	`+var result *atlasv2.DiskBackupSnapshotRestoreJob`
`31`	`32`
`32`	`33`	`type WatchOpts struct {`
`33`	`34`	`cli.ProjectOpts`
`@@ -38,9 +39,6 @@ type WatchOpts struct {`
`38`	`39`	`store RestoreJobsDescriber`
`39`	`40`	`}`
`40`	`41`
`41`		`-var watchTemplate = "\nRestore completed.\n"`
`42`		`-var result *atlasv2.DiskBackupSnapshotRestoreJob`
`43`		`-`
`44`	`42`	`func (opts *WatchOpts) initStore(ctx context.Context) func() error {`
`45`	`43`	`return func() error {`
`46`	`44`	`var err error`
`@@ -64,7 +62,7 @@ func stopWatcher(result *atlasv2.DiskBackupSnapshotRestoreJob) bool {`
`64`	`62`	`return true`
`65`	`63`	`}`
`66`	`64`
`67`		`- if result.GetDeliveryType() == deliveryTypeDownload && len(result.GetDeliveryUrl()) > 0 {`
	`65`	`+ if result.GetDeliveryType() == DeliveryTypeDownload && len(result.GetDeliveryUrl()) > 0 {`
`68`	`66`	`return true`
`69`	`67`	`}`
`70`	`68`
`@@ -118,7 +116,7 @@ func (opts *WatchOpts) newIsFlexCluster() error {`
`118`	`116`	`return err`
`119`	`117`	`}`
`120`	`118`
`121`		`- if apiError.ErrorCode != cannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != featureUnsupported {`
	`119`	`+ if apiError.ErrorCode != CannotUseNotFlexWithFlexApisErrorCode && apiError.ErrorCode != FeatureUnsupported && apiError.ErrorCode != ClusterNotFoundErrorCode {`
`122`	`120`	`return err`
`123`	`121`	`}`
`124`	`122`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func TestDescribe_Run(t *testing.T) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`expectedError := &atlasv2.GenericOpenAPIError{}`
`39`		`- expectedError.SetModel(atlasv2.ApiError{ErrorCode: cannotUseNotFlexWithFlexApisErrorCode})`
	`39`	`+ expectedError.SetModel(atlasv2.ApiError{ErrorCode: CannotUseNotFlexWithFlexApisErrorCode})`
`40`	`40`
`41`	`41`	`mockStore.`
`42`	`42`	`EXPECT().`