Merge pull request #24 from Azure/juschen/add-tags

Added ability set tags for Deploy script
Azure · Mar 14, 2024 · 4ab7424 · 4ab7424
2 parents 30a194d + ced6e31
commit 4ab7424
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/DeployGPO.ps1 b/DeployGPO.ps1
@@ -63,6 +63,9 @@ Param (
     [System.String]$ArcRemoteShare,
 
     [System.String]$AgentProxy,
+
+    [Hashtable]$Tags,
+
     [System.String]$PrivateLinkScopeId,
     [switch]$AssessOnly
 )
@@ -255,7 +258,7 @@ try {
         Write-Host "Install file `'AzureConnectedMachineAgent.msi`' successfully copied to $AzureArcDeployPath" -ForegroundColor Green
     }
 
-    $infoTable = @{"ServicePrincipalClientId"="$ServicePrincipalClientId";"SubscriptionId"="$SubscriptionId";"ResourceGroup"="$ResourceGroup";"Location"="$Location";"TenantId"="$TenantId";"PrivateLinkScopeId"="$PrivateLinkScopeId"}
+    $infoTable = @{"ServicePrincipalClientId"="$ServicePrincipalClientId";"SubscriptionId"="$SubscriptionId";"ResourceGroup"="$ResourceGroup";"Location"="$Location";"TenantId"="$TenantId";"PrivateLinkScopeId"="$PrivateLinkScopeId"; "Tags"=$tags}
     $infoTableJSON = $infoTable | ConvertTo-Json -Compress
 
     if (Test-Path "$AzureArcDeployPath\ArcInfo.json" -ErrorAction SilentlyContinue) {

diff --git a/EnableAzureArc.ps1 b/EnableAzureArc.ps1
@@ -84,9 +84,11 @@ $location = $arcInfo.Location
 $PrivateLinkScopeId = $arcInfo.PrivateLinkScopeId
 
 $tags = @{ # Tags to be added to the Arc servers
-    Department  = "Department"
-    deployedBY  = "GPO"
-    Responsible = "Responsible"
+    DeployedBy  = "GPO"
+}
+
+if($arcInfo.Tags){
+    $arcInfo.Tags.psobject.properties | Foreach { $tags[$_.Name] = $_.Value }
 }
 
 $workfolder = "$env:SystemDrive\temp"