CLOUDP-323473: Migrate watchers to latest SDK (#3948)

Author: blva

internal/cli/clusters/create_test.go

@@ -153,11 +153,17 @@ func TestCreateOpts_PostRun_EnableWatch(t *testing.T) {
 		mocks.NewMockClusterDescriber(ctrl),
 	}
 
-	expected := &atlasClustersPinned.AdvancedClusterDescription{
+	expected := &atlasv2.ClusterDescription20240805{
 		Name:      pointer.Get("ProjectBar"),
 		StateName: pointer.Get("CREATING"),
 	}
-	expectedIdle := &atlasClustersPinned.AdvancedClusterDescription{
+
+	expectedCreatedCluster := &atlasClustersPinned.AdvancedClusterDescription{
+		Name:      expected.Name,
+		StateName: expected.StateName,
+	}
+
+	expectedIdle := &atlasv2.ClusterDescription20240805{
 		Name:      expected.Name,
 		StateName: pointer.Get("IDLE"),
 	}
@@ -184,20 +190,20 @@ func TestCreateOpts_PostRun_EnableWatch(t *testing.T) {
 		MockClusterCreator.
 		EXPECT().
 		CreateCluster(cluster).
-		Return(expected, nil).
+		Return(expectedCreatedCluster, nil).
 		Times(1)
 
 	gomock.InOrder(
 		mockStore.
 			MockClusterDescriber.
 			EXPECT().
-			AtlasCluster(createOpts.ProjectID, expected.GetName()).
+			LatestAtlasCluster(createOpts.ProjectID, expected.GetName()).
 			Return(expected, nil).
 			Times(1),
 		mockStore.
 			MockClusterDescriber.
 			EXPECT().
-			AtlasCluster(createOpts.ProjectID, expected.GetName()).
+			LatestAtlasCluster(createOpts.ProjectID, expected.GetName()).
 			Return(expectedIdle, nil).
 			Times(1),
 	)

internal/mocks/mock_clusters.go

@@ -25,6 +25,7 @@ import (
 type ClusterDescriber interface { //nolint:iface // right now requires some refactor to deployment commands
 	AtlasCluster(string, string) (*atlasClustersPinned.AdvancedClusterDescription, error)
 	FlexCluster(string, string) (*atlasv2.FlexClusterDescription20241113, error)
+	LatestAtlasCluster(string, string) (*atlasv2.ClusterDescription20240805, error)
 }
 
 // AddSampleData encapsulate the logic to manage different cloud providers.
@@ -143,6 +144,12 @@ func (s *Store) AtlasCluster(projectID, name string) (*atlasClustersPinned.Advan
 	return result, err
 }
 
+// LatestAtlasCluster uses the latest API version to get a cluster.
+func (s *Store) LatestAtlasCluster(projectID, name string) (*atlasv2.ClusterDescription20240805, error) {
+	result, _, err := s.clientv2.ClustersApi.GetCluster(s.ctx, projectID, name).Execute()
+	return result, err
+}
+
 // AtlasClusterConfigurationOptions encapsulates the logic to manage different cloud providers.
 func (s *Store) AtlasClusterConfigurationOptions(projectID, name string) (*atlasClustersPinned.ClusterDescriptionProcessArgs, error) {
 	result, _, err := s.clientClusters.ClustersApi.GetClusterAdvancedConfiguration(s.ctx, projectID, name).Execute()

internal/store/clusters.go

@@ -45,7 +45,7 @@ type AtlasClusterStateDescriber struct {
 }
 
 func (describer *AtlasClusterStateDescriber) GetState() (string, error) {
-	result, err := describer.store.AtlasCluster(describer.projectID, describer.clusterName)
+	result, err := describer.store.LatestAtlasCluster(describer.projectID, describer.clusterName)
 	if result != nil && result.StateName != nil {
 		return *result.StateName, err
 	}