Change to use pre release (#11)

# Pull Request ## Description Change to use the changes now merged to ALZ Bicep ## License By submitting this pull request, I confirm that my contribution is made under the terms of the projects associated license.
Azure · Mar 23, 2023 · 3875c70 · 3875c70
1 parent 7245201
commit 3875c70
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 16 deletions.
diff --git a/...sets/alz-bicep-config/v0.13.0.config.json → .../alz-bicep-config/v0.14.0-pre.config.json b/...sets/alz-bicep-config/v0.13.0.config.json → .../alz-bicep-config/v0.14.0-pre.config.json
@@ -1,54 +1,130 @@
 {
-    "version": "v0.13.0",
+    "version": "v0.14.0-pre",
     "module_url": "https://github.com/Azure/ALZ-Bicep",
     "config_files": [
         {
             "source": "infra-as-code/bicep/modules/policy/definitions/parameters/customPolicyDefinitions.parameters.all.json",
-            "destination": "config/custom-parameters/customPolicyDefinitions.parameters.json"
+            "destination": "config/custom-parameters/customPolicyDefinitions.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/customRoleDefinitions/parameters/customRoleDefinitions.parameters.all.json",
-            "destination": "config/custom-parameters/customRoleDefinitions.parameters.json"
+            "destination": "config/custom-parameters/customRoleDefinitions.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.all.json",
-            "destination": "config/custom-parameters/hubNetworking.parameters.json"
+            "destination": "config/custom-parameters/hubNetworking.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/logging/parameters/logging.parameters.all.json",
-            "destination": "config/custom-parameters/logging.parameters.json"
+            "destination": "config/custom-parameters/logging.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/managementGroups/parameters/managementGroups.parameters.all.json",
-            "destination": "config/custom-parameters/managementGroups.parameters.json"
+            "destination": "config/custom-parameters/managementGroups.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/mgDiagSettings/parameters/mgDiagSettings.parameters.all.json",
-            "destination": "config/custom-parameters/mgDiagSettings.parameters.json"
+            "destination": "config/custom-parameters/mgDiagSettings.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/policy/assignments/parameters/policyAssignmentManagementGroup.dine.parameters.all.json",
-            "destination": "config/custom-parameters/policyAssignmentManagementGroup.dine.parameters.json"
+            "destination": "config/custom-parameters/policyAssignmentManagementGroup.dine.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/resourceGroup/parameters/resourceGroup.parameters.all.json",
-            "destination": "config/custom-parameters/resourceGroupConnectivity.parameters.json"
+            "destination": "config/custom-parameters/resourceGroupConnectivity.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/resourceGroup/parameters/resourceGroup.parameters.all.json",
-            "destination": "config/custom-parameters/resourceGroupLoggingAndSentinel.parameters.json"
+            "destination": "config/custom-parameters/resourceGroupLoggingAndSentinel.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/roleAssignments/parameters/roleAssignmentManagementGroupMany.servicePrincipal.parameters.all.json",
-            "destination": "config/custom-parameters/roleAssignmentManagementGroupMany.servicePrincipal.parameters.json"
+            "destination": "config/custom-parameters/roleAssignmentManagementGroupMany.servicePrincipal.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/subscriptionPlacement/parameters/subscriptionPlacement.parameters.all.json",
-            "destination": "config/custom-parameters/subscriptionPlacement.parameters.json"
+            "destination": "config/custom-parameters/subscriptionPlacement.parameters.all.json"
         },
         {
             "source": "infra-as-code/bicep/modules/vwanConnectivity/parameters/vwanConnectivity.parameters.all.json",
-            "destination": "config/custom-parameters/vwanConnectivity.parameters.json"
+            "destination": "config/custom-parameters/vwanConnectivity.parameters.all.json"
+        },
+        {
+            "source": "accelerator/.github/workflows/alz-bicep-1.yml",
+            "destination": ".github/workflows/alz-bicep-1.yml"
+        },
+        {
+            "source": "accelerator/.github/workflows/alz-bicep-2.yml",
+            "destination": ".github/workflows/alz-bicep-2.yml"
+        },
+        {
+            "source": "accelerator/.github/workflows/alz-bicep-3.yml",
+            "destination": ".github/workflows/alz-bicep-3.yml"
+        },
+        {
+            "source": "accelerator/.github/workflows/alz-bicep-4a.yml",
+            "destination": ".github/workflows/alz-bicep-4a.yml"
+        },
+        {
+            "source": "accelerator/.github/workflows/alz-bicep-4b.yml",
+            "destination": ".github/workflows/alz-bicep-4b.yml"
+        },
+        {
+            "source": "accelerator/.github/workflows/alz-bicep-pr-1.yml",
+            "destination": ".github/workflows/alz-bicep-pr-1.yml"
+        },
+        {
+            "source": "accelerator/.github/workflows/alz-bicep-pr-2.yml",
+            "destination": ".github/workflows/alz-bicep-pr-2.yml"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZConnectivityResourceGroup.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZConnectivityResourceGroup.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZCustomPolicyDefinitions.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZCustomPolicyDefinitions.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZCustomRoleDefinitions.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZCustomRoleDefinitions.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZHub-HubAndSpoke.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZHub-HubAndSpoke.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZHub-VWAN.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZHub-VWAN.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZLoggingAndSentinel.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZLoggingAndSentinel.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZLoggingAndSentinelResourceGroup.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZLoggingAndSentinelResourceGroup.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZMGDiagnosticSettings.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZMGDiagnosticSettings.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZManagementGroups.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZManagementGroups.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZPolicyAssignments.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZPolicyAssignments.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZRoleAssignments.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZRoleAssignments.ps1"
+        },
+        {
+            "source": "accelerator/pipeline-scripts/Deploy-ALZSubscriptionPlacement.ps1",
+            "destination": "pipeline-scripts/Deploy-ALZSubscriptionPlacement.ps1"
         }
     ],
     "parameters": {
@@ -71,6 +147,10 @@
                 {
                     "Name": "parAssignableScopeManagementGroupId",
                     "Destination": "Parameters"
+                },
+                {
+                    "name": "TOP_LEVEL_MG_PREFIX",
+                    "destination": "Environment"
                 }
             ],
             "Value": "",
@@ -106,6 +186,10 @@
                 {
                     "Name": "parLogAnalyticsWorkspaceLocation",
                     "Destination": "Parameters"
+                },
+                {
+                    "Name": "LOCATION",
+                    "Destination": "Environment"
                 }
             ],
             "AllowedValues": {
@@ -149,6 +233,10 @@
                 {
                     "Name": "ConnectivitySubscriptionId",
                     "Destination": "Environment"
+                },
+                {
+                    "Name": "CONNECTIVITY_SUBSCRIPTION_ID",
+                    "Destination": "Environment"
                 }
             ],
             "Value": ""
@@ -186,6 +274,16 @@
                     "Destination": "Parameters"
                 }
             ]
