Releasing version 2.155.2

Releasing version 2.155.2

Author: oci-dex-release-bot

CHANGELOG.rst

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
 
 ====================
+2.155.2 - 2025-07-15
+====================
+
+Added 
+----- 
+* Support for calling Oracle Cloud Infrastructure services in the ap-delhi-1 region
 2.155.1 - 2025-07-08
 ====================
 

examples/showoci/CHANGELOG.rst

@@ -4,13 +4,24 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
 
+=====================
+25.07.15 - 25.07.15
+=====================
+* Full Stack DR added
+
+=====================
+25.06.17 - 25.06.17
+=====================
+* Added tags for network-security-groups in the csv
+
 =====================
 25.05.06 - 25.05.06
 =====================
 * Moved NSG processing dependencies
 * Added Retry to IAM Domain Search
 * Fix small bugs
 * Fixed IAM Domains IDP Jit
+* Added exclude for Bastion, CloudGuard and Logging
 
 =====================
 25.04.29 - 25.04.29

examples/showoci/README.md

@@ -117,6 +117,8 @@ Developed by Adi Zohar, 2018-2025, Contributors: Olaf Heimburger
 - oci.psql.PostgresqlClient
 - oci.certificates_management.CertificatesManagementClient
 - oci.data_safe.DataSafeClient
+- oci.optimizer.OptimizerClient
+- oci.disaster_recovery.DisasterRecoveryClient
 
 ## 2. Executing using Cloud Shell
 

examples/showoci/showoci.py

@@ -80,6 +80,7 @@
 # - oci.certificates_management.CertificatesManagementClient
 # - oci.data_safe.DataSafeClient
 # - oci.optimizer.OptimizerClient
+# - oci.disaster_recovery.DisasterRecoveryClient
 #
 # Modules without CSV yet:
 # - datasciencemodeldeployment
@@ -102,7 +103,6 @@
 # - oci.cloud_migrations.MigrationClient
 # - oci.container_instances.ContainerInstanceClient
 # - oci.data_labeling_service.DataLabelingManagementClient
-# - oci.disaster_recovery.DisasterRecoveryClient
 # - oci.fusion_apps.FusionApplicationsClient
 # - oci.jms.JavaManagementServiceClient
 # - oci.license_manager.LicenseManagerClient
@@ -128,7 +128,7 @@
 import os
 import time
 
-version = "25.05.06"
+version = "25.07.15"
 
 ##########################################################################
 # check OCI version
@@ -348,7 +348,7 @@ def set_parser_arguments(argsList=[]):
     parser.add_argument('-isc', action='store_true', default=False, dest='skip_identity_user_credential', help='Skip Identity User Credential extract.')
     parser.add_argument('-ifilter', default="", dest='ifilter', help='Filter IAM domains by Domain Names using comma seperated')
 
-    parser.add_argument('-s', '-api', '-rm', '-fun', action='store_true', default=False, dest='streams_queues', help='Print API, Functions, Resource management, Gateways, Streams and Queues.')
+    parser.add_argument('-s', '-api', '-rm', '-fun', action='store_true', default=False, dest='streams_queues', help='Print API, Functions, Resource management, Gateways, FSDR, Streams and Queues.')
 
     parser.add_argument('-m', '-sec', '-lq', '-e', '-b', action='store_true', default=False, dest='monitoring', help='Print Monitor, Events, Agents, Security, Quotas, E-Mail, Limits, Cert...')
     parser.add_argument('-paas', '-dataai', action='store_true', default=False, dest='paas_native', help='Print Native, Data and AI.')

examples/showoci/showoci_data.py

@@ -20,7 +20,7 @@
 
 
 class ShowOCIData(object):
-    version = "25.05.06"
+    version = "25.07.15"
 
     ############################################
     # ShowOCIService - Service object to query
@@ -327,6 +327,14 @@ def __get_oci_region_data(self, region_name):
                             data['resource_management'] = value
                             has_data = True
 
+                # run on fsdr use the Resource Management flag
+                if self.service.flags.read_resource_management:
+                    value = self.__get_fsdr_main(region_name, compartment)
+                    if value:
+                        if len(value) > 0:
+                            data['fsdr'] = value
+                            has_data = True
+
                 # email
                 if self.service.flags.read_email_distribution:
                     value = self.__get_email_main(region_name, compartment)
@@ -4324,6 +4332,18 @@ def __get_apigateway_main(self, region_name, compartment):
             self.__print_error(e)
             pass
 
+    ##########################################################################
+    # __get_fsdr_main
+    ##########################################################################
+    def __get_fsdr_main(self, region_name, compartment):
+        try:
+            fsdr = self.service.search_multi_items(self.service.C_FSDR, self.service.C_FSDR_PROTECTION_GROUPS, 'region_name', region_name, 'compartment_id', compartment['id'])
+            return fsdr
+
+        except Exception as e:
+            self.__print_error(e)
+            pass
+
     ##########################################################################
     # monitoring
     ##########################################################################

examples/showoci/showoci_output.py

@@ -22,7 +22,7 @@
 
 
 class ShowOCIOutput(object):
-    version = "25.05.06"
+    version = "25.07.15"
 
     ##########################################################################
     # spaces for align
@@ -2183,6 +2183,31 @@ def __print_streams_queues_main(self, sq):
         except Exception as e:
             self.__print_error("__print_streams_queues_main", e)
 
