Merge branch 'master' into CircleCI_workflows_to_GitHub

Author: dorschw

.circleci/config.yml

@@ -1,7 +1,7 @@
 jobs:
   docker_build:
     docker:
-      - image: devdemisto/dockerbuild:1.0.0.43365
+      - image: devdemisto/dockerbuild:1.0.0.84796
     steps:
       - checkout
       - run:
@@ -10,8 +10,13 @@ jobs:
       - run:
           name: Validate Dependabot Config
           command: ./docker/verify_dependabot.sh
-      - setup_remote_docker:
-          version: 20.10.17
+      - run:
+          name: Validate deprecated_images.json
+          command: python ./utils/validate_deprecated_dockers_json.py --exclude python --docker_dir docker --deprecated_path docker/deprecated_images.json
+      - run:
+          name: Run Pytest
+          command: export PYTHONPATH=$(pwd) && pytest
+      - setup_remote_docker
       - add_ssh_keys:
           fingerprints:
             - 14:9b:f7:c3:6a:d7:bd:34:8d:d6:3f:a7:68:d1:d6:af
@@ -23,6 +28,7 @@ jobs:
       - store_artifacts:
           path: artifacts
           destination: docker_images
+version: 2.1
 workflows:
   version: 2
   full_build:

.github/dependabot.yml

@@ -53,10 +53,6 @@ updates:
     directory: /docker/python
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/hashicorp
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/powershell-core
     schedule:
@@ -85,10 +81,6 @@ updates:
     directory: /docker/duoadmin
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/iputils
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/zeep
     schedule:
@@ -109,10 +101,6 @@ updates:
     directory: /docker/python3-deb
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/cloaken
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/boto3py3
     schedule:
@@ -133,10 +121,6 @@ updates:
     directory: /docker/netutils
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/uptycs
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/nltk
     schedule:
@@ -145,14 +129,6 @@ updates:
     directory: /docker/teams
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/pyjwt3
-    schedule:
-      interval: daily
-  - package-ecosystem: pip
-    directory: /docker/oauthlib
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/chromium
     schedule:
@@ -173,10 +149,6 @@ updates:
     directory: /docker/m2crypto
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/nmap
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/devo
     schedule:
@@ -197,10 +169,6 @@ updates:
     directory: /docker/marketo
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/winrm
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/dxl
     schedule:
@@ -213,10 +181,6 @@ updates:
     directory: /docker/google-cloud-translate
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/akamai
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/matplotlib
     schedule:
@@ -297,10 +261,6 @@ updates:
     directory: /docker/resilient
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/dnspython
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/py3ews
     schedule:
@@ -363,10 +323,6 @@ updates:
     directory: /docker/argus-toolbelt
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/ssl-analyze
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/xslxwriter
     schedule:
@@ -383,6 +339,8 @@ updates:
     directory: /docker/ml
     schedule:
       interval: daily
+    ignore:
+      - dependency-name: scikit-learn
   - package-ecosystem: pip
     directory: /docker/fastapi
     schedule:
@@ -453,10 +411,6 @@ updates:
     directory: /docker/smbprotocol
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/opencti-v4
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/xgboost
     schedule:
@@ -501,6 +455,7 @@ updates:
     directory: /docker/py-ews
     ignore:
       - dependency-name: "requests-ntlm"
+      - dependency-name: "exchangelib"
     schedule:
       interval: daily
   - package-ecosystem: pip
@@ -555,14 +510,6 @@ updates:
     directory: /docker/vmware
     schedule:
       interval: daily
-  - package-ecosystem: pip
-    directory: /docker/azure-kusto-data
-    schedule:
-      interval: daily
-  - package-ecosystem: pip
-    directory: /docker/confluent-kafka
-    schedule:
-      interval: daily
   - package-ecosystem: pip
     directory: /docker/syslog
     schedule:
@@ -579,6 +526,46 @@ updates:
     directory: /docker/mlurlphishing
     schedule:
       interval: daily
+    ignore:
+      - dependency-name: scikit-learn
+      - dependency-name: tldextract
+      - dependency-name: opencv-python
+      - dependency-name: scipy
+      - dependency-name: NumPy
+      - dependency-name: beautifulsoup4
+      - dependency-name: catboost
+      - dependency-name: certifi
+      - dependency-name: charset-normalizer
+      - dependency-name: cycler
+      - dependency-name: dateparser
+      - dependency-name: dill
+      - dependency-name: filelock
+      - dependency-name: fonttools
+      - dependency-name: funcy
+      - dependency-name: graphviz
+      - dependency-name: idna
+      - dependency-name: pandas
+      - dependency-name: Pillow
+      - dependency-name: plotly
+      - dependency-name: pyparsing
+      - dependency-name: PySocks
+      - dependency-name: joblib
+      - dependency-name: kiwisolver
+      - dependency-name: matplotlib
+      - dependency-name: olefile
+      - dependency-name: packaging
+      - dependency-name: python-dateutil
+      - dependency-name: pytz
+      - dependency-name: regex
+      - dependency-name: requests
+      - dependency-name: requests-file
+      - dependency-name: six
+      - dependency-name: soupsieve
+      - dependency-name: tenacity
+      - dependency-name: threadpoolctl
+      - dependency-name: tzlocal
+      - dependency-name: urllib3
+      - dependency-name: python
   - package-ecosystem: pip
     directory: /docker/py3-tools
     schedule:
