Skip to content

Commit

Permalink
Merge branch 'main' into sub-placement-development
Browse files Browse the repository at this point in the history
  • Loading branch information
oZakari authored Feb 13, 2025
2 parents e67776d + 0d9bb07 commit 90e3631
Show file tree
Hide file tree
Showing 61 changed files with 9,966 additions and 120 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@
/avm/res/app/container-app/ @Azure/avm-res-app-containerapp-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/app/job/ @Azure/avm-res-app-job-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/app/managed-environment/ @Azure/avm-res-app-managedenvironment-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/app/session-pool/ @Azure/avm-res-app-sessionpool-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/app-configuration/configuration-store/ @Azure/avm-res-appconfiguration-configurationstore-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/automation/automation-account/ @Azure/avm-res-automation-automationaccount-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/azure-stack-hci/cluster/ @Azure/avm-res-azurestackhci-cluster-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/batch/batch-account/ @Azure/avm-res-batch-batchaccount-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/cache/redis/ @Azure/avm-res-cache-redis-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/cdn/profile/ @Azure/avm-res-cdn-profile-module-owners-bicep @Azure/avm-module-reviewers-bicep
Expand Down
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/avm_module_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ body:
- "avm/res/app/container-app"
- "avm/res/app/job"
- "avm/res/app/managed-environment"
- "avm/res/app/session-pool"
- "avm/res/automation/automation-account"
- "avm/res/azure-stack-hci/cluster"
- "avm/res/batch/batch-account"
- "avm/res/cache/redis"
- "avm/res/cdn/profile"
Expand Down
88 changes: 88 additions & 0 deletions .github/workflows/avm.res.app.session-pool.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: "avm.res.app.session-pool"

on:
workflow_dispatch:
inputs:
staticValidation:
type: boolean
description: "Execute static validation"
required: false
default: true
deploymentValidation:
type: boolean
description: "Execute deployment validation"
required: false
default: true
removeDeployment:
type: boolean
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
paths:
- ".github/actions/templates/avm-**"
- ".github/workflows/avm.template.module.yml"
- ".github/workflows/avm.res.app.session-pool.yml"
- "avm/res/app/session-pool/**"
- "utilities/pipelines/**"
- "!utilities/pipelines/platform/**"
- "!*/**/README.md"

env:
modulePath: "avm/res/app/session-pool"
workflowPath: ".github/workflows/avm.res.app.session-pool.yml"

concurrency:
group: ${{ github.workflow }}

jobs:
###########################
# Initialize pipeline #
###########################
job_initialize_pipeline:
runs-on: ubuntu-latest
name: "Initialize pipeline"
steps:
- name: "Checkout"
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: "Set input parameters to output variables"
id: get-workflow-param
uses: ./.github/actions/templates/avm-getWorkflowInput
with:
workflowPath: "${{ env.workflowPath}}"
- name: "Get module test file paths"
id: get-module-test-file-paths
uses: ./.github/actions/templates/avm-getModuleTestFiles
with:
modulePath: "${{ env.modulePath }}"
outputs:
workflowInput: ${{ steps.get-workflow-param.outputs.workflowInput }}
moduleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.moduleTestFilePaths }}
psRuleModuleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.psRuleModuleTestFilePaths }}
modulePath: "${{ env.modulePath }}"

##############################
# Call reusable workflow #
##############################
call-workflow-passing-data:
name: "Run"
permissions:
id-token: write # For OIDC
contents: write # For release tags
needs:
- job_initialize_pipeline
uses: ./.github/workflows/avm.template.module.yml
with:
workflowInput: "${{ needs.job_initialize_pipeline.outputs.workflowInput }}"
moduleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.moduleTestFilePaths }}"
psRuleModuleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.psRuleModuleTestFilePaths }}"
modulePath: "${{ needs.job_initialize_pipeline.outputs.modulePath}}"
secrets: inherit
88 changes: 88 additions & 0 deletions .github/workflows/avm.res.azure-stack-hci.cluster.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: "avm.res.azure-stack-hci.cluster"

on:
workflow_dispatch:
inputs:
staticValidation:
type: boolean
description: "Execute static validation"
required: false
default: true
deploymentValidation:
type: boolean
description: "Execute deployment validation"
required: false
default: true
removeDeployment:
type: boolean
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
paths:
- ".github/actions/templates/avm-**"
- ".github/workflows/avm.template.module.yml"
- ".github/workflows/avm.res.azure-stack-hci.cluster.yml"
- "avm/res/azure-stack-hci/cluster/**"
- "avm/utilities/pipelines/**"
- "!avm/utilities/pipelines/platform/**"
- "!*/**/README.md"

env:
modulePath: "avm/res/azure-stack-hci/cluster"
workflowPath: ".github/workflows/avm.res.azure-stack-hci.cluster.yml"

concurrency:
group: ${{ github.workflow }}

jobs:
###########################
# Initialize pipeline #
###########################
job_initialize_pipeline:
runs-on: ubuntu-latest
name: "Initialize pipeline"
steps:
- name: "Checkout"
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: "Set input parameters to output variables"
id: get-workflow-param
uses: ./.github/actions/templates/avm-getWorkflowInput
with:
workflowPath: "${{ env.workflowPath}}"
- name: "Get module test file paths"
id: get-module-test-file-paths
uses: ./.github/actions/templates/avm-getModuleTestFiles
with:
modulePath: "${{ env.modulePath }}"
outputs:
workflowInput: ${{ steps.get-workflow-param.outputs.workflowInput }}
moduleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.moduleTestFilePaths }}
psRuleModuleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.psRuleModuleTestFilePaths }}
modulePath: "${{ env.modulePath }}"

