microsoft · spetersenms · May 5, 2025 · May 5, 2025 · May 5, 2025 · May 5, 2025
diff --git a/Actions/AL-Go-Helper.ps1 b/Actions/AL-Go-Helper.ps1
@@ -552,6 +552,8 @@ function ReadSettings {
         [string] $branchName = "$ENV:GITHUB_REF_NAME",
         [string] $orgSettingsVariableValue = "$ENV:ALGoOrgSettings",
         [string] $repoSettingsVariableValue = "$ENV:ALGoRepoSettings",
+        [string] $environmentName = "",
+        [string] $environmentDeployToVariableValue = "",
         [switch] $silent
     )
 
@@ -746,6 +748,12 @@ function ReadSettings {
         $projectSettingsObject = GetSettingsObject -Path (Join-Path $projectFolder $ALGoSettingsFile)
         $settingsObjects += @($projectSettingsObject)
     }
+    if ($environmentDeployToVariableValue) {
+        # Read settings from environment variable (parameter)
+        $environmentVariableObject = [pscustomobject]@{"DeployTo$environmentName" = ($environmentDeployToVariableValue | ConvertFrom-Json) }
+        Write-Host "Environment variable settings: $environmentVariableObject"
+        $settingsObjects += @($environmentVariableObject)
+    }
     if ($workflowName) {
         # Read settings from workflow settings file
         $workflowSettingsObject = GetSettingsObject -Path (Join-Path $gitHubFolder "$workflowName.settings.json")

diff --git a/Actions/DetermineDeploymentEnvironments/DetermineDeploymentEnvironments.ps1 b/Actions/DetermineDeploymentEnvironments/DetermineDeploymentEnvironments.ps1
@@ -3,7 +3,9 @@
     [string] $getEnvironments,
     [Parameter(HelpMessage = "Type of deployment (CD, Publish or All)", Mandatory = $true)]
     [ValidateSet('CD','Publish','All')]
-    [string] $type
+    [string] $type,
+    [Parameter(HelpMessage = "ghTokenWorkflow secret used to read deployment environment variables", Mandatory = $false)]
+    [string] $ghTokenWorkflow
 )
 
 function IsGitHubPagesAvailable() {
@@ -56,6 +58,25 @@
     }
 }
 
+function Get-DeployToEnvironmentVariable($ghEnvironment) {
+    $headers = GetHeaders -token $ghTokenWorkflow
+
+    $ghEnvironmentDeployToVariable = $null
+
+    $url = "$($ghEnvironment.url)/variables"
+    try {
+        Write-Host "Requesting deployment environment variables from GitHub for environment $($ghEnvironment.name)"
+        $ghEnvironmentVariables = (InvokeWebRequest -Headers $headers -Uri $url).Content | ConvertFrom-Json
+        $ghEnvironmentDeployToVariable = $ghEnvironmentVariables.variables | Where-Object { $_.name -eq 'DeployTo' } | ForEach-Object { $_.value }
+        Write-Host "Debug found env variable: $($ghEnvironmentDeployToVariable | ConvertTo-Json -Depth 99)"
+    }
+    catch {
+        Write-Host "Failed to get deployment environment variables from GitHub API - Environments are not supported in this repository"
+    }
+
+    return $ghEnvironmentDeployToVariable
+}
+
 . (Join-Path -Path $PSScriptRoot -ChildPath "..\AL-Go-Helper.ps1" -Resolve)
 
 $settings = $env:Settings | ConvertFrom-Json | ConvertTo-HashTable -recurse
@@ -127,6 +148,7 @@
     foreach($environmentName in $environments) {
         Write-Host "Environment: $environmentName"
         $envName = $environmentName.Split(' ')[0]
+        $ghEnvironment = $ghEnvironments | Where-Object { $_.name -eq $environmentName }
 
         # Check Obsolete Settings
         foreach($obsoleteSetting in "$($envName)-Projects","$($envName)_Projects") {
@@ -169,6 +191,15 @@
             # If a DeployTo<environmentName> setting exists - use values from this (over the defaults)
             Write-Host "Setting $settingsName"
             $deployTo = $settings."$settingsName"
+            $deployToEnvironmentVariable = Get-DeployToEnvironmentVariable -ghEnvironment $ghEnvironment
+            if ($deployToEnvironmentVariable) {
+                $evKeys = @($deployToEnvironmentVariable.Keys)
+                Write-Host "Debug deployTo before: $($deployTo | ConvertTo-Json -Depth 99)"
+                foreach($key in $evKeys) {
+                    $deployTo."$key" = $deployToEnvironmentVariable."$key"
+                }
+                Write-Host "Debug deployTo after: $($deployTo | ConvertTo-Json -Depth 99)"
+            }  
             $keys = @($deployTo.Keys)
             foreach($key in $keys) {
                 if ($deploymentSettings.ContainsKey($key)) {
@@ -202,7 +233,6 @@
         }
 
         # Get Branch policies on GitHub Environment
-        $ghEnvironment = $ghEnvironments | Where-Object { $_.name -eq $environmentName }
         $deploymentSettings.BranchesFromPolicy = @(Get-BranchesFromPolicy -ghEnvironment $ghEnvironment)
 
         # Include Environment if:

diff --git a/Actions/DetermineDeploymentEnvironments/action.yaml b/Actions/DetermineDeploymentEnvironments/action.yaml
@@ -11,6 +11,9 @@ inputs:
   type:
     description: Type of deployment (CD, Publish or All)
     required: true
+  ghTokenWorkflow:
+    description: ghTokenWorkflow secret used to read deployment environment variables
+    required: false
 outputs:
   EnvironmentsMatrixJson:
     description: The Environment matrix to use for the Deploy step in compressed JSON format
@@ -39,9 +42,10 @@ runs:
       env:
         _getEnvironments: ${{ inputs.getEnvironments }}
         _type: ${{ inputs.type }}
+        _ghTokenWorkflow: ${{ inputs.ghTokenWorkflow }}
       run: |
         ${{ github.action_path }}/../Invoke-AlGoAction.ps1 -ActionName "DetermineDeploymentEnvironments" -Action {
-          ${{ github.action_path }}/DetermineDeploymentEnvironments.ps1 -getEnvironments $ENV:_getEnvironments -type $ENV:_type
+          ${{ github.action_path }}/DetermineDeploymentEnvironments.ps1 -getEnvironments $ENV:_getEnvironments -type $ENV:_type -ghTokenWorkflow $ENV:_ghTokenWorkflow
         }
 branding:
   icon: terminal

diff --git a/Actions/Github-Helper.psm1 b/Actions/Github-Helper.psm1
@@ -1347,4 +1347,4 @@ function Invoke-CommandWithRetry {
             }
         }
     }
-}
+}
diff --git a/Actions/ReadSettings/ReadSettings.ps1 b/Actions/ReadSettings/ReadSettings.ps1
@@ -4,12 +4,16 @@
     [Parameter(HelpMessage = "Build mode", Mandatory = $false)]
     [string] $buildMode = "Default",
     [Parameter(HelpMessage = "Specifies which properties to get from the settings file, default is all", Mandatory = $false)]
