@@ -716,7 +716,7 @@ func deleteStreamsInstance(t *testing.T, projectID, name string) error {
716
716
cmd := exec .Command (
717
717
cliPath ,
718
718
streamsEntity ,
719
- "instance " ,
719
+ "instances " ,
720
720
"delete" ,
721
721
name ,
722
722
"--projectId" , projectID ,
@@ -727,7 +727,6 @@ func deleteStreamsInstance(t *testing.T, projectID, name string) error {
727
727
if err != nil {
728
728
return fmt .Errorf ("%s (%w)" , string (resp ), err )
729
729
}
730
-
731
730
return nil
732
731
}
733
732
@@ -934,6 +933,7 @@ func generateTestAtlasIPAccessList(t *testing.T, projectID string, resourceType,
934
933
require .NoError (t , err , string (resp ))
935
934
936
935
t .Cleanup (func () {
936
+ t .Logf ("Deleting IP access list: %s" , address )
937
937
deleteCmd := exec .Command (cliPath ,
938
938
accessListEntity , "delete" , address ,
939
939
"--projectId" , projectID , "--force" )
@@ -959,6 +959,74 @@ func findTestAtlasIPAccessList(objects []rt.Object, projectID string, address st
959
959
return nil
960
960
}
961
961
962
+ func generateTestAtlasAlertConfiguration (t * testing.T , projectID , marker string ) string {
963
+ t .Helper ()
964
+ cliPath , err := AtlasCLIBin ()
965
+ require .NoError (t , err )
966
+
967
+ cmd := exec .Command (cliPath ,
968
+ alertsEntity , configEntity , "create" ,
969
+ "--projectId" , projectID ,
970
+ "--event" , "OUTSIDE_METRIC_THRESHOLD" ,
971
+ "--enabled" ,
972
+ "--metricName" , "ASSERT_REGULAR" ,
973
+ "--metricOperator" , "GREATER_THAN" ,
974
+ "--metricThreshold" , "0" ,
975
+ "--metricUnits" , "RAW" ,
976
+ "--metricMode" , "AVERAGE" ,
977
+ "--notificationIntervalMin" , "42" ,
978
+ "--notificationEmailAddress" , "abc@example.com" ,
979
+ "--notificationType" , "EMAIL" ,
980
+ "--notificationRegion" , "US" ,
981
+ "--matcherFieldName" , "HOSTNAME" ,
982
+ "--matcherOperator" , "EQUALS" ,
983
+ "--matcherValue" , marker ,
984
+ "-o=json" )
985
+ cmd .Env = os .Environ ()
986
+
987
+ resp , err := test .RunAndGetStdOut (cmd )
988
+ require .NoError (t , err )
989
+
990
+ var result struct {
991
+ ID string `json:"id"`
992
+ }
993
+ require .NoError (t , json .Unmarshal (resp , & result ))
994
+
995
+ t .Cleanup (func () {
996
+ t .Logf ("Deleting test alert configuration: %s" , result .ID )
997
+ deleteCmd := exec .Command (cliPath ,
998
+ alertsEntity , configEntity , "delete" ,
999
+ result .ID , "--projectId" , projectID , "--force" )
1000
+ deleteCmd .Env = os .Environ ()
1001
+ _ , _ = test .RunAndGetStdOut (deleteCmd )
1002
+ })
1003
+
1004
+ return marker
1005
+ }
1006
+
1007
+ func findTestAtlasAlertConfiguration (objects []rt.Object , projectName string , marker string ) * akov2.AtlasProject {
1008
+ for _ , obj := range objects {
1009
+ project , ok := obj .(* akov2.AtlasProject )
1010
+ if ! ok {
1011
+ continue
1012
+ }
1013
+
1014
+ if project .Spec .Name != projectName {
1015
+ continue
1016
+ }
1017
+
1018
+ for _ , alert := range project .Spec .AlertConfigurations {
1019
+ for _ , matcher := range alert .Matchers {
1020
+ if strings .EqualFold (matcher .FieldName , "HOSTNAME" ) &&
1021
+ strings .EqualFold (matcher .Value , marker ) {
1022
+ return project
1023
+ }
1024
+ }
1025
+ }
1026
+ }
1027
+ return nil
1028
+ }
1029
+
962
1030
func generateTestAtlasIntegration (t * testing.T , projectID string , integrationType string ) {
963
1031
t .Helper ()
964
1032
cliPath , err := AtlasCLIBin ()
@@ -1016,6 +1084,7 @@ func generateTestAtlasDatabaseUser(t *testing.T, projectID string, username stri
1016
1084
require .NoError (t , err )
1017
1085
1018
1086
t .Cleanup (func () {
1087
+ t .Logf ("Deleting test DB user: %s" , username )
1019
1088
cmd := exec .Command (cliPath ,
1020
1089
dbusersEntity , "delete" ,
1021
1090
username ,
@@ -1040,65 +1109,14 @@ func findTestAtlasDatabaseUser(objects []rt.Object, projectID string, username s
1040
1109
return nil
1041
1110
}
1042
1111
1043
- func generateTestAtlasIdentityProvider (t * testing.T , federationSettingsID string , displayName string ) string {
1044
- t .Helper ()
1045
- cliPath , err := AtlasCLIBin ()
1046
- require .NoError (t , err )
1047
-
1048
- args := []string {
1049
- federatedAuthenticationEntity , federationSettingsEntity , identityProviderEntity , "create" , "oidc" , displayName ,
1050
- "--audience" , fmt .Sprintf ("https://accounts-%s.google.com" , displayName ),
1051
- "--authorizationType" , "GROUP" ,
1052
- "--desc" , fmt .Sprintf ("OIDC provider for %s" , displayName ),
1053
- "--federationSettingsId" , federationSettingsID ,
1054
- "--groupsClaim" , fmt .Sprintf ("group-%s" , displayName ),
1055
- "--userClaim" , fmt .Sprintf ("email-%s" , displayName ),
1056
- "--idpType" , "WORKLOAD" ,
1057
- "--issuerUri" , "https://accounts.google.com" ,
1058
- "-o=json" ,
1059
- }
1060
- cmd := exec .Command (cliPath , args ... )
1061
- cmd .Env = os .Environ ()
1062
- resp , err := test .RunAndGetStdOut (cmd )
1063
- require .NoError (t , err )
1064
-
1065
- var result struct {
1066
- Id string `json:"id"`
1067
- }
1068
- require .NoError (t , json .Unmarshal (resp , & result ))
1069
-
1070
- t .Cleanup (func () {
1071
- deleteCmd := exec .Command (cliPath ,
1072
- federatedAuthenticationEntity , federationSettingsEntity , identityProviderEntity , "delete" ,
1073
- result .Id , "--federationSettingsId" , federationSettingsID , "--force" )
1074
- deleteCmd .Env = os .Environ ()
1075
- _ , _ = test .RunAndGetStdOut (deleteCmd )
1076
- })
1077
-
1078
- return result .Id
1079
- }
1080
-
1081
- func findTestAtlasIdentityProvider (objects []rt.Object , idpID string ) * akov2.AtlasFederatedAuth {
1082
- for _ , obj := range objects {
1083
- if fed , ok := obj .(* akov2.AtlasFederatedAuth ); ok && fed .Spec .DataAccessIdentityProviders != nil {
1084
- for _ , listed := range * fed .Spec .DataAccessIdentityProviders {
1085
- if listed == idpID {
1086
- return fed
1087
- }
1088
- }
1089
- }
1090
- }
1091
- return nil
1092
- }
1093
-
1094
1112
func generateTestAtlasStreamInstance (t * testing.T , projectID string , instanceName string ) string {
1095
1113
cliPath , err := AtlasCLIBin ()
1096
1114
require .NoError (t , err )
1097
1115
1098
1116
cmd := exec .Command (
1099
1117
cliPath ,
1100
1118
streamsEntity ,
1101
- "instance " ,
1119
+ "instances " ,
1102
1120
"create" ,
1103
1121
instanceName ,
1104
1122
"--projectId" , projectID ,
@@ -1111,6 +1129,7 @@ func generateTestAtlasStreamInstance(t *testing.T, projectID string, instanceNam
1111
1129
require .NoError (t , err )
1112
1130
1113
1131
t .Cleanup (func () {
1132
+ t .Logf ("Deleting test Stream Instance: %s" , instanceName )
1114
1133
deleteStreamsInstance (t , projectID , instanceName )
1115
1134
})
1116
1135
@@ -1147,7 +1166,8 @@ func generateTestAtlasAdvancedDeployment(t *testing.T, projectID string, cluster
1147
1166
require .NoError (t , err )
1148
1167
1149
1168
t .Cleanup (func () {
1150
- _ = deleteClusterForProject (projectID , clusterName )
1169
+ t .Logf ("Deleting test Advanced Deployment: %s" , clusterName )
1170
+ deleteClusterForProject (projectID , clusterName )
1151
1171
})
1152
1172
1153
1173
return clusterName
@@ -1185,7 +1205,8 @@ func generateTestAtlasFlexCluster(t *testing.T, projectID string, clusterName st
1185
1205
require .NoError (t , err )
1186
1206
1187
1207
t .Cleanup (func () {
1188
- _ = deleteClusterForProject (projectID , clusterName )
1208
+ t .Logf ("Deleting test Advanced Deployment: %s" , clusterName )
1209
+ deleteClusterForProject (projectID , clusterName )
1189
1210
})
1190
1211
1191
1212
return clusterName
0 commit comments