@@ -619,14 +606,6 @@ updates:
     directory: /docker/gdetect
     schedule:
      interval: daily
-  - package-ecosystem: pip
-    directory: /docker/pydantic-jwt3
-    schedule:
-     interval: daily
-  - package-ecosystem: pip
-    directory: /docker/duoadmin3
-    schedule:
-     interval: daily
   - package-ecosystem: pip
     directory: /docker/pycountry
     schedule:
@@ -647,10 +626,6 @@ updates:
     directory: /docker/ippysocks-py3
     schedule:
      interval: daily
-  - package-ecosystem: pip
-    directory: /docker/joe-security
-    schedule:
-     interval: daily
   - package-ecosystem: pip
     directory: /docker/armorblox
     schedule:
@@ -659,10 +634,6 @@ updates:
     directory: /docker/keeper-ksm
     schedule:
      interval: daily
-  - package-ecosystem: pip
-    directory: /docker/cymruwhois
-    schedule:
-     interval: daily
   - package-ecosystem: pip
     directory: /docker/octoxlabs
     schedule:
@@ -675,6 +646,9 @@ updates:
     directory: /docker/panw-iot
     schedule:
       interval: daily
+    ignore:
+      - dependency-name: "pyasn1"
+      # Ignore all updates for pyasn1
   - package-ecosystem: pip
     directory: /docker/illumio
     schedule:
@@ -716,18 +690,32 @@ updates:
     schedule:
       interval: daily
   - package-ecosystem: pip
-    directory: /docker/fp-smc
+    directory: /docker/ldap
     schedule:
-      interval: daily
+     interval: daily
   - package-ecosystem: pip
-    directory: /docker/websockets
+    directory: /docker/auth-utils
     schedule:
-      interval: daily
+     interval: daily
   - package-ecosystem: pip
-    directory: /docker/ldap
+    directory: /docker/cyjax
     schedule:
      interval: daily
   - package-ecosystem: pip
-    directory: /docker/auth-utils
+    directory: /docker/elasticsearch
+    schedule:
+     interval: daily
+  - package-ecosystem: pip
+    directory: /docker/confluent-kafka
+    schedule:
+     interval: daily
+  - package-ecosystem: pip
+    directory: /docker/pytmv1
+    ignore:
+      - dependency-name: "pytmv1"
+    schedule:
+     interval: daily
+  - package-ecosystem: pip
+    directory: /docker/qrcode
     schedule:
      interval: daily

.github/workflows/handle-new-contribution.yml

@@ -0,0 +1,32 @@
+name: Handle New Contribution
+
+on:
+  pull_request_target:
+    types: [opened, ready_for_review]
+
+permissions:
+  contents: write
+  pull-requests: write
+  repository-projects: write
+
+jobs:
+  assign_and_label:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.head.repo.fork == true
+    steps:
+      - name: Add an assignee and a Contribution label
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          PR_URL: ${{github.event.pull_request.html_url}}
+        run: |
+          echo "get content_roles.json using curl"
+          contrib_tl=$( curl https://raw.githubusercontent.com/demisto/content/master/.github/content_roles.json | jq .CONTRIBUTION_TL -r )
+          echo "$contrib_tl"
+          echo "Finished retrieving the contribution TL username"
+          
+          if [ $contrib_tl ]; then
+            echo "Add an assignee and a Contribution label"
+            gh pr edit --add-assignee "$contrib_tl" --add-label Contribution "$PR_URL"
+          else
+            echo "There was a problem with retrieving the GitHub user name of the contribution TL."
+          fi

.github/workflows/native-docker-labeled.yml

@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
       - name: Set up Python 3.11
         uses: actions/setup-python@v3
         with:

.github/workflows/verify-script-update-notifier.yml

@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 0
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
       - name: Set up Python 3.11
         uses: actions/setup-python@v3
         with:

.gitlab/.gitlab-ci.yml

@@ -2,8 +2,7 @@ variables:
   GH_BRANCH: $CI_COMMIT_BRANCH
   GH_COMMIT: $CI_COMMIT_SHA
 trigger_job:
-  except:
-    - master
   trigger:
     strategy: depend
-    project: xsoar/Dockerfiles-CICD
+    project: ${CI_PROJECT_NAMESPACE}/dockerfiles-cicd
+