+    ##########################################################################
+    # FSDR
+    ##########################################################################
+    def __print_fsdr(self, drs):
+
+        try:
+            if not drs:
+                return
+
+            self.print_header("Full Stack Disaster Recovery (FSDR)", 2)
+
+            for dr in drs:
+                print(self.taba + dr['display_name'] + " (" + dr['role'] + ":" + dr['lifecycle_state'] + "), Created: " + dr['time_created'])
+                print(self.tabs + "Peer Region  : " + dr['peer_region'])
+                if dr['lifecycle_sub_state']:
+                    print(self.tabs + "Sub State    : " + dr['lifecycle_sub_state'])
+                if dr['log_location']:
+                    print(self.tabs + "Log Location : " + dr['log_location'])
+                for member in dr['members']:
+                    print(self.tabs + "member       : " + member['member_id'] + " - " + member['member_type'])
+                print("")
+
+        except Exception as e:
+            self.__print_error("__print_fsdr", e)
+
     ##########################################################################
     # Functions
     ##########################################################################
@@ -3276,6 +3301,8 @@ def __print_region_data(self, region_name, data):
                     self.__print_container_main(cdata['containers'])
                 if 'streams_queues' in cdata:
                     self.__print_streams_queues_main(cdata['streams_queues'])
+                if 'fsdr' in cdata:
+                    self.__print_fsdr(cdata['fsdr'])
                 if 'monitoring' in cdata:
                     self.__print_monitoring_main(cdata['monitoring'])
                 if 'notifications' in cdata:
@@ -4475,6 +4502,7 @@ class ShowOCICSV(object):
     csv_db_mysql = []
     csv_db_mysql_backups = []
     csv_db_postgresql = []
+    csv_fsdr = []
     csv_db_postgresql_backups = []
     csv_network_drg = []
     csv_network_drg_ipsec_tunnels = []
@@ -4699,6 +4727,7 @@ def generate_csv(self, data, csv_file_header, tenancy, add_date_field=True, csv_
             self.__export_to_csv_file("load_balancer_listeners", self.csv_load_balancer_listeners)
             self.__export_to_csv_file("load_balancer_backendset", self.csv_load_balancer_bs)
             self.__export_to_csv_file("file_storage", self.csv_file_storage)
+            self.__export_to_csv_file("fsdr", self.csv_fsdr)
             self.__export_to_csv_file("api_gateways", self.csv_apigw)
             self.__export_to_csv_file("limits", self.csv_limits)
             self.__export_to_csv_file("quotas", self.csv_quotas)
@@ -6429,6 +6458,8 @@ def __csv_core_network_vcn_security_groups(self, region_name, nsg, vcn):
                         'security_alert': "FALSE",
                         'description': '',
                         'time_created': sl['time_created'],
+                        'freeform_tags': '',
+                        'defined_tags': '',
                         'vcn_id': vcn['id'],
                         'sec_id': sl['id'],
                         'id': sl['id'] + ":Empty",
@@ -6471,6 +6502,8 @@ def __csv_core_network_vcn_security_groups(self, region_name, nsg, vcn):
                             'security_alert': slr['security_alert'],
                             'sec_time_created': slr['time_created'],
                             'time_created': sl['time_created'],
+                            'freeform_tags': self.__get_freeform_tags(sl['freeform_tags']),
+                            'defined_tags': self.__get_defined_tags(sl['defined_tags']),
                             'vcn_id': vcn['id'],
                             'sec_id': sl['id'],
                             'id': sl['id'] + ":" + slr['id'],
@@ -9946,6 +9979,45 @@ def __csv_edge_healthcheck(self, region_name, healthchecks):
         except Exception as e:
             self.__print_error("__csv_edge_healthcheck", e)
 
+    ##########################################################################
+    # FSDR
+    ##########################################################################
+    def __csv_fsdr(self, region_name, fsdrs):
+        try:
+
+            if len(fsdrs) == 0:
+                return
+
+            if fsdrs:
+                for ar in fsdrs:
+
+                    data = {
+                        'region_name': region_name,
+                        'compartment_name': ar['compartment_name'],
+                        'compartment_path': ar['compartment_path'],
+                        'name': ar['display_name'],
+                        'role': ar['role'],
+                        'peer_id': ar['peer_id'],
+                        'peer_region': ar['peer_region'],
+                        'time_created': ar['time_created'][0:16],
+                        'time_updated': ar['time_updated'][0:16],
+                        'lifecycle_state': ar['lifecycle_state'],
+                        'life_cycle_details': ar['life_cycle_details'],
+                        'lifecycle_sub_state': ar['lifecycle_sub_state'],
+                        'log_location': ar['log_location'],
+                        'members': self.__csv_list_to_str(ar['members'], 'member_id'),
+                        'members_raw': self.__csv_list_to_str(ar['members'], 'raw_data'),
+                        'freeform_tags': self.__get_freeform_tags(ar['freeform_tags']),
+                        'defined_tags': self.__get_defined_tags(ar['defined_tags']),
+                        'id': ar['id']
+                    }
+
+                    self.csv_fsdr.append(data)
+                    self.__csv_add_service(data, "FSDR")
+
+        except Exception as e:
+            self.__print_error("__csv_paas_oic", e)
+
     ##########################################################################
     # Paas OIC
     ##########################################################################
@@ -11168,6 +11240,8 @@ def __csv_region_data(self, region_name, data):
                     self.__csv_announcements_detailed(region_name, cdata['announcement_detailed'])
                 if 'functions' in cdata:
                     self.__csv_functions(region_name, cdata['functions'])
+                if 'fsdr' in cdata:
+                    self.__csv_fsdr(region_name, cdata['fsdr'])
 
         except Exception as e:
             self.__print_error("__csv_region_data", e)