Merge branch 'master' into pr/13148

Author: v-shukore

.github/workflows/arm-ttk-validations.yaml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 0
+          fetch-depth: 10
       - shell: pwsh
         id: step1
         name: Identify Changes in PR

.github/workflows/codeql-analysis.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript', 'python', 'ruby', 'actions' ]
+        language: [ 'javascript', 'python', 'ruby', 'actions', 'csharp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'actions' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
@@ -51,6 +51,16 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
         queries: security-extended,security-and-quality
 
+    # ℹ️ Setup DotNet Versions to building C# projects
+    - name: Setup DotNet Versions
+      uses: actions/setup-dotnet@v5
+      with:
+        dotnet-version: | 
+          6.0.x
+          7.0.x
+          8.0.x
+          9.0.x
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild

.github/workflows/hyperlinkValidator.yaml

@@ -28,7 +28,7 @@ jobs:
         env:
           GeneratedToken: ${{ steps.generate_token.outputs.token }}
         with:
-          fetch-depth: 0
+          fetch-depth: 10
           token: ${{ env.GeneratedToken }}
       - shell: pwsh
         id: step1

.github/workflows/slash-command-armttk.yaml

@@ -46,7 +46,7 @@ jobs:
         if: steps.get-pr.outputs.is_fork == 'false'
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 0
+          fetch-depth: 10
           ref: ${{ steps.get-pr.outputs.head_sha }}
           persist-credentials: false
       - shell: pwsh

.github/workflows/update-solutions-analyzer.yml

@@ -0,0 +1,110 @@
+name: Update Solutions Analyzer CSV Files
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'Solutions/**/*.json'
+      - 'Solutions/**/Parsers/**/*.yaml'
+      - 'Solutions/**/Parsers/**/*.yml'
+      - 'Tools/Solutions Analyzer/solution_connector_tables.py'
+  workflow_dispatch:  # Allow manual trigger
+  schedule:
+    # Run weekly on Monday at 2 AM UTC to catch any missed changes
+    - cron: '0 2 * * 1'
+
+jobs:
+  update-csv:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      
+      - name: Install dependencies
+        run: |
+          pip install json5
+      
+      - name: Run Solutions Analyzer
+        run: |
+          cd "Tools/Solutions Analyzer"
+          python solution_connector_tables.py
+      
+      - name: Generate Connector Documentation
+        run: |
+          cd "Tools/Solutions Analyzer"
+          python generate_connector_docs.py
+      
+      - name: Check for changes
+        id: check_changes
+        run: |
+          if git diff --quiet "Tools/Solutions Analyzer/solutions_connectors_tables_mapping.csv" "Tools/Solutions Analyzer/solutions_connectors_tables_issues_and_exceptions_report.csv" "Tools/Solutions Analyzer/connector-docs/"; then
+            echo "changed=false" >> $GITHUB_OUTPUT
+          else
+            echo "changed=true" >> $GITHUB_OUTPUT
+          fi
+      
+      - name: Create Pull Request
+        if: steps.check_changes.outputs.changed == 'true'
+        id: create_pr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: 'chore: Update Solutions Analyzer CSV files and documentation'
+          branch: solutions-analyzer-update
+          delete-branch: true
+          title: 'chore: Update Solutions Analyzer CSV files and documentation'
+          body: |
+            ## Automated Solutions Analyzer Update
+            
+            This PR contains automated updates to:
+            - Solutions connector-to-tables mapping CSV
+            - Solutions issues and exceptions report CSV
+            - Connector documentation files
+            
+            Generated by the Solutions Analyzer workflow.
+            
+            **Triggered by:** ${{ github.event_name }}
+            **Workflow run:** ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          labels: automated, documentation
+          add-paths: |
+            Tools/Solutions Analyzer/solutions_connectors_tables_mapping.csv
+            Tools/Solutions Analyzer/solutions_connectors_tables_issues_and_exceptions_report.csv
+            Tools/Solutions Analyzer/connector-docs/
+      
+      - name: Enable auto-merge
+        if: steps.check_changes.outputs.changed == 'true' && steps.create_pr.outputs.pull-request-number != ''
+        run: |
+          gh pr merge ${{ steps.create_pr.outputs.pull-request-number }} --auto --squash
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Create summary
+        if: steps.check_changes.outputs.changed == 'true'
+        run: |
+          echo "### Solutions Analyzer Pull Request Created :white_check_mark:" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "A pull request has been created with updated CSV files and documentation." >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "**Modified files:**" >> $GITHUB_STEP_SUMMARY
+          echo "- Tools/Solutions Analyzer/solutions_connectors_tables_mapping.csv" >> $GITHUB_STEP_SUMMARY
+          echo "- Tools/Solutions Analyzer/solutions_connectors_tables_issues_and_exceptions_report.csv" >> $GITHUB_STEP_SUMMARY
+          echo "- Tools/Solutions Analyzer/connector-docs/" >> $GITHUB_STEP_SUMMARY
+      
+      - name: No changes summary
+        if: steps.check_changes.outputs.changed == 'false'
+        run: |
+          echo "### Solutions Analyzer :information_source:" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "No changes detected. CSV files and documentation are already up-to-date." >> $GITHUB_STEP_SUMMARY

.script/package-automation/catalogAPI.ps1

@@ -123,15 +123,37 @@ function GetOfferVersion($offerId, $mainTemplateUrl)
 
 function GetPackageVersion($defaultPackageVersion, $offerId, $offerDetails, $packageVersionAttribute, $userInputPackageVersion)
 {
+    $setPackageVersion = $defaultPackageVersion
+
     if ($packageVersionAttribute)
     {
         $userInputMajor,$userInputMinor,$userInputBuild,$userInputRevision = $userInputPackageVersion.split(".")
         $defaultMajor,$defaultMinor,$defaultBuild,$defaultRevision = $defaultPackageVersion.split(".")
 
-        if ($userInputMajor -ge '2' -and $userInputMinor -gt $defaultMinor)
-        {
-            #return as is value of package version as middle value is greater
-            return $userInputPackageVersion 
+        # Convert to integers for proper numeric comparison
+        [int]$userInputMajor = $userInputMajor
+        [int]$userInputMinor = $userInputMinor
+        [int]$userInputBuild = $userInputBuild
+        [int]$defaultMajor = $defaultMajor
+        [int]$defaultMinor = $defaultMinor
+        [int]$defaultBuild = $defaultBuild
+
+        if ($userInputMajor -ge 3) {
+            # Version 3.x.x or higher: use user input if minor and build are greater than default
+            if ($userInputMinor -ge $defaultMinor -and $userInputBuild -gt $defaultBuild) {
+                $setPackageVersion = $userInputPackageVersion
+                if ($null -eq $offerDetails) {
+                    Write-Host "Package version set to $setPackageVersion"
+                    return $setPackageVersion
+                }
+            } elseif ($null -eq $offerDetails) {
+                Write-Host "Package version set to $userInputPackageVersion"
+                return $userInputPackageVersion
+            }
+        } elseif ($userInputMajor -le 2) {
+            # Version 2.x.x: always use default
+            Write-Host "Package version set to $defaultPackageVersion"
+            return $defaultPackageVersion
         }
     }
 
@@ -174,13 +196,13 @@ function GetPackageVersion($defaultPackageVersion, $offerId, $offerDetails, $pac
                 {
                     $identifiedOfferVersion = $offerMetadataVersion
                     $catalogMajor,$catalogminor,$catalogbuild,$catalogrevision = $identifiedOfferVersion.split(".")
-                    $defaultMajor,$defaultminor,$defaultbuild,$defaultrevision = $defaultPackageVersion.split(".")
+                    $defaultMajor,$defaultminor,$defaultbuild,$defaultrevision = $setPackageVersion.split(".")
 
-                    if ($defaultMajor -gt $catalogMajor)
+                    if ($defaultMajor -gt $catalogMajor -and $defaultminor -gt $catalogminor -and $defaultbuild -ge $catalogbuild)
                     {
-                        # eg: 3.0.0 > 2.0.1 ==> 3.0.0
-                        Write-Host "Default Package version is greater then the CatalogAPI version so $defaultVersionMessage"
-                        return $defaultPackageVersion
+                        # eg: 3.0.0 > 2.0.1 ==> 3.0.0 or 3.1.2 > 3.1.1 ==> 3.1.2
+                        Write-Host "Package version $setPackageVersion greater then the CatalogAPI version so $defaultVersionMessage"
+                        return $setPackageVersion
                     }
                     else 
                     {

.script/tests/KqlvalidationsTests/CustomTables/AZFWApplicationRule.json

@@ -9,6 +9,10 @@
         "Name": "ActionReason",
         "Type": "string"
       },
+      {
+        "Name": "_BilledSize",
+        "Type": "real"
+      },
       {
         "Name": "DestinationPort",
         "Type": "int"
@@ -17,6 +21,14 @@
         "Name": "Fqdn",
         "Type": "string"
       },
+      {
+        "Name": "_IsBillable",
+        "Type": "string"
+      },
+            {
+        "Name": "IsExplicitProxyRequest",
+        "Type": "bool"
+      },
       {
         "Name": "IsTlsInspected",
         "Type": "bool"
@@ -57,6 +69,10 @@
         "Name": "SourceSystem",
         "Type": "string"
       },
+      {
+        "Name": "_SubscriptionId",
+        "Type": "string"
+      },
       {
         "Name": "TargetUrl",
         "Type": "string"
@@ -76,6 +92,14 @@
       {
         "Name": "WebCategory",
         "Type": "string"
+      },
+      {
+        "Name": "_TimeReceived",
+        "Type": "datetime"
+      },
+      {
+        "Name": "_ItemId",
+        "Type": "string"
       }
     ]
 }

.script/tests/KqlvalidationsTests/CustomTables/AZFWDnsQuery.json

@@ -88,6 +88,14 @@
     {
       "Name": "Type",
       "Type": "string"
+    },
+    {
+      "Name": "_TimeReceived",
+      "Type": "datetime"
+    },
+    {
+      "Name": "_ItemId",
+      "Type": "string"
     }
   ]
 }

.script/tests/KqlvalidationsTests/CustomTables/AZFWIdpsSignature.json

@@ -80,6 +80,14 @@
   {
     "Name": "SignatureId",
     "Type": "string"
+  },
+  {
+    "Name": "_TimeReceived",
+    "Type": "datetime"
+  },
+  {
+    "Name": "_ItemId",
+    "Type": "string"
   }
 ]
 }

