Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Workflows #95

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
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/dataProductDeployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@ stages:
resourceGroupName: ${{ variables.AZURE_RESOURCE_GROUP_NAME }}
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: "DataProduct-$(Build.SourceVersion)"
overrideParameters: >
-administratorPassword "$(password)"

Expand All @@ -97,8 +98,9 @@ stages:
az deployment group what-if `
--resource-group ${{ variables.AZURE_RESOURCE_GROUP_NAME }} `
--exclude-change-types Ignore NoChange Unsupported `
--name "DataProduct-$(Build.SourceVersion)" `
--mode "Incremental" `
--template-file "$(System.DefaultWorkingDirectory)/infra/main.json" `
--template-file "$(System.DefaultWorkingDirectory)/infra/main.bicep" `
--parameters "$(System.DefaultWorkingDirectory)/infra/params.dev.json" administratorPassword="$(password)" `
--result-format "FullResourcePayloads"

Expand Down Expand Up @@ -159,8 +161,9 @@ stages:
resourceGroupName: ${{ variables.AZURE_RESOURCE_GROUP_NAME }}
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: "Incremental"
deploymentName: "DataProduct-$(Build.SourceVersion)"
overrideParameters: >
-administratorPassword "$(password)"
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BUG_REPORT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ body:
label: Code of Conduct
description: The Code of Conduct helps create a safe space for everyone. We require that everyone must abide by it.
options:
- label: I agree to follow this project's [Code of Conduct](/CODE_OF_CONDUCT.md)
- label: I agree to follow this project's [Code of Conduct](https://github.com/Azure/data-product-streaming/blob/main/CODE_OF_CONDUCT.md)
required: true

- type: markdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/DOCUMENTATION_ISSUE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ body:
label: Code of Conduct
description: The Code of Conduct helps create a safe space for everyone. We require that everyone must abide by it.
options:
- label: I agree to follow this project's [Code of Conduct](/CODE_OF_CONDUCT.md)
- label: I agree to follow this project's [Code of Conduct](https://github.com/Azure/data-product-streaming/blob/main/CODE_OF_CONDUCT.md)
required: true

- type: markdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ body:
label: Code of Conduct
description: The Code of Conduct helps create a safe space for everyone. We require that everyone must abide by it.
options:
- label: I agree to follow this project's [Code of Conduct](/CODE_OF_CONDUCT.md)
- label: I agree to follow this project's [Code of Conduct](https://github.com/Azure/data-product-streaming/blob/main/CODE_OF_CONDUCT.md)
required: true

- type: markdown
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
* [ ] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] CLA signed. If not, go over [here](https://github.com/Azure/data-product-streaming/blob/main/CODE_OF_CONDUCT.md) and sign the CLA

<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
34 changes: 17 additions & 17 deletions .github/workflows/dataProductDeployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Data Product Deployment

on:
push:
branches: [ main ]
branches: [main]
paths:
- "code/**"
- "infra/**"
- ".github/workflows/dataProductDeployment.yml"
pull_request:
branches: [ main ]
branches: [main]
paths:
- "code/**"
- "infra/**"
Expand Down Expand Up @@ -54,28 +54,27 @@ jobs:
subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
resourceGroupName: ${{ env.AZURE_RESOURCE_GROUP_NAME }}
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: "DataProduct-${{ github.sha }}"
failOnStdErr: false

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

az deployment group what-if \
--resource-group ${{ env.AZURE_RESOURCE_GROUP_NAME }} \
--exclude-change-types Ignore NoChange Unsupported \
--mode "Incremental" \
--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: resourcegroup
subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
resourceGroupName: ${{ env.AZURE_RESOURCE_GROUP_NAME }}
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: "DataProduct-${{ 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 @@ -122,9 +121,10 @@ jobs:
subscriptionId: ${{ env.AZURE_SUBSCRIPTION_ID }}
resourceGroupName: ${{ env.AZURE_RESOURCE_GROUP_NAME }}
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: "DataProduct-${{ github.sha }}"
failOnStdErr: false

# Log out from Azure
Expand Down