@@ -13,8 +13,6 @@ import (
1313 "github.com/google/go-cmp/cmp"
1414 "github.com/google/go-cmp/cmp/cmpopts"
1515
16- "github.com/hashicorp/go-multierror"
17-
1816 mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1"
1917)
2018
@@ -36,31 +34,31 @@ func DeploymentSpec(deploymentSpec mdbv1.AtlasDeploymentSpec) error {
3634 var err error
3735
3836 if allAreNil (deploymentSpec .AdvancedDeploymentSpec , deploymentSpec .ServerlessSpec , deploymentSpec .DeploymentSpec ) {
39- err = multierror . Append (err , errors .New ("expected exactly one of spec.deploymentSpec or spec.advancedDepploymentSpec or spec.serverlessSpec to be present, but none were" ))
37+ err = errors . Join (err , errors .New ("expected exactly one of spec.deploymentSpec or spec.advancedDepploymentSpec or spec.serverlessSpec to be present, but none were" ))
4038 }
4139
4240 if moreThanOneIsNonNil (deploymentSpec .AdvancedDeploymentSpec , deploymentSpec .ServerlessSpec , deploymentSpec .DeploymentSpec ) {
43- err = multierror . Append (err , errors .New ("expected exactly one of spec.deploymentSpec, spec.advancedDepploymentSpec or spec.serverlessSpec, more than one were present" ))
41+ err = errors . Join (err , errors .New ("expected exactly one of spec.deploymentSpec, spec.advancedDepploymentSpec or spec.serverlessSpec, more than one were present" ))
4442 }
4543
4644 if deploymentSpec .DeploymentSpec != nil {
4745 if deploymentSpec .DeploymentSpec .ProviderSettings != nil && (deploymentSpec .DeploymentSpec .ProviderSettings .InstanceSizeName == "" && deploymentSpec .DeploymentSpec .ProviderSettings .ProviderName != "SERVERLESS" ) {
48- err = multierror . Append (err , errors .New ("must specify instanceSizeName if provider name is not SERVERLESS" ))
46+ err = errors . Join (err , errors .New ("must specify instanceSizeName if provider name is not SERVERLESS" ))
4947 }
5048 if deploymentSpec .DeploymentSpec .ProviderSettings != nil && (deploymentSpec .DeploymentSpec .ProviderSettings .InstanceSizeName != "" && deploymentSpec .DeploymentSpec .ProviderSettings .ProviderName == "SERVERLESS" ) {
51- err = multierror . Append (err , errors .New ("must not specify instanceSizeName if provider name is SERVERLESS" ))
49+ err = errors . Join (err , errors .New ("must not specify instanceSizeName if provider name is SERVERLESS" ))
5250 }
5351 }
5452
5553 if deploymentSpec .AdvancedDeploymentSpec != nil {
5654 instanceSizeErr := instanceSizeForAdvancedDeployment (deploymentSpec .AdvancedDeploymentSpec .ReplicationSpecs )
5755 if instanceSizeErr != nil {
58- err = multierror . Append (err , instanceSizeErr )
56+ err = errors . Join (err , instanceSizeErr )
5957 }
6058
6159 autoscalingErr := autoscalingForAdvancedDeployment (deploymentSpec .AdvancedDeploymentSpec .ReplicationSpecs )
6260 if autoscalingErr != nil {
63- err = multierror . Append (err , autoscalingErr )
61+ err = errors . Join (err , autoscalingErr )
6462 }
6563 }
6664
@@ -87,7 +85,7 @@ func BackupSchedule(bSchedule *mdbv1.AtlasBackupSchedule, deployment *mdbv1.Atla
8785 var err error
8886
8987 if bSchedule .Spec .Export == nil && bSchedule .Spec .AutoExportEnabled {
90- err = multierror . Append (err , errors .New ("you must specify export policy when auto export is enabled" ))
88+ err = errors . Join (err , errors .New ("you must specify export policy when auto export is enabled" ))
9189 }
9290
9391 replicaSets := map [string ]struct {}{}
@@ -99,26 +97,26 @@ func BackupSchedule(bSchedule *mdbv1.AtlasBackupSchedule, deployment *mdbv1.Atla
9997
10098 for position , copySetting := range bSchedule .Spec .CopySettings {
10199 if copySetting .RegionName == nil {
102- err = multierror . Append (err , fmt .Errorf ("copy setting at position %d: you must set a region name" , position ))
100+ err = errors . Join (err , fmt .Errorf ("copy setting at position %d: you must set a region name" , position ))
103101 }
104102
105103 if copySetting .ReplicationSpecID == nil {
106- err = multierror . Append (err , fmt .Errorf ("copy setting at position %d: you must set a valid ReplicationSpecID" , position ))
104+ err = errors . Join (err , fmt .Errorf ("copy setting at position %d: you must set a valid ReplicationSpecID" , position ))
107105 } else if _ , ok := replicaSets [* copySetting .ReplicationSpecID ]; ! ok {
108- err = multierror . Append (err , fmt .Errorf ("copy setting at position %d: referenced ReplicationSpecID is invalid" , position ))
106+ err = errors . Join (err , fmt .Errorf ("copy setting at position %d: referenced ReplicationSpecID is invalid" , position ))
109107 }
110108
111109 if copySetting .ShouldCopyOplogs != nil && * copySetting .ShouldCopyOplogs {
112110 if deployment .Spec .AdvancedDeploymentSpec != nil &&
113111 (deployment .Spec .AdvancedDeploymentSpec .PitEnabled == nil ||
114112 ! * deployment .Spec .AdvancedDeploymentSpec .PitEnabled ) {
115- err = multierror . Append (err , fmt .Errorf ("copy setting at position %d: you must enable pit before enable copyOplogs" , position ))
113+ err = errors . Join (err , fmt .Errorf ("copy setting at position %d: you must enable pit before enable copyOplogs" , position ))
116114 }
117115
118116 if deployment .Spec .DeploymentSpec != nil &&
119117 (deployment .Spec .DeploymentSpec .PitEnabled == nil ||
120118 ! * deployment .Spec .DeploymentSpec .PitEnabled ) {
121- err = multierror . Append (err , fmt .Errorf ("copy setting at position %d: you must enable pit before enable copyOplogs" , position ))
119+ err = errors . Join (err , fmt .Errorf ("copy setting at position %d: you must enable pit before enable copyOplogs" , position ))
122120 }
123121 }
124122 }
@@ -211,7 +209,7 @@ func projectCustomRoles(customRoles []mdbv1.CustomRole) error {
211209
212210 for _ , customRole := range customRoles {
213211 if _ , ok := customRolesMap [customRole .Name ]; ok {
214- err = multierror . Append (err , fmt .Errorf ("the custom rone \" %s\" is duplicate. custom role name must be unique" , customRole .Name ))
212+ err = errors . Join (err , fmt .Errorf ("the custom rone \" %s\" is duplicate. custom role name must be unique" , customRole .Name ))
215213 }
216214
217215 customRolesMap [customRole .Name ] = struct {}{}
0 commit comments