.script/tests/KqlvalidationsTests/CustomTables/AZFWNatRule.json

@@ -0,0 +1,89 @@
+{
+  "Name": "AZFWNatRule",
+  "Properties": [
+    {
+      "Name": "_BilledSized",
+      "Type": "real"
+    },
+    {
+      "Name": "DestinationIp",
+      "Type": "string"
+    },
+    {
+      "Name": "DestinationPort",
+      "Type": "int"
+    },
+{
+      "Name": "_IsBillable",
+      "Type": "string"
+    },
+    {
+      "Name": "Policy",
+      "Type": "string"
+    },
+    {
+      "Name": "Protocol",
+      "Type": "string"
+    },
+    {
+      "Name": "_ResourceId",
+      "Type": "string"
+    },
+    {
+      "Name": "Rule",
+      "Type": "string"
+    },
+    {
+      "Name": "RuleCollection",
+      "Type": "string"
+    },
+    {
+      "Name": "RuleCollectionGroup",
+      "Type": "string"
+    },
+    {
+      "Name": "SourceIp",
+      "Type": "string"
+    },
+    {
+      "Name": "SourcePort",
+      "Type": "int"
+    },
+    {
+      "Name": "SourceSystem",
+      "Type": "string"
+    },
+    {
+      "Name": "_SubscriptionId",
+      "Type": "string"
+    },
+    {
+      "Name": "TenantId",
+      "Type": "string"
+    },
+    {
+      "Name": "TimeGenerated",
+      "Type": "datetime"
+    },
+    {
+      "Name": "TranslatedIp",
+      "Type": "string"
+    },
+    {
+      "Name": "TranslatedPort",
+      "Type": "int"
+    },
+    {
+      "Name": "Type",
+      "Type": "string"
+    },
+    {
+      "Name": "_TimeReceived",
+      "Type": "datetime"
+    },
+    {
+      "Name": "_ItemId",
+      "Type": "string"
+    }
+  ]
+}