Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 3bf65b4

Browse filesBrowse files
Remove redundant pipeline variable (Azure#116)
# Pull Request ## Description We are removing a pipeline path variable that is no longer required. Here is a successful e2e test run with the updated bootstrap code: https://github.com/Azure/accelerator-bootstrap-modules/actions/runs/9450687525/job/26029889532 These are the sister PRs related to this: * Azure/accelerator-bootstrap-modules#23 * Azure/alz-terraform-accelerator#152 ## License By submitting this pull request, I confirm that my contribution is made under the terms of the projects associated license.
1 parent 58015ba commit 3bf65b4
Copy full SHA for 3bf65b4

File tree

Expand file treeCollapse file tree

3 files changed

+2
-17
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+2
-17
lines changed

‎src/ALZ/Private/Deploy-Accelerator-Helpers/Get-BootstrapAndStarterConfig.ps1

Copy file name to clipboardExpand all lines: src/ALZ/Private/Deploy-Accelerator-Helpers/Get-BootstrapAndStarterConfig.ps1
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ function Get-BootstrapAndStarterConfig {
1919
$starterModuleUrl = ""
2020
$starterModuleSourceFolder = ""
2121
$starterReleaseTag = ""
22-
$starterPipelineFolder = ""
2322
$starterReleaseArtifactName = ""
2423
$starterConfigFilePath = ""
2524

@@ -64,7 +63,6 @@ function Get-BootstrapAndStarterConfig {
6463

6564
$starterModuleUrl = $starterModuleDetails.Value.$iac.url
6665
$starterModuleSourceFolder = $starterModuleDetails.Value.$iac.release_artifact_root_path
67-
$starterPipelineFolder = $starterModuleDetails.Value.$iac.release_artifact_ci_cd_path
6866
$starterReleaseArtifactName = $starterModuleDetails.Value.$iac.release_artifact_name
6967
$starterConfigFilePath = $starterModuleDetails.Value.$iac.release_artifact_config_file
7068
}
@@ -80,7 +78,6 @@ function Get-BootstrapAndStarterConfig {
8078
starterModuleUrl = $starterModuleUrl
8179
starterModuleSourceFolder = $starterModuleSourceFolder
8280
starterReleaseTag = $starterReleaseTag
83-
starterPipelineFolder = $starterPipelineFolder
8481
starterReleaseArtifactName = $starterReleaseArtifactName
8582
starterConfigFilePath = $starterConfigFilePath
8683
validationConfig = $validationConfig

‎src/ALZ/Private/Deploy-Accelerator-Helpers/New-Bootstrap.ps1

Copy file name to clipboardExpand all lines: src/ALZ/Private/Deploy-Accelerator-Helpers/New-Bootstrap.ps1
+2-11Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ function New-Bootstrap {
3434
[Parameter(Mandatory = $false)]
3535
[string] $starterRelease,
3636

37-
[Parameter(Mandatory = $false)]
38-
[string] $starterPipelineFolder,
39-
4037
[Parameter(Mandatory = $false)]
4138
[switch] $autoApprove,
4239

@@ -83,18 +80,15 @@ function New-Bootstrap {
8380
# Get starter module
8481
$starter = ""
8582
$starterModulePath = ""
86-
$pipelineModulePath = ""
8783

8884
if($hasStarter) {
8985
$starter = Request-SpecialInput -type "starter" -starterConfig $starterConfig -userInputOverrides $userInputOverrides
9086

9187
Write-Verbose "Selected Starter: $starter"
9288

9389
$starterModulePath = Resolve-Path (Join-Path -Path $starterPath -ChildPath $starterConfig.starter_modules.$starter.location)
94-
$pipelineModulePath = Resolve-Path (Join-Path -Path $starterPath -ChildPath $starterPipelineFolder)
9590

9691
Write-Verbose "Starter Module Path: $starterModulePath"
97-
Write-Verbose "Pipeline Module Path: $pipelineModulePath"
9892
}
9993

10094
# Getting the configuration for the interface user input
@@ -174,9 +168,8 @@ function New-Bootstrap {
174168

175169
# Set computed interface inputs
176170
$computedInputMapping = @{
177-
"iac_type" = $iac
178-
"module_folder_path" = $starterModulePath
179-
"pipeline_folder_path" = $pipelineModulePath
171+
"iac_type" = $iac
172+
"module_folder_path" = $starterModulePath
180173
}
181174

182175
foreach($inputConfigItem in $inputConfig.inputs.PSObject.Properties) {
@@ -214,8 +207,6 @@ function New-Bootstrap {
214207
-autoApprove:$autoApprove.IsPresent `
215208
-computedInputs $bootstrapComputed
216209

217-
218-
219210
# Getting the user input for the starter module
220211
Write-InformationColored "The following inputs are specific to the '$starter' starter module that you selected:" -ForegroundColor Green -NewLineBefore -InformationAction Continue
221212
$starterConfiguration = Request-ALZEnvironmentConfig `

‎src/ALZ/Public/New-ALZEnvironment.ps1

Copy file name to clipboardExpand all lines: src/ALZ/Public/New-ALZEnvironment.ps1
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ function New-ALZEnvironment {
183183
$starterModuleUrl = $bicepLegacyUrl
184184
$starterModuleSourceFolder = "."
185185
$starterReleaseTag = "local"
186-
$starterPipelineFolder = "local"
187186
$starterReleaseArtifactName = ""
188187
$starterConfigFilePath = ""
189188

@@ -204,7 +203,6 @@ function New-ALZEnvironment {
204203
$starterModuleUrl = $bootstrapAndStarterConfig.starterModuleUrl
205204
$starterModuleSourceFolder = $bootstrapAndStarterConfig.starterModuleSourceFolder
206205
$starterReleaseTag = $bootstrapAndStarterConfig.starterReleaseTag
207-
$starterPipelineFolder = $bootstrapAndStarterConfig.starterPipelineFolder
208206
$starterReleaseArtifactName = $bootstrapAndStarterConfig.starterReleaseArtifactName
209207
$starterConfigFilePath = $bootstrapAndStarterConfig.starterConfigFilePath
210208
$validationConfig = $bootstrapAndStarterConfig.validationConfig
@@ -274,7 +272,6 @@ function New-ALZEnvironment {
274272
-bootstrapRelease $bootstrapReleaseTag `
275273
-hasStarter:$hasStarterModule `
276274
-starterTargetPath $starterTargetPath `
277-
-starterPipelineFolder $starterPipelineFolder `
278275
-starterRelease $starterReleaseTag `
279276
-starterConfig $starterConfig `
280277
-userInputOverrides $userInputOverrides `

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.