fixed build and release scripts, testing pipeline update

README.md

@@ -177,7 +177,7 @@ Full spec for each artifact type:
 * [Template](https://docs.microsoft.com/en-us/rest/api/blueprints/artifacts/createorupdate#templateartifact)
 
 ### How Parameters work
-Nearly everything can be parameterized. The only things that can't be parameterized are the `roleDefinitionId` and `policyDefinitionId` in the `rbacAssignment` and `policyAssignment` artifacts respectively.
+Nearly everything in a blueprint definition can be parameterized. The only things that can't be parameterized are the `roleDefinitionId` and `policyDefinitionId` in the `rbacAssignment` and `policyAssignment` artifacts respectively.
 Parameters are defined in the main blueprint file and can be referenced in any artifact. 
 
 Here's a simple parameter declaration which is a simplified version from `blueprint.json`:
@@ -234,6 +234,15 @@ You can also use the `New-AzBlueprintArtifact` cmdlet to convert a standard ARM
 New-AzBlueprintArtifact -Type TemplateArtifact -Name storage-account -Blueprint $bp -TemplateFile C:\StorageAccountArmTemplate.json -ResourceGroup "storageRG" -TemplateParameterFile "C:\StorageAccountParams.json"
 ```
 
+#### How blueprint parameters display during assignment in the Azure Portal
+When you assign a blueprint in the Azure Portal, the parameters will be diplayed according to how they are referenced. If a parameter is used by multiple artifacts, it will be displayed as a blueprint parameter. Like this:
+
+![Image of blueprint parameters](./images/bp-params.PNG)
+
+If it is used by a single artifact, it will be displayed only in the context of that artifact, like so:
+
+![Image of artifact parameters](./images/artifact-params.PNG)
+
 ### Passing values between artifacts
 There are many reasons you may want or need to pass the output from one artifact as the input to another artifact that is deployed later in the blueprint assignment sequence. If so, you can make use of the ```artifacts()``` function which lets you reference the details of a particular artifact.
 

azure-pipelines.yml

@@ -3,6 +3,8 @@ pool: 'Hosted VS2017'
 variables:
  - name: spnName
    value: 'pipelines-runner'
+ - name: blueprintPath
+   value: '.\samples\'
  - name: blueprintName
    value: '101-boilerplate'
  - name: subscriptionId
@@ -26,7 +28,7 @@ steps:
   inputs:
     azureSubscription: $(spnName)
     BlueprintName: $(blueprintName)
-    BlueprintPath: '.\$(blueprintName)'
+    BlueprintPath: '$(blueprintsPath)$(blueprintName)' # would need to edit this to work with built-ins
     AlternateLocation: false
     PublishBlueprint: true
 

pipelines-scripts/build.ps1

@@ -11,14 +11,14 @@ param(
 $PSVersionTable.PSVersion # Assuming powershell core (6)
 
 Write-Host "Installing Az module"
-# Get-Module -ListAvailable
-Install-Module -Name Az.Blueprint -AllowClobber
+Install-Module -Name Az.Blueprint -AllowClobber # todo - check installation status
 Write-Host "Successfully installed Az.Blueprint module"
 
 Write-Host "Start login with SPN"
 $pass = ConvertTo-SecureString $spnPass -AsPlainText -Force
 $cred = New-Object -TypeName pscredential -ArgumentList $spnId, $pass
 Login-AzAccount -Credential $cred -ServicePrincipal -TenantId $tenantId
+Write-Host "Successfully logged in with SPN"
 
 Write-Host "Azure context:"
 Get-AzContext

pipelines-scripts/release.ps1

@@ -1,6 +1,5 @@
 param(
     [Parameter(Mandatory=$true)]$mgId, 
-    [Parameter(Mandatory=$true)]$BlueprintFolder,
     [Parameter(Mandatory=$true)]$blueprintName,
     [Parameter(Mandatory=$true)]$spnId,
     [Parameter(Mandatory=$true)]$spnPass,
@@ -12,7 +11,7 @@ param(
 # Output powershell version for debugging purposes and is probably generally good to know
 $PSVersionTable.PSVersion # Assuming powershell core (6)
 
-Write-Host "Installing Az module"
+Write-Host "Installing Az module" # todo - should check if blueprint module is already installed
 Install-Module -Name Az.Blueprint -AllowClobber
 Write-Host "Successfully installed Az.Blueprint module"
 
@@ -26,10 +25,11 @@ Get-AzContext
 
 $importedBp = Get-AzBlueprint -ManagementGroupId $mgId -Name $blueprintName -LatestPublished
 # Urgent TODO - this should be idemopotent...
+# todo - should auto-insert blueprintId into parameters file
 New-AzBlueprintAssignment -Name "pla-$blueprintName" -Blueprint $importedBp -AssignmentFile $parametersPath -SubscriptionId $subscriptionId 
 
 # Wait for assignment to complete
-$timeout = new-timespan -Seconds 5
+$timeout = new-timespan -Seconds 500
 $sw = [diagnostics.stopwatch]::StartNew()
 
 while (($sw.elapsed -lt $timeout) -and ($AssignemntStatus.ProvisioningState -ne "Succeeded") -and ($AssignemntStatus.ProvisioningState -ne "Failed")) {