##############################
# Call reusable workflow #
##############################
call-workflow-passing-data:
name: "Run"
permissions:
id-token: write # For OIDC
contents: write # For release tags
needs:
- job_initialize_pipeline
uses: ./.github/workflows/avm.template.module.yml
with:
workflowInput: "${{ needs.job_initialize_pipeline.outputs.workflowInput }}"
moduleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.moduleTestFilePaths }}"
psRuleModuleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.psRuleModuleTestFilePaths }}"
modulePath: "${{ needs.job_initialize_pipeline.outputs.modulePath}}"
secrets: inherit
60 changes: 30 additions & 30 deletions avm/ptn/lz/sub-vending/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "16856855794906870670"
"version": "0.33.93.31351",
"templateHash": "14919277706976174104"
},
"name": "Sub-vending",
"description": "This module deploys a subscription to accelerate deployment of landing zones. For more information on how to use it, please visit this [Wiki](https://github.com/Azure/bicep-lz-vending/wiki).",
Expand Down Expand Up @@ -669,8 +669,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "2801471703151139948"
"version": "0.33.93.31351",
"templateHash": "8425865084067531624"
}
},
"parameters": {
Expand Down Expand Up @@ -880,8 +880,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "250791371811352682"
"version": "0.33.93.31351",
"templateHash": "11018695082972643897"
},
"name": "`/subResourcesWrapper/deploy.bicep` Parameters",
"description": "This module is used by the [`bicep-lz-vending`](https://aka.ms/sub-vending/bicep) module to help orchestrate the deployment",
Expand Down Expand Up @@ -1588,8 +1588,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "12834168093418139358"
"version": "0.33.93.31351",
"templateHash": "8452628568304993719"
}
},
"parameters": {
Expand Down Expand Up @@ -1649,8 +1649,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "15508893729756562690"
"version": "0.33.93.31351",
"templateHash": "11019372772177629958"
}
},
"parameters": {
Expand Down Expand Up @@ -1709,8 +1709,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "2541836993831686925"
"version": "0.33.93.31351",
"templateHash": "8397259050503224920"
}
},
"parameters": {
Expand Down Expand Up @@ -1765,8 +1765,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "7264500549088500335"
"version": "0.33.93.31351",
"templateHash": "7623404265819505597"
}
},
"parameters": {
Expand Down Expand Up @@ -1843,8 +1843,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "9459644647794329484"
"version": "0.33.93.31351",
"templateHash": "8957892045766331539"
}
},
"parameters": {
Expand Down Expand Up @@ -1898,8 +1898,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "8593973730489733307"
"version": "0.33.93.31351",
"templateHash": "14513856367602857749"
}
},
"parameters": {
Expand Down Expand Up @@ -2511,8 +2511,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "15508893729756562690"
"version": "0.33.93.31351",
"templateHash": "11019372772177629958"
}
},
"parameters": {
Expand Down Expand Up @@ -2571,8 +2571,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "2541836993831686925"
"version": "0.33.93.31351",
"templateHash": "8397259050503224920"
}
},
"parameters": {
Expand Down Expand Up @@ -2627,8 +2627,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "7264500549088500335"
"version": "0.33.93.31351",
"templateHash": "7623404265819505597"
}
},
"parameters": {
Expand Down Expand Up @@ -2705,8 +2705,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "9459644647794329484"
"version": "0.33.93.31351",
"templateHash": "8957892045766331539"
}
},
"parameters": {
Expand Down Expand Up @@ -2760,8 +2760,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "8593973730489733307"
"version": "0.33.93.31351",
"templateHash": "14513856367602857749"
}
},
"parameters": {
Expand Down Expand Up @@ -4454,8 +4454,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.33.13.18514",
"templateHash": "4537798139153123030"
"version": "0.33.93.31351",
"templateHash": "12390675321128699904"
}
},
"parameters": {
Expand Down
6 changes: 3 additions & 3 deletions avm/ptn/lz/sub-vending/tests/e2e/defaults/main.test.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ targetScope = 'managementGroup'
@description('Optional. The location to deploy resources to.')
param resourceLocation string = deployment().location

// This parameter needs to be updated with the billing account and the enrollment account of your enviornment.
@description('Optional. The subscription billing scope.')
param subscriptionBillingScope string = 'providers/Microsoft.Billing/billingAccounts/7690848/enrollmentAccounts/350580'
@description('Required. The scope of the subscription billing. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-SubscriptionBillingScope\'.')
@secure()
param subscriptionBillingScope string = ''

@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '#_namePrefix_#'
Expand Down
6 changes: 3 additions & 3 deletions avm/ptn/lz/sub-vending/tests/e2e/hub-spoke/main.test.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ targetScope = 'managementGroup'
@description('Optional. The location to deploy resources to.')
param resourceLocation string = deployment().location

// This parameter needs to be updated with the billing account and the enrollment account of your enviornment.
@description('Optional. The subscription billing scope.')
param subscriptionBillingScope string = 'providers/Microsoft.Billing/billingAccounts/7690848/enrollmentAccounts/350580'
@description('Required. The scope of the subscription billing. This value is tenant-specific and must be stored in the CI Key Vault in a secret named \'CI-SubscriptionBillingScope\'.')
@secure()
param subscriptionBillingScope string = ''

@description('Optional. A token to inject into the name of each resource.')
param namePrefix string = '#_namePrefix_#'
Expand Down
Loading

0 comments on commit 90e3631

Please sign in to comment.