Merge pull request #179 from ONSdigital/main

Promote from main to preprod
ONSdigital · Oct 7, 2024 · fc9aeb1 · fc9aeb1
2 parents 2d10411 + b9350d1
commit fc9aeb1
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/scripts/blaise/register_node.ps1 b/scripts/blaise/register_node.ps1
@@ -61,6 +61,7 @@ function Check-NodeRegistered {
     param(
         [string] $ServerPark
     )
+
     $IsNodeRegistered = c:\blaise5\bin\servermanager.exe -listserverparkservers `
         -server:$BlaiseManagementNode `
         -user:$BlaiseAdminUser `

diff --git a/scripts/update_script_environment_variables.ps1 b/scripts/update_script_environment_variables.ps1
@@ -12,7 +12,16 @@ function CreateVariables($variableList) {
         $pattern = "^(.*?)$([regex]::Escape($varName))(.?=)(.*)"
         $varValue = ($varDefinition -replace $pattern, '$3')
 
-        if ($variable.Name -Like "BLAISE_*") {
+        if ($variable.Name -Like "BLAISE_*" -and $varValue -Like "projects/*/secrets/*") {
+
+            $parts = $varValue -split "/"
+            $secret = $parts[3]
+
+            $secretValue = & gcloud secrets versions access latest --secret=$secret
+
+            New-Variable -Scope script -Name ($varName) -Value $secretValue -Force
+        }
+        elseif ($variable.Name -Like "BLAISE_*") {
             New-Variable -Scope script -Name ($varName) -Value $varValue -Force
             LogInfo("Script env var - $varName = $varValue")
         }

diff --git a/scripts/update_system_environment_variables.ps1 b/scripts/update_system_environment_variables.ps1
@@ -5,14 +5,60 @@ function GetMetadataVariables {
     return $variablesFromMetadata | Get-Member -MemberType NoteProperty
 }
 
+function UpdateEnvironmentalVariable {
+
+    param (
+        [string]$varName,
+        [string]$secretValue,
+        [string]$secret
+    )
+
+    $envValue = [System.Environment]::GetEnvironmentVariable($varName, [System.EnvironmentVariableTarget]::Machine)
+
+    if ($envValue -eq $secretValue) {
+        Write-Host  "Values are the same, no need to update secrets."
+    }
+    elseif ($envValue -eq "" -or $null -eq $envValue) {
+        Write-Host "Environmental Variable not set, setting to secret value."
+        [System.Environment]::SetEnvironmentVariable($varName, ($secretValue), [System.EnvironmentVariableTarget]::Machine)
+    }
+    elseif ($envValue -ne "" -and $null -ne $envValue -and $secretValue -ne "" -and $null -ne $secretValue) {
+        # If Environmental values are updated, secret values should be updated
+        Write-Host "Environmental Variable is set to a different value than secret, updating secret value"
+
+        $tempFile = New-TemporaryFile   
+
+        # Create a UTF8 encoding without BOM
+        $utf8NoBomEncoding = New-Object System.Text.UTF8Encoding($false)
+
+        # Write the content to the file using the specified encoding
+        [System.IO.File]::WriteAllText($tempFile, $envValue, $utf8NoBomEncoding)
+
+        # Add the secret using gcloud
+        & gcloud secrets versions add $secret --data-file=$tempFile
+
+        # Clean up the temporary file
+        Remove-Item $tempFile
+    }
+}
+
 function CreateVariables($variableList) {
     foreach ($variable in $variableList) {
         $varName = $variable.Name
         $varDefinition = $variable.Definition
         $pattern = "^(.*?)$([regex]::Escape($varName))(.?=)(.*)"
         $varValue = ($varDefinition -replace $pattern, '$3')
 
-        if ($variable.Name -Like "ENV_*") {
+        if ($variable.Name -Like "ENV_*" -and $varValue -Like "projects/*/secrets/*") {
+
+            $parts = $varValue -split "/"
+            $secret = $parts[3]
+
+            $secretValue = & gcloud secrets versions access latest --secret=$secret
+
+            UpdateEnvironmentalVariable $variable.Name $secretValue $secret
+        }
+        elseif ($variable.Name -Like "ENV_*") {
             [System.Environment]::SetEnvironmentVariable($varName, ($varValue), [System.EnvironmentVariableTarget]::Machine)
             LogInfo("System env var - $varName = $varValue")
         }