[pull] master from KelvinTegelaar:master

.github/workflows/publish_release.yml

@@ -48,11 +48,36 @@ jobs:
             echo "tag_exists=false" >> $GITHUB_ENV
           fi
 
+      # Get Previous Tag
+      - name: Get Previous Tag
+        id: previous_tag
+        if: env.tag_exists == 'false'
+        run: |
+          PREV_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          echo "previous_tag=$PREV_TAG" >> $GITHUB_OUTPUT
+          echo "Previous tag: $PREV_TAG"
+
       # Generate Release Notes
       - name: Generate Release Notes
         id: changelog
         if: env.tag_exists == 'false'
-        uses: mikepenz/release-changelog-builder-action@v5.0.0
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const params = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              tag_name: '${{ steps.get_version.outputs.version }}',
+              target_commitish: context.sha
+            };
+
+            const previousTag = '${{ steps.previous_tag.outputs.previous_tag }}';
+            if (previousTag) {
+              params.previous_tag_name = previousTag;
+            }
+
+            const { data } = await github.rest.repos.generateReleaseNotes(params);
+            core.setOutput('changelog', data.body);
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -75,10 +100,6 @@ jobs:
         if: env.tag_exists == 'false'
         run: |
           mkdir -p src/releases
-          zip -r src/releases/release_${{ steps.get_version.outputs.version }}.zip . \
-            --exclude "./src/releases/*" \
-            --exclude ".*" \
-            --exclude ".*/**"
           zip -r src/releases/latest.zip . \
             --exclude "./src/releases/*" \
             --exclude ".*" \

.gitignore

@@ -10,6 +10,8 @@ ExcludedTenants
 SendNotifications/config.json
 .env
 Output/
+node_modules/.yarn-integrity
+yarn.lock
 
 # Cursor IDE
 .cursor/rules

CIPPTimers.json

@@ -222,5 +222,23 @@
     "Priority": 21,
     "RunOnProcessor": true,
     "IsSystem": true
+  },
+  {
+    "Id": "9a7f8e6d-5c4b-3a2d-1e0f-9b8c7d6e5f4a",
+    "Command": "Start-CIPPDBCacheOrchestrator",
+    "Description": "Timer to collect and cache Microsoft Graph data for all tenants",
+    "Cron": "0 0 3 * * *",
+    "Priority": 22,
+    "RunOnProcessor": true,
+    "IsSystem": true
+  },
+  {
+    "Id": "1f2e3d4c-5b6a-7c8d-9e0f-1a2b3c4d5e6f",
+    "Command": "Start-TestsOrchestrator",
+    "Description": "Timer to run security and compliance tests against cached data",
+    "Cron": "0 0 4 * * *",
+    "Priority": 23,
+    "RunOnProcessor": true,
+    "IsSystem": true
   }
 ]

Config/ExcludeSkuList.JSON

@@ -3,42 +3,10 @@
     "GUID": "90d8b3f8-712e-4f7b-aa1e-62e7ae6cbe96",
     "Product_Display_Name": "Business Apps (free)"
   },
-  {
-    "GUID": "90d8b3f8-712e-4f7b-aa1e-62e7ae6cbe96",
-    "Product_Display_Name": "Business Apps (free)"
-  },
-  {
-    "GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
-    "Product_Display_Name": "MICROSOFT FLOW FREE"
-  },
   {
     "GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
     "Product_Display_Name": "MICROSOFT FLOW FREE"
   },
