diff --git a/.github/workflows/cleanup-dev-new.yml b/.github/workflows/cleanup-dev-new.yml deleted file mode 100644 index caeea2a..0000000 --- a/.github/workflows/cleanup-dev-new.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: AOE Clean Up (DEV NEW) -on: - workflow_dispatch: - schedule: - - cron: '0 0 * * *' # This will run the action every day at midnight -permissions: - id-token: write - contents: read -jobs: - AOE-CLEANUP: - environment: devnew - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/dev' - - steps: - - run: echo "This job is now running on a ${{ runner.os }} server hosted by GitHub for the ${{ github.ref }} branch of the ${{ github.repository }} repository!" - - name: Installing modules - shell: pwsh - run: | - Set-PSRepository PSGallery -InstallationPolicy Trusted - Install-Module -Name Az.Accounts,Az.Resources -Force - - name: Check out repository code - uses: actions/checkout@v3 - - name: Login via Az module - uses: azure/login@v2 - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - enable-AzPSSession: true - - name: Testing PowerShell script call - shell: pwsh - run: | - $aoeResource = Get-AzResource -Id "/subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/resourceGroups/${{ secrets.AOE_NAMEPREFIX }}-rg/providers/Microsoft.Automation/automationAccounts/${{ secrets.AOE_NAMEPREFIX }}-auto" -ExpandProperties - if ((Get-Date) -gt $aoeResource.Properties.creationTime.AddDays(${{ vars.AOE_MAXAGEDAYS }})) { Write-Host "Deleting Resource Group"; Remove-AzResourceGroup -Name "${{ secrets.AOE_NAMEPREFIX }}-rg" -Force -AsJob } else { Write-Host "Resource Group is not old enough to delete" } - - run: echo "🍏 This job's status is ${{ job.status }}." diff --git a/.github/workflows/continuous-deployment-dev-new.yml b/.github/workflows/continuous-deployment-dev-new.yml index b24d925..5b8efa9 100644 --- a/.github/workflows/continuous-deployment-dev-new.yml +++ b/.github/workflows/continuous-deployment-dev-new.yml @@ -27,7 +27,7 @@ jobs: - name: Check out repository code uses: actions/checkout@v3 - name: Login via Az module - uses: azure/login@v2 + uses: azure/login@hf_447_release with: client-id: ${{ secrets.AZURE_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} diff --git a/.github/workflows/continuous-deployment-dev.yml b/.github/workflows/continuous-deployment-dev.yml index b31f0c9..bfd85c0 100644 --- a/.github/workflows/continuous-deployment-dev.yml +++ b/.github/workflows/continuous-deployment-dev.yml @@ -29,7 +29,7 @@ jobs: - name: Check out repository code uses: actions/checkout@v3 - name: Login via Az module - uses: azure/login@v2 + uses: azure/login@hf_447_release with: client-id: ${{ secrets.AZURE_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml index aa3fd8c..234f60b 100644 --- a/.github/workflows/continuous-deployment.yml +++ b/.github/workflows/continuous-deployment.yml @@ -27,7 +27,7 @@ jobs: - name: Check out repository code uses: actions/checkout@v3 - name: Login via Az module - uses: azure/login@v2 + uses: azure/login@hf_447_release with: client-id: ${{ secrets.AZURE_CLIENT_ID }} tenant-id: ${{ secrets.AZURE_TENANT_ID }} diff --git a/azuredeploy-nested.bicep b/azuredeploy-nested.bicep index c3995d5..8701bde 100644 --- a/azuredeploy-nested.bicep +++ b/azuredeploy-nested.bicep @@ -531,6 +531,7 @@ var csvExports = [ ingestTimeOffset: 'PT2H' ingestFrequency: 'Hour' ingestJobId: monitorIngestJobId + exportSchedule: null exportJobId: 'dummy' } {