Add the env to alert the dry_run=yes policies

cloud_governance/main/environment_variables.py

@@ -152,6 +152,8 @@ def __init__(self):
         self._environment_variables_dict['MAXIMUM_THRESHOLD'] = EnvironmentVariables.get_env('MAXIMUM_THRESHOLD', '')
         self._environment_variables_dict['to_mail'] = EnvironmentVariables.get_env('to_mail', '[]')
         self._environment_variables_dict['cc_mail'] = EnvironmentVariables.get_env('cc_mail', '[]')
+        self._environment_variables_dict['ALERT_DRY_RUN'] = (EnvironmentVariables.
+                                                             get_boolean_from_environment('ALERT_DRY_RUN', False))
 
         # Google Drive env vars
         self._environment_variables_dict['GOOGLE_APPLICATION_CREDENTIALS'] = EnvironmentVariables.get_env('GOOGLE_APPLICATION_CREDENTIALS', '')

cloud_governance/policy/common_policies/send_aggregated_alerts.py

@@ -19,6 +19,7 @@ def __init__(self):
         self.__days_to_delete_resource = int(self.__environment_variables.get('DAYS_TO_DELETE_RESOURCE'))
         self.__mail_to = self.__environment_variables.get('EMAIL_TO')  # testing purposes
         self.__mail_cc = self.__environment_variables.get('EMAIL_CC', [])
+        self.__alert_dry_run = self.__environment_variables.get('ALERT_DRY_RUN')
         self.__mail_message = MailMessage()
         self.__postfix = Postfix()
         self.__es_operations = ElasticSearchOperations()
@@ -141,7 +142,11 @@ def __update_delete_days(self, policy_es_data: list):
                 if not days:
                     days = 0
                 alert_user = False
-                delete_date = ''
+                delete_date = 'dry_run=yes'
+                if not record.get('Skip'):
+                    record['Skip'] = 'NA'
+                if record.get('Skip') != 'NA':
+                    delete_date = 'skip_delete'
                 if self.__days_to_delete_resource - 5 == days:
                     delete_date = (datetime.utcnow() + timedelta(days=5)).date()
                     alert_user = True
@@ -160,7 +165,7 @@ def __update_delete_days(self, policy_es_data: list):
                                 delete_date = 'dry_run=yes'
                         alert_user = True
                 if alert_user:
-                    if delete_date != 'skip_delete' and delete_date != 'dry_run=yes':
+                    if delete_date != 'skip_delete' and (delete_date != 'dry_run=yes' and self.__alert_dry_run):
                         record['DeleteDate'] = delete_date.__str__()
                         if record.get('policy') in ['empty_roles', 's3_inactive']:
                             record['RegionName'] = 'us-east-1'

jenkins/tenant/aws/common/run_policies.py

@@ -56,6 +56,7 @@ def get_container_cmd(env_dict: dict):
 days_to_delete_resource = os.environ.get('days_to_delete_resource', 14)
 LDAP_HOST_NAME = os.environ['LDAP_HOST_NAME']
 LOGS = os.environ.get('LOGS', 'logs')
+ALERT_DRY_RUN = os.environ.get('ALERT_DRY_RUN', False)
 ES_HOST = os.environ['ES_HOST']
 ES_PORT = os.environ['ES_PORT']
 GOOGLE_APPLICATION_CREDENTIALS = os.environ['GOOGLE_APPLICATION_CREDENTIALS']
@@ -81,7 +82,7 @@ def get_container_cmd(env_dict: dict):
     "dry_run": "yes", "LDAP_HOST_NAME": LDAP_HOST_NAME, "DAYS_TO_DELETE_RESOURCE": days_to_delete_resource,
     "es_host": ES_HOST, "es_port": ES_PORT,
     "MANAGER_EMAIL_ALERT": "False", "EMAIL_ALERT": "False", "log_level": "INFO",
-    'DAYS_TO_TAKE_ACTION': days_to_delete_resource
+    'DAYS_TO_TAKE_ACTION': days_to_delete_resource, 'ALERT_DRY_RUN': ALERT_DRY_RUN
 }
 
 

jenkins/tenant/aws/ecoeng_01/PolicyJenkinsfileDaily

@@ -1,4 +1,4 @@
-accounts_list = ["partnerlab": "[email protected], [email protected]"]
+accounts_list = ["partnerlab": "[email protected], [email protected], [email protected]"]
 pipeline {
     options {
         disableConcurrentBuilds()
@@ -16,6 +16,7 @@ pipeline {
         LDAP_HOST_NAME = credentials('cloud-governance-ldap-host-name')
         ES_HOST = credentials('haim-cloud-governance-elasticsearch-url')
         ES_PORT = credentials('haim-cloud-governance-elasticsearch-port')
+        ALERT_DRY_RUN = true
         contact1 = "[email protected]"
         contact2 = "[email protected]"
         contact3 = "[email protected]"

jenkins/tenant/aws/ecoeng_02/PolicyJenkinsfileDaily

@@ -1,6 +1,6 @@
-accounts_list = ['appeng': "[email protected], [email protected], [email protected]",
-           'fsi-partner': "[email protected], [email protected], [email protected]",
-           'fsi-ecosystem': "[email protected], [email protected], [email protected]"]
+accounts_list = ['appeng': "[email protected], [email protected], [email protected],[email protected]",
+           'fsi-partner': "[email protected], [email protected], [email protected],[email protected]",
+           'fsi-ecosystem': "[email protected], [email protected], [email protected],[email protected]"]
 pipeline {
     options {
         disableConcurrentBuilds()
@@ -18,6 +18,7 @@ pipeline {
         LDAP_HOST_NAME = credentials('cloud-governance-ldap-host-name')
         ES_HOST = credentials('haim-cloud-governance-elasticsearch-url')
         ES_PORT = credentials('haim-cloud-governance-elasticsearch-port')
+        ALERT_DRY_RUN = true
         contact1 = "[email protected]"
         contact2 = "[email protected]"
         contact3 = "[email protected]"

jenkins/tenant/aws/ecoeng_03/PolicyJenkinsfileDaily

@@ -1,11 +1,11 @@
-accounts_list = ['coreos-training': "[email protected], [email protected]",
-           'industry-partners': "",
-           'special-projects': "",
-           'edgeinfra': "",
-           'specialprojects-qe': "",
-           'ecoeng-sap': "",
-           'sysdeseng': "",
-           'verticals-ui': ""]
+accounts_list = ['coreos-training': "[email protected], [email protected], [email protected]",
+           'industry-partners': "[email protected]",
+           'special-projects': "[email protected]",
+           'edgeinfra': "[email protected]",
+           'specialprojects-qe': "[email protected]",
+           'ecoeng-sap': "[email protected]",
+           'sysdeseng': "[email protected]",
+           'verticals-ui': "[email protected]"]
 pipeline {
     options {
         disableConcurrentBuilds()
@@ -23,6 +23,7 @@ pipeline {
         LDAP_HOST_NAME = credentials('cloud-governance-ldap-host-name')
         ES_HOST = credentials('haim-cloud-governance-elasticsearch-url')
         ES_PORT = credentials('haim-cloud-governance-elasticsearch-port')
+        ALERT_DRY_RUN = true
         contact1 = "[email protected]"
         contact2 = "[email protected]"
         contact3 = "[email protected]"