-  {
-    "GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
-    "Product_Display_Name": "MICROSOFT FLOW FREE"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
-  {
-    "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
-    "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
-  },
   {
     "GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
     "Product_Display_Name": "MICROSOFT TEAMS (FREE)"
@@ -47,10 +15,6 @@
     "GUID": "a403ebcc-fae0-4ca2-8c8c-7a907fd6c235",
     "Product_Display_Name": "Power BI (free)"
   },
-  {
-    "GUID": "a403ebcc-fae0-4ca2-8c8c-7a907fd6c235",
-    "Product_Display_Name": "Power BI (free)"
-  },
   {
     "GUID": "61e6bd70-fbdb-4deb-82ea-912842f39431",
     "Product_Display_Name": "Dynamics 365 Customer Service Insights Trial"
@@ -59,26 +23,6 @@
     "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
     "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
   },
-  {
-    "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
-    "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
-  },
-  {
-    "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
-    "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
-  },
-  {
-    "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
-    "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
-  },
-  {
-    "GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
-    "Product_Display_Name": "Dynamics 365 Customer Voice Trial"
-  },
-  {
-    "GUID": "338148b6-1b11-4102-afb9-f92b6cdc0f8d",
-    "Product_Display_Name": "DYNAMICS 365 P1 TRIAL FOR INFORMATION WORKERS"
-  },
   {
     "GUID": "338148b6-1b11-4102-afb9-f92b6cdc0f8d",
     "Product_Display_Name": "DYNAMICS 365 P1 TRIAL FOR INFORMATION WORKERS"
@@ -87,26 +31,6 @@
     "GUID": "fcecd1f9-a91e-488d-a918-a96cdb6ce2b0",
     "Product_Display_Name": "Microsoft Dynamics AX7 User Trial"
   },
-  {
-    "GUID": "fcecd1f9-a91e-488d-a918-a96cdb6ce2b0",
-    "Product_Display_Name": "Microsoft Dynamics AX7 User Trial"
-  },
-  {
-    "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
-    "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
-  },
-  {
-    "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
-    "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
-  },
-  {
-    "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
-    "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
-  },
-  {
-    "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
-    "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
-  },
   {
     "GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
     "Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
@@ -116,71 +40,59 @@
     "Product_Display_Name": "Microsoft Teams Trial"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
-  },
-  {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
-  },
-  {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
-  },
-  {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
+    "Product_Display_Name": "Power Virtual Agents Viral Trial"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
+    "Product_Display_Name": "MICROSOFT STREAM"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
+    "Product_Display_Name": "WINDOWS STORE FOR BUSINESS"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "710779e8-3d4a-4c88-adb9-386c958d1fdf",
+    "Product_Display_Name": "MICROSOFT TEAMS EXPLORATORY"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "8c4ce438-32a7-4ac5-91a6-e22ae08d9c8b",
+    "Product_Display_Name": "Rights Management Adhoc"
   },
   {
-    "GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
-    "Product_Display_Name": "Microsoft Teams Trial"
+    "GUID": "5b631642-bd26-49fe-bd20-1daaa972ef80",
+    "Product_Display_Name": "Microsoft Power Apps for Developer"
   },
   {
-    "GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
-    "Product_Display_Name": "Power Virtual Agents Viral Trial"
+    "GUID": "6a4a1628-9b9a-424d-bed5-4118f0ede3fd",
+    "Product_Display_Name": "Dynamics 365 Business Central for IWs"
   },
   {
-    "GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
-    "Product_Display_Name": "Power Virtual Agents Viral Trial"
+    "GUID": "6ec92958-3cc1-49db-95bd-bc6b3798df71",
+    "Product_Display_Name": "Dynamics 365 Sales Premium Viral Trial"
   },
   {
-    "GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
-    "Product_Display_Name": "Power Virtual Agents Viral Trial"
+    "GUID": "3f9f06f5-3c31-472c-985f-62d9c10ec167",
+    "Product_Display_Name": "Power Pages vTrial for Makers"
   },
   {
-    "GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
-    "Product_Display_Name": "MICROSOFT STREAM"
+    "GUID": "9c7bff7a-3715-4da7-88d3-07f57f8d0fb6",
+    "Product_Display_Name": "Dynamics 365 For Sales Professional Trial"
   },
   {
-    "GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
-    "Product_Display_Name": "MICROSOFT STREAM"
+    "GUID": "8f0c5670-4e56-4892-b06d-91c085d7004f",
+    "Product_Display_Name": "App Connect IW"
   },
   {
-    "GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
-    "Product_Display_Name": "WINDOWS STORE FOR BUSINESS"
+    "GUID": "87bbbc60-4754-4998-8c88-227dca264858",
+    "Product_Display_Name": "Power Apps and Logic Flows"
   },
   {
-    "GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
-    "Product_Display_Name": "WINDOWS STORE FOR BUSINESS"
+    "GUID": "e5788282-6381-469f-84f0-3d7d4021d34d",
+    "Product_Display_Name": "Office 365 Extra File Storage for GCC"
   },
   {
-    "GUID": "710779e8-3d4a-4c88-adb9-386c958d1fdf",
-    "Product_Display_Name": "MICROSOFT TEAMS EXPLORATORY"
+    "GUID": "99049c9c-6011-4908-bf17-15f496e6519d",
+    "Product_Display_Name": "Office 365 Extra File Storage"
   }
 ]

ExampleReportTemplate.ps1

@@ -0,0 +1,19 @@
+$Table = Get-CippTable -tablename 'CippReportTemplates'
+
+# Dynamically discover all ZTNA test files
+$TestFiles = Get-ChildItem "C:\Github\CIPP-API\Modules\CIPPCore\Public\Tests\Invoke-CippTestZTNA*.ps1" | Sort-Object Name
+$AllTestIds = $TestFiles.BaseName | ForEach-Object { $_ -replace 'Invoke-CippTestZTNA', 'ZTNA' }
+
+Write-Host "Discovered $($AllTestIds.Count) ZTNA tests"
+
+$Entity = @{
+    RowKey        = 'd5d1e123-bce0-482d-971f-be6ed820dd92'
+    PartitionKey  = 'ReportingTemplate'
+    IdentityTests = [string]($AllTestIds | ConvertTo-Json -Compress)
+    Description   = 'Complete Zero Trust Network Assessment Report'
+    Name          = 'Full ZTNA Report'
+}
+
+Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force
+
+Write-Host "Report template created successfully with ID: $($Entity.RowKey)"