+        },
+        "UpstreamReleaseVersion": {
+            "Type": "Computed",
+            "Value": "v0.14.0-pre",
+            "Targets": [
+                {
+                    "Name": "UPSTREAM_RELEASE_VERSION",
+                    "Destination": "Environment"
+                }
+            ]
         }
     }
 }
diff --git a/src/ALZ/Private/Get-ALZBicepConfig.ps1 b/src/ALZ/Private/Get-ALZBicepConfig.ps1
@@ -4,7 +4,7 @@ function Get-ALZBicepConfig {
     #>
     param(
         [Parameter(Mandatory = $false)]
-        [string] $alzBicepVersion = "v0.13.0"
+        [string] $alzBicepVersion = "v0.14.0-pre"
     )
     # import the config from the json file inside assets and tranform it to a powershell object
     $bicepConfig = Get-Content -Path (Join-Path $(Get-ScriptRoot) "../Assets/alz-bicep-config" "$alzBicepVersion.config.json" ) | ConvertFrom-Json

diff --git a/src/ALZ/Public/New-ALZEnvironment.ps1 b/src/ALZ/Public/New-ALZEnvironment.ps1
@@ -19,7 +19,7 @@ function New-ALZEnvironment {
     .EXAMPLE
     New-ALZEnvironment -alzEnvironmentDestination "."
     .EXAMPLE
-    New-ALZEnvironment -alzEnvironmentDestination "." -alzBicepVersion "v0.13.0"
+    New-ALZEnvironment -alzEnvironmentDestination "." -alzBicepVersion "v0.14.0-pre"
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
     param (
@@ -30,7 +30,7 @@ function New-ALZEnvironment {
         [string] $alzEnvironmentDestination = ".",
 
         [Parameter(Mandatory = $false)]
-        [string] $alzBicepVersion = "v0.13.0",
+        [string] $alzBicepVersion = "v0.14.0-pre",
 
         [Parameter(Mandatory = $false)]
         [ValidateSet("bicep", "terraform")]