Merge branch 'KelvinTegelaar:master' into master

Author: techmaster3

.github/workflows/dev_api.yml

@@ -1,31 +1,42 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
-# More GitHub Actions for Azure: https://github.com/Azure/actions
-
-name: dev_api
-
-on:
-  push:
-    branches:
-      - dev
-  workflow_dispatch:
-
-env:
-  AZURE_FUNCTIONAPP_PACKAGE_PATH: '.' # set this to the path to your web app project, defaults to the repository root
-
-jobs:
-  deploy:
-    if: github.event.repository.fork == false && github.event_name == 'push'
-    runs-on: windows-latest
-    
-    steps:
-      - name: 'Checkout GitHub Action'
-        uses: actions/checkout@v4
-      
-      - name: 'Run Azure Functions Action'
-        uses: Azure/functions-action@v1
-        id: fa
-        with:
-          app-name: 'cippjta72'
-          slot-name: 'Production'
-          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_5B44448119C645C099EE192346D7433A }}
+# Docs for the Azure Web Apps Deploy action: https://github.com/azure/functions-action
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: dev_api
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  AZURE_FUNCTIONAPP_PACKAGE_PATH: "." # set this to the path to your web app project, defaults to the repository root
+
+jobs:
+  deploy:
+    permissions:
+      id-token: write #This is required for requesting the JWT
+      contents: read #This is required for actions/checkout
+    if: github.event.repository.fork == false && github.event_name == 'push'
+    runs-on: windows-latest
+
+    steps:
+      - name: "Checkout GitHub Action"
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.DEV_CLIENTID }}
+          tenant-id: ${{ secrets.DEV_TENANTID }}
+          subscription-id: ${{ secrets.DEV_SUBSCRIPTIONID }}
+
+      - name: "Run Azure Functions Action"
+        uses: Azure/functions-action@v1
+        id: fa
+        with:
+          app-name: "cippjta72"
+          slot-name: "Production"
+          package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}

.github/workflows/dev_api_proc.yml

@@ -17,7 +17,9 @@ jobs:
     steps:
       # Checkout the repository
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       # Read and Trim Version
       - name: Read and Trim Version
@@ -91,4 +93,4 @@ jobs:
           container_name: cipp-api
           source_folder: src/releases/
           destination_folder: /
-          delete_if_exists: true
+          delete_if_exists: true

.github/workflows/dev_cippahmcc.yml

@@ -14,7 +14,9 @@ jobs:
     steps:
       # Checkout the repository
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
 
       # Create ZIP File in a New Source Directory
       - name: Prepare and Zip Release Files

.github/workflows/dev_cippmpiii.yml

@@ -9,7 +9,7 @@ Logs
 ExcludedTenants
 SendNotifications/config.json
 .env
-
+Output/
 
 # Cursor IDE
 .cursor/rules

.github/workflows/dev_clouduptest.yml

@@ -7,50 +7,21 @@
       "type": "httpTrigger",
       "direction": "in",
       "name": "Request",
-      "methods": ["get", "post"],
-      "route": "{CIPPEndpoint}"
+      "methods": [
+        "get",
+        "post",
+        "patch",
+        "put",
+        "delete",
+        "options"
+      ],
+      "route": "{*CIPPEndpoint}"
     },
     {
       "type": "http",
       "direction": "out",
       "name": "Response"
     },
-    {
-      "type": "queue",
-      "direction": "out",
-      "name": "QueueItem",
-      "queueName": "CIPPGenericQueue"
-    },
-    {
-      "type": "queue",
-      "direction": "out",
-      "name": "Subscription",
-      "queueName": "AlertSubscriptions"
-    },
-    {
-      "type": "queue",
-      "direction": "out",
-      "name": "gradientqueue",
-      "queueName": "billqueue"
-    },
-    {
-      "type": "queue",
-      "direction": "out",
-      "name": "alertqueue",
-      "queueName": "alertqueue"
-    },
-    {
-      "type": "queue",
-      "direction": "out",
-      "name": "incidentqueue",
-      "queueName": "incidentqueue"
-    },
-    {
-      "type": "queue",
-      "direction": "out",
-      "name": "offboardingmailbox",
-      "queueName": "offboardingmailbox"
-    },
     {
       "name": "starter",
       "type": "durableClient",

.github/workflows/publish_release.yml

@@ -84,7 +84,7 @@
     "Id": "4d80205c-674d-4fc1-abeb-a1ec37e0d796",
     "Command": "Start-DriftStandardsOrchestrator",
     "Description": "Orchestrator to process drift standards",
-    "Cron": "0 0 */1 * * *",
+    "Cron": "0 0 */12 * * *",
     "Priority": 5,
     "RunOnProcessor": true,
     "PreferredProcessor": "standards"
@@ -213,5 +213,14 @@
     "Priority": 20,
     "RunOnProcessor": true,
     "IsSystem": true
+  },
+  {
+    "Id": "b8f3c2e1-5d4a-4f7b-9a2c-1e6d8f3b5a7c",
+    "Command": "Start-BackupRetentionCleanup",
+    "Description": "Timer to cleanup old backups based on retention policy",
+    "Cron": "0 0 2 * * *",
+    "Priority": 21,
+    "RunOnProcessor": true,
+    "IsSystem": true
   }
 ]