Skip to content

topic (iac): [secure-hybrid-network] remove ARM JSON templates #271

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.

Sign up for GitHub

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

Merged
ckittel merged 1 commit into from
Jun 1, 2026
Merged

topic (iac): [secure-hybrid-network] remove ARM JSON templates #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
182 changes: 0 additions & 182 deletions solutions/secure-hybrid-network/azuredeploy.json
View file
Open in desktop

This file was deleted.

62 changes: 8 additions & 54 deletions solutions/secure-hybrid-network/azurepipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
variables:
- name: location
value: southcentralus
- name: template-location
value: "/solutions/secure-hybrid-network/*"
- name: template-name
value: "azuredeploy.json"
- name: adminUserName
value: "azureadmin"
- name: pester-script-location
value: "/tests/Test.ARMTemplate.ps1"
- name: ttk-skip-test
value: "DependsOn-Best-Practices,IDs-Should-Be-Derived-From-ResourceIDs,Secure-Params-In-Nested-Deployments"
- name: artifactsLocationTemplate
value: "https://raw.githubusercontent.com/mspnp/samples/main/solutions/secure-hybrid-network/"
- name: mock-on-prem-resource-group-name
value: secure-moc-onprem-$(Build.BuildId)
value: secure-mock-onprem-$(Build.BuildId)
- name: azure-network-resource-group-name
value: secure-vnet-azure-$(Build.BuildId)

Expand Down Expand Up @@ -47,42 +37,12 @@ schedules:
always: true

stages:
# Run ARM TTK and publish test results (Windows only)
# - stage: armTemplateToolkit

# jobs:
# - job: armttk
# pool:
# vmImage: 'windows-latest'
# continueOnError: false
# timeoutInMinutes: 20

# steps:

# - task: PowerShell@2
# displayName: ARM-TTK and Pester
# inputs:
# targetType: 'inline'
# script: |
# git clone https://github.com/Azure/arm-ttk.git --quiet $env:BUILD_ARTIFACTSTAGINGDIRECTORY\arm-ttk
# import-module $env:BUILD_ARTIFACTSTAGINGDIRECTORY\arm-ttk\arm-ttk
# Install-Module Pester -AllowClobber -RequiredVersion 4.10.1 -Force -SkipPublisherCheck -AcceptLicense
# Import-Module Pester -RequiredVersion 4.10.1 -ErrorAction Stop
# $results = Invoke-Pester -Script @{Path = "$(System.DefaultWorkingDirectory)$(pester-script-location)"; Parameters = @{TemplatePath = "$(System.DefaultWorkingDirectory)$(template-location)$(template-name)"; Skip = "$(ttk-skip-test)"}} -OutputFormat NUnitXml -OutputFile TEST-ARMTemplate.xml -PassThru
# if ($results.TestResult.Result -contains "Failed") {Write-Error -Message "Test Failed"}

# - task: PublishTestResults@2
# inputs:
# testResultsFormat: 'NUnit'
# testResultsFiles: TEST-ARMTemplate.xml
# condition: always()

# Deploy template
- stage: validateAndDeploy
dependsOn: []

jobs:
- job: arm
- job: deploy
pool:
vmImage: ubuntu-latest
continueOnError: false
Expand All @@ -95,35 +55,29 @@ stages:
azureSubscription: $(serviceConnection)
scriptType: "bash"
scriptLocation: "inlineScript"
workingDirectory: $(System.DefaultWorkingDirectory)/solutions/secure-hybrid-network
inlineScript: |
uriTemplate=$(artifactsLocationTemplate)
deployUri="${uriTemplate/REPLACEREF/$(Build.SourceVersion)}azuredeploy.json"
artifactUri="${uriTemplate/REPLACEREF/$(Build.SourceVersion)}"
az deployment sub validate --template-uri $deployUri --location eastus --parameters resourceGrouplocation=$(location) mockOnPremResourceGroup=$(mock-on-prem-resource-group-name) azureNetworkResourceGroup=$(azure-network-resource-group-name) adminUserName=$(adminUserName) adminPassword=$(adminPassword) sharedKey=$(sharedKey) --name validate-$(Build.BuildId)
az deployment sub validate --template-file azuredeploy.bicep --location eastus --parameters resourceGrouplocation=$(location) mockOnPremResourceGroup=$(mock-on-prem-resource-group-name) azureNetworkResourceGroup=$(azure-network-resource-group-name) adminUserName=$(adminUserName) adminPassword=$(adminPassword) sharedKey=$(sharedKey) --name validate-$(Build.BuildId)

- task: AzureCLI@2
displayName: Deploy template
inputs:
azureSubscription: $(serviceConnection)
scriptType: "bash"
scriptLocation: "inlineScript"
workingDirectory: $(System.DefaultWorkingDirectory)/solutions/secure-hybrid-network
inlineScript: |
uriTemplate=$(artifactsLocationTemplate)
deployUri="${uriTemplate/REPLACEREF/$(Build.SourceVersion)}azuredeploy.json"
artifactUri="${uriTemplate/REPLACEREF/$(Build.SourceVersion)}"
az deployment sub create --template-uri $deployUri --location eastus --parameters resourceGrouplocation=$(location) mockOnPremResourceGroup=$(mock-on-prem-resource-group-name) azureNetworkResourceGroup=$(azure-network-resource-group-name) adminUserName=$(adminUserName) adminPassword=$(adminPassword) sharedKey=$(sharedKey) --name deploy-$(Build.BuildId)
az deployment sub create --template-file azuredeploy.bicep --location eastus --parameters resourceGrouplocation=$(location) mockOnPremResourceGroup=$(mock-on-prem-resource-group-name) azureNetworkResourceGroup=$(azure-network-resource-group-name) adminUserName=$(adminUserName) adminPassword=$(adminPassword) sharedKey=$(sharedKey) --name deploy-$(Build.BuildId)

- task: AzureCLI@2
displayName: Deploy template again
inputs:
azureSubscription: $(serviceConnection)
scriptType: "bash"
scriptLocation: "inlineScript"
workingDirectory: $(System.DefaultWorkingDirectory)/solutions/secure-hybrid-network
inlineScript: |
uriTemplate=$(artifactsLocationTemplate)
deployUri="${uriTemplate/REPLACEREF/$(Build.SourceVersion)}azuredeploy.json"
artifactUri="${uriTemplate/REPLACEREF/$(Build.SourceVersion)}"
az deployment sub create --template-uri $deployUri --location eastus --parameters resourceGrouplocation=$(location) mockOnPremResourceGroup=$(mock-on-prem-resource-group-name) azureNetworkResourceGroup=$(azure-network-resource-group-name) adminUserName=$(adminUserName) adminPassword=$(adminPassword) sharedKey=$(sharedKey) --name deploy-$(Build.BuildId)
az deployment sub create --template-file azuredeploy.bicep --location eastus --parameters resourceGrouplocation=$(location) mockOnPremResourceGroup=$(mock-on-prem-resource-group-name) azureNetworkResourceGroup=$(azure-network-resource-group-name) adminUserName=$(adminUserName) adminPassword=$(adminPassword) sharedKey=$(sharedKey) --name deploy-$(Build.BuildId)

# Clean up deployment
- stage: cleanupResourceGroupBasic
Expand Down
Loading
Loading