Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .ado/workflows/dataLandingZoneDeployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ stages:
subscriptionId: ${{ variables.AZURE_SUBSCRIPTION_ID }}
location: ${{ variables.AZURE_LOCATION }}
templateLocation: "Linked artifact"
csmFile: "$(System.DefaultWorkingDirectory)/infra/main.json"
csmFile: "$(System.DefaultWorkingDirectory)/infra/main.bicep"
csmParametersFile: "$(System.DefaultWorkingDirectory)/infra/params.dev.json"
deploymentMode: "Validation"
deploymentName: "DataLandingZone-$(Build.SourceVersion)"
overrideParameters: >
-administratorPassword "$(password)"

Expand All @@ -95,7 +96,8 @@ stages:
--location ${{ variables.AZURE_LOCATION }} `
--subscription ${{ variables.AZURE_SUBSCRIPTION_ID }} `
--exclude-change-types Ignore NoChange Unsupported `
--template-file "$(System.DefaultWorkingDirectory)/infra/main.json" `
--name "DataLandingZone-$(Build.SourceVersion)" `
--template-file "$(System.DefaultWorkingDirectory)/infra/main.bicep" `
--parameters "$(System.DefaultWorkingDirectory)/infra/params.dev.json" administratorPassword="$(password)" `
--result-format "FullResourcePayloads"

Expand Down Expand Up @@ -153,10 +155,11 @@ stages:
subscriptionId: ${{ variables.AZURE_SUBSCRIPTION_ID }}
location: ${{ variables.AZURE_LOCATION }}
templateLocation: "Linked artifact"
csmFile: "$(System.DefaultWorkingDirectory)/infra/main.json"
csmFile: "$(System.DefaultWorkingDirectory)/infra/main.bicep"
csmParametersFile: "$(System.DefaultWorkingDirectory)/infra/params.dev.json"
deploymentOutputs: 'dataLandingZoneDetails01'
deploymentMode: "Incremental"
deploymentName: "DataLandingZone-$(Build.SourceVersion)"
overrideParameters: >
-administratorPassword "$(password)"

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [ ] Closes Issue #xxx
* [ ] Code of Conduct signed. If not, go to [Code of Conduct](https://github.com/Azure/data-management-zone/blob/main/CODE_OF_CONDUCT.md).
* [ ] Code of Conduct signed. If not, go to [Code of Conduct](https://github.com/Azure/data-landing-zone/blob/main/CODE_OF_CONDUCT.md).

<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
31 changes: 15 additions & 16 deletions .github/workflows/dataLandingZoneDeployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

# Generate Password
- name: Generate Password
id: generate_password_001
Expand All @@ -52,28 +52,26 @@ jobs:
scope: subscription
subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
region: ${{ env.AZURE_LOCATION }}
template: ${{ github.workspace }}/infra/main.json
template: ${{ github.workspace }}/infra/main.bicep
parameters: ${{ github.workspace }}/infra/params.dev.json administratorPassword="${{ steps.generate_password_001.outputs.password }}"
deploymentMode: Validate
deploymentName: "DataLandingZone-${{ github.sha }}"
failOnStdErr: false

# Deploy Data Landing Zone - what-if
- name: Deploy Data Landing Zone - what-if
id: data_landing_zone_whatif
uses: azure/CLI@v1
uses: azure/arm-deploy@v1
with:
azcliversion: "agentazcliversion"
inlineScript: |
az account set \
--subscription ${{ env.AZURE_SUBSCRIPTION_ID }}

az deployment sub what-if \
--location ${{ env.AZURE_LOCATION }} \
--subscription ${{ env.AZURE_SUBSCRIPTION_ID }} \
--exclude-change-types Ignore NoChange Unsupported \
--template-file "${GITHUB_WORKSPACE}/infra/main.json" \
--parameters "${GITHUB_WORKSPACE}/infra/params.dev.json" administratorPassword="${{ steps.generate_password_001.outputs.password }}" \
--result-format "FullResourcePayloads"
scope: subscription
subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
region: ${{ env.AZURE_LOCATION }}
template: ${{ github.workspace }}/infra/main.bicep
parameters: ${{ github.workspace }}/infra/params.dev.json administratorPassword="${{ steps.generate_password_001.outputs.password }}"
deploymentMode: Incremental
deploymentName: "DataLandingZone-${{ github.sha }}"
failOnStdErr: false
additionalArguments: "--what-if --what-if-exclude-change-types Ignore NoChange Unsupported --what-if-result-format FullResourcePayloads"

# Log out from Azure
- name: Log out from Azure
Expand Down Expand Up @@ -120,9 +118,10 @@ jobs:
scope: subscription
subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
region: ${{ env.AZURE_LOCATION }}
template: ${{ github.workspace }}/infra/main.json
template: ${{ github.workspace }}/infra/main.bicep
parameters: ${{ github.workspace }}/infra/params.dev.json administratorPassword="${{ steps.generate_password_001.outputs.password }}"
deploymentMode: Incremental
deploymentName: "DataLandingZone-${{ github.sha }}"
failOnStdErr: false

# Restart MySql Server 001
Expand Down