Skip to content

Commit cd2b194

Browse files
authored
CLOUDP-222001: Migrate to CLI's own pointer helper (#2551)
1 parent 781de59 commit cd2b194

File tree

4 files changed

+18
-21
lines changed

4 files changed

+18
-21
lines changed

internal/kubernetes/operator/deployment/deployment_test.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
akov2common "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
3636
akov2provider "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider"
3737
akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
38-
akov2toptr "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
3938
atlasv2 "go.mongodb.org/atlas-sdk/v20231115002/admin"
4039
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4140
)
@@ -449,17 +448,17 @@ func TestBuildServerlessDeployments(t *testing.T) {
449448
}
450449

451450
cluster := &atlasv2.ServerlessInstanceDescription{
452-
Id: akov2toptr.MakePtr("TestClusterID"),
453-
GroupId: akov2toptr.MakePtr("TestGroupID"),
454-
MongoDBVersion: akov2toptr.MakePtr("5.0"),
455-
Name: akov2toptr.MakePtr(clusterName),
456-
CreateDate: akov2toptr.MakePtr(time.Date(2021, time.January, 1, 0, 0, 0, 0, time.UTC)),
451+
Id: pointer.Get("TestClusterID"),
452+
GroupId: pointer.Get("TestGroupID"),
453+
MongoDBVersion: pointer.Get("5.0"),
454+
Name: pointer.Get(clusterName),
455+
CreateDate: pointer.Get(time.Date(2021, time.January, 1, 0, 0, 0, 0, time.UTC)),
457456
ProviderSettings: atlasv2.ServerlessProviderSettings{
458457
BackingProviderName: "AWS",
459-
ProviderName: akov2toptr.MakePtr("AWS"),
458+
ProviderName: pointer.Get("AWS"),
460459
RegionName: "US_EAST_1",
461460
},
462-
StateName: akov2toptr.MakePtr(""),
461+
StateName: pointer.Get(""),
463462
ServerlessBackupOptions: nil,
464463
ConnectionStrings: nil,
465464
Links: nil,

internal/kubernetes/operator/install.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes"
2323
"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/features"
2424
"github.com/mongodb/mongodb-atlas-cli/internal/kubernetes/operator/resources"
25+
"github.com/mongodb/mongodb-atlas-cli/internal/pointer"
2526
"github.com/mongodb/mongodb-atlas-cli/internal/store"
2627
"github.com/mongodb/mongodb-atlas-cli/internal/store/atlas"
2728
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
2829
akov2common "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
29-
akov2toptr "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
3030
"go.mongodb.org/atlas-sdk/v20231115002/admin"
3131
corev1 "k8s.io/api/core/v1"
3232
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -140,8 +140,8 @@ func (i *Install) ensureProject(orgID, projectName string) (*admin.Group, error)
140140
Group: &admin.Group{
141141
Name: projectName,
142142
OrgId: orgID,
143-
RegionUsageRestrictions: akov2toptr.MakePtr(""),
144-
WithDefaultAlertsSettings: akov2toptr.MakePtr(true),
143+
RegionUsageRestrictions: pointer.Get(""),
144+
WithDefaultAlertsSettings: pointer.Get(true),
145145
},
146146
})
147147
if err != nil {

internal/kubernetes/operator/project/project.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
akov2project "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project"
3131
akov2provider "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider"
3232
akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
33-
akov2toptr "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
3433
atlasv2 "go.mongodb.org/atlas-sdk/v20231115002/admin"
3534
corev1 "k8s.io/api/core/v1"
3635
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -690,7 +689,7 @@ func buildAuditing(auditingProvider store.AuditingDescriber, projectID string) (
690689
func buildAlertConfigurations(acProvider atlas.AlertConfigurationLister, projectID, projectName, targetNamespace string, dictionary map[string]string) ([]akov2.AlertConfiguration, []*corev1.Secret, error) {
691690
data, err := acProvider.AlertConfigurations(&atlasv2.ListAlertConfigurationsApiParams{
692691
GroupId: projectID,
693-
ItemsPerPage: akov2toptr.MakePtr(MaxItems),
692+
ItemsPerPage: pointer.Get(MaxItems),
694693
})
695694
if err != nil {
696695
return nil, nil, err

internal/kubernetes/operator/project/project_test.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
akov2project "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project"
3838
akov2provider "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider"
3939
akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
40-
akov2toptr "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
4140
"github.com/stretchr/testify/assert"
4241
atlasv2 "go.mongodb.org/atlas-sdk/v20231115002/admin"
4342
corev1 "k8s.io/api/core/v1"
@@ -58,7 +57,7 @@ func TestBuildAtlasProject(t *testing.T) {
5857
featureValidator := mocks.NewMockFeatureValidator(ctl)
5958
t.Run("Can convert Project entity with secrets data", func(t *testing.T) {
6059
p := &atlasv2.Group{
61-
Id: akov2toptr.MakePtr(projectID),
60+
Id: pointer.Get(projectID),
6261
OrgId: orgID,
6362
Name: "TestProjectName",
6463
ClusterCount: 0,
@@ -249,27 +248,27 @@ func TestBuildAtlasProject(t *testing.T) {
249248
Links: nil,
250249
Results: []atlasv2.TeamRole{
251250
{
252-
TeamId: akov2toptr.MakePtr(teamID),
251+
TeamId: pointer.Get(teamID),
253252
RoleNames: []string{string(akov2.TeamRoleClusterManager)},
254253
},
255254
},
256-
TotalCount: akov2toptr.MakePtr(1),
255+
TotalCount: pointer.Get(1),
257256
}
258257
teams := &atlasv2.TeamResponse{
259-
Id: akov2toptr.MakePtr(teamID),
260-
Name: akov2toptr.MakePtr("TestTeamName"),
258+
Id: pointer.Get(teamID),
259+
Name: pointer.Get("TestTeamName"),
261260
}
262261

263262
teamUsers := &atlasv2.PaginatedApiAppUser{
264263
Results: []atlasv2.CloudAppUser{
265264
{
266265
EmailAddress: "[email protected]",
267266
FirstName: "TestName",
268-
Id: akov2toptr.MakePtr("TestID"),
267+
Id: pointer.Get("TestID"),
269268
LastName: "TestLastName",
270269
},
271270
},
272-
TotalCount: akov2toptr.MakePtr(1),
271+
TotalCount: pointer.Get(1),
273272
}
274273

275274
listOption := &atlas.ListOptions{ItemsPerPage: MaxItems}

0 commit comments

Comments
 (0)