-    [string] $get = ""
+    [string] $get = "",
+    [Parameter(HelpMessage = "Current environment name", Mandatory = $false)]
+    [string] $environmentName = "",
+    [Parameter(HelpMessage = "Environment deploy to variable", Mandatory = $false)]
+    [string] $environmentDeployToVariableValue = ""
 )
 
 . (Join-Path -Path $PSScriptRoot -ChildPath "..\AL-Go-Helper.ps1" -Resolve)
 
-$settings = ReadSettings -project $project -buildMode $buildMode
+$settings = ReadSettings -project $project -buildMode $buildMode -environmentName $environmentName -environmentDeployToVariableValue $environmentDeployToVariableValue
 if ($get) {
     $getSettings = $get.Split(',').Trim()
 }

diff --git a/Actions/ReadSettings/action.yaml b/Actions/ReadSettings/action.yaml
@@ -17,6 +17,14 @@ inputs:
     description: Specifies which properties to get from the settings file, default is all
     required: false
     default: ''
+  environmentName:
+    description: Environment name to use for the settings file
+    required: false
+    default: ''
+  environmentDeployToVariableValue:
+    description: Deploy to settings variable defined in the github environment
+    required: false
+    default: ''
 outputs:
   GitHubRunnerJson:
     description: GitHubRunner in compressed Json format
@@ -34,9 +42,11 @@ runs:
         _project: ${{ inputs.project }}
         _buildMode: ${{ inputs.buildMode }}
         _get: ${{ inputs.get }}
+        _environmentName: ${{ inputs.environmentName }}
+        _environmentDeployToVariableValue: ${{ inputs.environmentDeployToVariableValue }}
       run: |
         ${{ github.action_path }}/../Invoke-AlGoAction.ps1 -ActionName "ReadSettings" -Action {
-          ${{ github.action_path }}/ReadSettings.ps1 -project $ENV:_project -buildMode $ENV:_buildMode -get $ENV:_get
+          ${{ github.action_path }}/ReadSettings.ps1 -project $ENV:_project -buildMode $ENV:_buildMode -get $ENV:_get -environmentName $ENV:_environmentName -environmentDeployToVariableValue $ENV:_environmentDeployToVariableValue
         }
 branding:
   icon: terminal

@@ -269,6 +269,8 @@ jobs:
         with:
           shell: ${{ matrix.shell }}
           get: type,powerPlatformSolutionFolder
+          environmentName: ${{ matrix.environment }}
+          environmentDeployToVariableValue: ${{ vars.DeployTo }}
 
       - name: EnvName
         id: envName

@@ -145,6 +145,8 @@ jobs:
         with:
           shell: ${{ matrix.shell }}
           get: type,powerPlatformSolutionFolder
+          environmentName: ${{ matrix.environment }}
+          environmentDeployToVariableValue: ${{ vars.DeployTo }}
 
       - name: Read secrets
         id: ReadSecrets

@@ -140,6 +140,7 @@ jobs:
           shell: powershell
           getEnvironments: '*'
           type: 'CD'
+          ghTokenWorkflow: '${{ secrets.ghTokenWorkflow }}'
 
   CheckForUpdates:
     needs: [ Initialization ]
@@ -283,6 +284,8 @@ jobs:
         with:
           shell: ${{ matrix.shell }}
           get: type,powerPlatformSolutionFolder
+          environmentName: ${{ matrix.environment }}
+          environmentDeployToVariableValue: ${{ vars.DeployTo }}
 
       - name: EnvName
         id: envName

@@ -145,6 +145,8 @@ jobs:
         with:
           shell: ${{ matrix.shell }}
           get: type,powerPlatformSolutionFolder
+          environmentName: ${{ matrix.environment }}
+          environmentDeployToVariableValue: ${{ vars.DeployTo }}
 
       - name: Read secrets
         id: ReadSecrets
-Original file line number
+Diff line change
@@ Expand Up / @@ -1347,4 +1347,4 @@ function Invoke-CommandWithRetry { @@
                 }
             }
         }
-    }
+    }