Skip to content

Commit 93627bc

Browse files
committed
update windows start script for SSM refactorying
1 parent 55cf836 commit 93627bc

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

modules/runners/templates/start-runner.ps1

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,24 @@ Write-Host "Retrieved tags from AWS API"
2020
$environment=$tags.Tags.where( {$_.Key -eq 'ghr:environment'}).value
2121
Write-Host "Reteieved ghr:environment tag - ($environment)"
2222

23-
$parameters=$(aws ssm get-parameters-by-path --path "/$environment/runner" --region "$Region" --query "Parameters[*].{Name:Name,Value:Value}") | ConvertFrom-Json
23+
$ssm_config_path=$tags.Tags.where( {$_.Key -eq 'ghr:ssm_config_path'}).value
24+
Write-Host "Reteieved ghr:ssm_config_path tag - ($ssm_config_path)"
25+
26+
$parameters=$(aws ssm get-parameters-by-path --path "/$ssm_config_path" --region "$Region" --query "Parameters[*].{Name:Name,Value:Value}") | ConvertFrom-Json
2427
Write-Host "Retrieved parameters from AWS SSM"
2528

26-
$run_as=$parameters.where( {$_.Name -eq "/$environment/runner/run-as"}).value
27-
Write-Host "Retrieved /$environment/runner/run-as parameter - ($run_as)"
29+
$run_as=$parameters.where( {$_.Name -eq "/$ssm_config_path/run-as"}).value
30+
Write-Host "Retrieved /$ssm_config_path/run-as parameter - ($run_as)"
31+
32+
$enable_cloudwatch_agent=$parameters.where( {$_.Name -eq "/$ssm_config_pathr/enable-cloudwatch"}).value
33+
Write-Host "Retrieved /$ssm_config_path/enable-cloudwatch parameter - ($enable_cloudwatch_agent)"
34+
35+
$agent_mode=$parameters.where( {$_.Name -eq "/$ssm_config_path/agent-mode"}).value
36+
Write-Host "Retrieved /$ssm_config_path/agent-mode parameter - ($agent_mode)"
2837

29-
$enable_cloudwatch_agent=$parameters.where( {$_.Name -eq "/$environment/runner/enable-cloudwatch"}).value
30-
Write-Host "Retrieved /$environment/runner/enable-cloudwatch parameter - ($enable_cloudwatch_agent)"
38+
$token_path=$parameters.where( {$_.Name -eq "/$ssm_config_path/token_path"}).value
39+
Write-Host "Retrieved /$ssm_config_path/token_path parameter - ($token_path)"
3140

32-
$agent_mode=$parameters.where( {$_.Name -eq "/$environment/runner/agent-mode"}).value
33-
Write-Host "Retrieved /$environment/runner/agent-mode parameter - ($agent_mode)"
3441

3542
if ($enable_cloudwatch_agent -eq "true")
3643
{
@@ -44,14 +51,14 @@ Write-Host "Get GH Runner config from AWS SSM"
4451
$config = $null
4552
$i = 0
4653
do {
47-
$config = (aws ssm get-parameters --names "$environment-$InstanceId" --with-decryption --region $Region --query "Parameters[*].{Name:Name,Value:Value}" | ConvertFrom-Json)[0].value
54+
$config = (aws ssm get-parameters --names "$token_path/$InstanceId" --with-decryption --region $Region --query "Parameters[*].{Name:Name,Value:Value}" | ConvertFrom-Json)[0].value
4855
Write-Host "Waiting for GH Runner config to become available in AWS SSM ($i/30)"
4956
Start-Sleep 1
5057
$i++
5158
} while (($null -eq $config) -and ($i -lt 30))
5259

5360
Write-Host "Delete GH Runner token from AWS SSM"
54-
aws ssm delete-parameter --name "$environment-$InstanceId" --region $Region
61+
aws ssm delete-parameter --name "$token_path/$InstanceId" --region $Region
5562

5663
# Create or update user
5764
if (-not($run_as)) {

0 commit comments

Comments
 (0)