fix dirty merge #5

Packs/ApiModules/Scripts/HTTPFeedApiModule/HTTPFeedApiModule.py

@@ -378,7 +378,10 @@ def get_indicator_fields(line, url, feed_tags: list, tlp_color: Optional[str], c
                 field = {f: {}}
                 if 'regex' in fattrs:
                     field[f]['regex'] = re.compile(fattrs['regex'])
-                field[f]['transform'] = fattrs.get('transform', '\\g<0>')
+                if 'transform' not in fattrs:
+                    field[f]['transform'] = r'\g<0>'
+                else:
+                    field[f]['transform'] = fattrs['transform']
                 fields_to_extract.append(field)
 
     line = line.strip()

Packs/F5APM/README.md

@@ -41,7 +41,7 @@ Create a publisher to specify where the BIG-IP system sends log messages for spe
 1. Navigate to **System** > **Logs** > **Configuration** > **Log Publishers**.
 2. Click **Create**.
 3. In the **Name** field, type "XSIAM".
-4. For the **Destinations** setting, select a destination from the **Available list**, and click **<<** to move the destination to the Selected list.
+4. For the **Destinations** setting, select a destination from the **Available list**, and click `**<<**` to move the destination to the Selected list.
 5. Click **Finished**. 
 
 ### Configuring log settings for access system and URL request events
@@ -85,3 +85,4 @@ You can configure the specific vendor and product for this instance.
 4. When configuring the Syslog Collector, set the following values:
    - vendor as f5 
    - product as apm
+</~XSIAM>

Packs/FeedGCPWhitelist/Integrations/FeedGoogleIPRanges/FeedGoogleIPRanges.yml

@@ -100,7 +100,7 @@ script:
       defaultValue: "10"
     description: Gets indicators from the feed.
     name: google-ip-ranges-get-indicators
-  dockerimage: demisto/py3-tools:1.0.0.81890
+  dockerimage: demisto/py3-tools:1.0.0.82341
   feed: true
   runonce: false
   script: '-'

Packs/FeedGCPWhitelist/ReleaseNotes/2_0_30.md

@@ -1,6 +1,3 @@
-
 #### Integrations
-
 ##### Google IP Ranges Feed
-
-Fixed an issue where indicators were expiring due to prolonged periods of inactivity in the data source by implementing a solution that enforces a bi-daily update for existing indicators, even if the corresponding resource hasn't been updated.
+- Updated the Docker image to: *demisto/py3-tools:1.0.0.82341*.

Packs/FeedMalwareBazaar/Integrations/MalwareBazaarFeed/MalwareBazaarFeed.yml

@@ -106,7 +106,7 @@ script:
   script: '-'
   type: python
   subtype: python3
-  dockerimage: demisto/py3-tools:1.0.0.81890
+  dockerimage: demisto/py3-tools:1.0.0.82341
   feed: true
 fromversion: 6.0.0
 tests:

Packs/FeedMalwareBazaar/ReleaseNotes/1_0_30.md

@@ -1,6 +1,3 @@
-
 #### Integrations
-
 ##### MalwareBazaar Feed
-
-Fixed an issue where indicators were expiring due to prolonged periods of inactivity in the data source by implementing a solution that enforces a bi-daily update for existing indicators, even if the corresponding resource hasn't been updated.
+- Updated the Docker image to: *demisto/py3-tools:1.0.0.82341*.