Merge pull request #2896 from janegilring/revert_azcopy_workaround

Revert "Temporarily moved azcopy installation"
microsoft · Jan 21, 2025 · d8cdd3d · d8cdd3d
2 parents c60c83a + 8d88a68
commit d8cdd3d
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 174 deletions.
diff --git a/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-contoso-hypermarket.psd1 b/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-contoso-hypermarket.psd1
@@ -81,7 +81,7 @@
         'Microsoft.Bicep',
         'Kubernetes.kubectl',
         'Microsoft.Edge',
-        #'Microsoft.Azure.AZCopy.10',
+        'Microsoft.Azure.AZCopy.10',
         'Microsoft.VisualStudioCode',
         'Microsoft.AzureDataStudio',
         'Microsoft.VisualStudioCode',

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-contoso-motors.psd1 b/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-contoso-motors.psd1
@@ -77,7 +77,7 @@
         'Microsoft.Bicep',
         'Kubernetes.kubectl',
         'Microsoft.Edge',
-        #'Microsoft.Azure.AZCopy.10',
+        'Microsoft.Azure.AZCopy.10',
         'Microsoft.AzureDataStudio',
         'Microsoft.VisualStudioCode',
         'Microsoft.SQLServerManagementStudio',

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-contoso-supermarket.psd1 b/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-contoso-supermarket.psd1
@@ -64,7 +64,7 @@
         'Microsoft.Bicep',
         'Kubernetes.kubectl',
         'Microsoft.Edge',
-        #'Microsoft.Azure.AZCopy.10',
+        'Microsoft.Azure.AZCopy.10',
         'Microsoft.VisualStudioCode',
         'Microsoft.AzureDataStudio',
         'Microsoft.VisualStudioCode',

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/Bootstrap.ps1 b/azure_jumpstart_ag/artifacts/PowerShell/Bootstrap.ps1
@@ -306,7 +306,6 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/tests/common.tests.p
 Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/tests/k8s.tests.ps1") -OutFile "$AgDirectory\tests\k8s.tests.ps1"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/tests/Invoke-Test.ps1") -OutFile "$AgDirectory\tests\Invoke-Test.ps1"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/tests/ag-bginfo.bgi") -OutFile "$AgDirectory\tests\ag-bginfo.bgi"
-Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/azcopy_install.ps1") -OutFile "$AgPowerShellDir\azcopy_install.ps1"
 
 if($scenario -eq "contoso_supermarket"){
   Invoke-WebRequest ($templateBaseUrl + "artifacts/settings/Bookmarks-contoso-supermarket") -OutFile "$AgToolsDir\Bookmarks"

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/Winget.ps1 b/azure_jumpstart_ag/artifacts/PowerShell/Winget.ps1
@@ -3,7 +3,6 @@ $ErrorActionPreference = 'SilentlyContinue'
 $AgDir = 'C:\Ag'
 $AgLogsDir = "$AgDir\Logs"
 $AgConfig = Import-PowerShellDataFile -Path $Env:AgConfigPath
-$AgPowerShellDir    = $AgConfig.AgDirectories["AgPowerShellDir"]
 
 $logFilePath = Join-Path -Path $AgLogsDir -ChildPath ('WinGet-provisioning-' + (Get-Date -Format 'yyyyMMddHHmmss') + '.log')
 
@@ -21,9 +20,6 @@ $winget = Join-Path -Path $env:LOCALAPPDATA -ChildPath Microsoft\WindowsApps\win
 # Windows Terminal needs to be installed per user, while WinGet Configuration runs as SYSTEM. Hence, this package is installed in the logon script.
 & $winget install Microsoft.WindowsTerminal --version 1.18.3181.0 -s winget --silent --accept-package-agreements
 
-# Temporary workaround for AzCopy installation due to CDN issues
-& $AgPowerShellDir\azcopy_install.ps1
-
 ##############################################################
 # Install Winget packages
 ##############################################################

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/azcopy_install.ps1 b/azure_jumpstart_ag/artifacts/PowerShell/azcopy_install.ps1
diff --git a/azure_jumpstart_arcbox/artifacts/Bootstrap.ps1 b/azure_jumpstart_arcbox/artifacts/Bootstrap.ps1
@@ -220,7 +220,6 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/tests/arcbox-bginfo.bgi") -OutF
 Invoke-WebRequest ($templateBaseUrl + "artifacts/tests/common.tests.ps1") -OutFile $Env:ArcBoxTestsDir\common.tests.ps1
 Invoke-WebRequest ($templateBaseUrl + "artifacts/tests/Invoke-Test.ps1") -OutFile $Env:ArcBoxTestsDir\Invoke-Test.ps1
 Invoke-WebRequest ($templateBaseUrl + "artifacts/WinGet.ps1") -OutFile $Env:ArcBoxDir\WinGet.ps1
-Invoke-WebRequest ($templateBaseUrl + "artifacts/azcopy_install.ps1") -OutFile $Env:ArcBoxDir\azcopy_install.ps1
 
 # Workbook template
 if ($flavor -eq "ITPro") {

diff --git a/azure_jumpstart_arcbox/artifacts/WinGet.ps1 b/azure_jumpstart_arcbox/artifacts/WinGet.ps1
@@ -36,9 +36,6 @@ switch ($env:flavor) {
     'ITPro' { & $winget configure --file C:\ArcBox\DSC\itpro.dsc.yml --accept-configuration-agreements --disable-interactivity }
 }
 
-# Temporary workaround for AzCopy installation due to CDN issues
-& $Env:ArcBoxDir\azcopy_install.ps1
-
 # Start remaining logon scripts
 Get-ScheduledTask *LogonScript* | Start-ScheduledTask
 

diff --git a/azure_jumpstart_arcbox/artifacts/azcopy_install.ps1 b/azure_jumpstart_arcbox/artifacts/azcopy_install.ps1
diff --git a/azure_jumpstart_arcbox/artifacts/dsc/common.dsc.yml b/azure_jumpstart_arcbox/artifacts/dsc/common.dsc.yml
@@ -44,13 +44,13 @@ properties:
       settings:
         id: Microsoft.Edge
         source: winget
-    # - resource: Microsoft.WinGet.DSC/WinGetPackage
-    #   id: azcopy
-    #   directives:
-    #     description: Install azcopy
-    #   settings:
-    #     id: Microsoft.Azure.AZCopy.10
-    #     source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: azcopy
+      directives:
+        description: Install azcopy
+      settings:
+        id: Microsoft.Azure.AZCopy.10
+        source: winget
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: DotNetSDK8
       directives:

diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/Bootstrap.ps1 b/azure_jumpstart_hcibox/artifacts/PowerShell/Bootstrap.ps1
@@ -123,7 +123,6 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/hci.parameters.json") -OutFile
 Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/dsc/packages.dsc.yml") -OutFile "$($HCIBoxConfig.Paths["DSCDir"])\packages.dsc.yml"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/dsc/hyper-v.dsc.yml") -OutFile "$($HCIBoxConfig.Paths["DSCDir"])\hyper-v.dsc.yml"
 Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/WinGet.ps1") -OutFile "$HCIPath\WinGet.ps1"
-Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/azcopy_install.ps1") -OutFile "$HCIPath\azcopy_install.ps1"
 
 # Replace password and DNS placeholder
 Write-Host "Updating config placeholders with injected values."

diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/WinGet.ps1 b/azure_jumpstart_hcibox/artifacts/PowerShell/WinGet.ps1
@@ -26,9 +26,6 @@ $winget = Join-Path -Path $env:LOCALAPPDATA -ChildPath Microsoft\WindowsApps\win
 # Windows Terminal needs to be installed per user, while WinGet Configuration runs as SYSTEM. Hence, this package is installed in the logon script.
 & $winget install Microsoft.WindowsTerminal --version 1.18.3181.0 -s winget
 
-# Temporary workaround for AzCopy installation due to CDN issues
-& "$($Env:HCIBoxDir)\azcopy_install.ps1"
-
 # Apply WinGet Configuration files
 & $winget configure --file "$($Env:HCIBoxDir)\DSC\packages.dsc.yml" --accept-configuration-agreements --disable-interactivity
 & $winget configure --file "$($Env:HCIBoxDir)\DSC\hyper-v.dsc.yml" --accept-configuration-agreements --disable-interactivity

diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/azcopy_install.ps1 b/azure_jumpstart_hcibox/artifacts/PowerShell/azcopy_install.ps1
diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/dsc/packages.dsc.yml b/azure_jumpstart_hcibox/artifacts/PowerShell/dsc/packages.dsc.yml
@@ -44,13 +44,13 @@ properties:
       settings:
         id: Microsoft.Edge
         source: winget
-    # - resource: Microsoft.WinGet.DSC/WinGetPackage
-    #   id: azcopy
-    #   directives:
-    #     description: Install azcopy
-    #   settings:
-    #     id: Microsoft.Azure.AZCopy.10
-    #     source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: azcopy
+      directives:
+        description: Install azcopy
+      settings:
+        id: Microsoft.Azure.AZCopy.10
+        source: winget
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: DotNetSDK8
       directives: