Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Additional Import for Sanitizer" #18886

Merged
merged 5 commits into from
Aug 29, 2023
Merged

Revert "Additional Import for Sanitizer" #18886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70bfc10
Revert "Additional Import for Sanitizer (#18809)"
LeftTwixWand Aug 28, 2023
7e50b3b
Merge branch 'master' into revert-18809-users/ozanaydin/fix-imports
LeftTwixWand Aug 28, 2023
5e8cfb0
Merge branch 'master' into revert-18809-users/ozanaydin/fix-imports
LeftTwixWand Aug 29, 2023
dc23550
Bump tasks versions
LeftTwixWand Aug 29, 2023
de2397b
Bump versions for Node16
LeftTwixWand Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV1/AzureFileCopyJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ param (
[string]$additionalArguments
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

Write-Verbose "fqdn = $fqdn"
Write-Verbose "storageAccount = $storageAccount"
Write-Verbose "containerName = $containerName"
Expand Down
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV1/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ $ErrorActionPreference = 'Stop'
$azureStackEnvironment = "AzureStack"
$jobId = $env:SYSTEM_JOBID;

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Get-DeploymentModulePath
{
Write-Output "$PSScriptRoot\DeploymentUtilities"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"demands": [
"azureps"
Expand Down
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV2/AzureFileCopyRemoteJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ $AzureFileCopyRemoteJob = {
[switch]$EnableDetailedLogging
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Write-DetailLogs
{
[CmdletBinding()]
Expand Down
1 change: 0 additions & 1 deletion Tasks/AzureFileCopyV2/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ $ErrorActionPreference = 'Stop'
$azureStackEnvironment = "AzureStack"
$jobId = $env:SYSTEM_JOBID;

Import-Module $PSScriptRoot\ps_modules\Sanitizer
function Get-AzureCmdletsVersion
{
$module = Get-Module AzureRM -ListAvailable
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 227,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 227,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV3/AzureFileCopyRemoteJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ $AzureFileCopyRemoteJob = {
[switch]$EnableDetailedLogging
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Write-DetailLogs
{
[CmdletBinding()]
Expand Down
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV3/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ $ErrorActionPreference = 'Stop'
$azureStackEnvironment = "AzureStack"
$jobId = $env:SYSTEM_JOBID;

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Get-AzureCmdletsVersion
{
return (Get-Module AzureRM -ListAvailable).Version
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV3/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 3,
"Minor": 227,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV3/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 3,
"Minor": 227,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV4/AzureFileCopyRemoteJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ $AzureFileCopyRemoteJob = {
[switch]$EnableDetailedLogging
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Write-DetailLogs
{
[CmdletBinding()]
Expand Down
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV4/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ $ErrorActionPreference = 'Stop'
$azureStackEnvironment = "AzureStack"
$jobId = $env:SYSTEM_JOBID;

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Get-AzureCmdletsVersion
{
return (Get-Module AzureRM -ListAvailable).Version
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV4/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV4/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"demands": [
"azureps"
Expand Down
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV5/AzureFileCopyRemoteJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ $AzureFileCopyRemoteJob = {
[switch]$EnableDetailedLogging
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Write-DetailLogs
{
[CmdletBinding()]
Expand Down
2 changes: 0 additions & 2 deletions Tasks/AzureFileCopyV5/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ $ErrorActionPreference = 'Stop'
$azureStackEnvironment = "AzureStack"
$jobId = $env:SYSTEM_JOBID;

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Get-AzureCmdletsVersion
{
return (Get-Module AzureRM -ListAvailable).Version
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV5/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV5/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"demands": [
"azureps"
Expand Down
2 changes: 0 additions & 2 deletions Tasks/WindowsMachineFileCopyV1/RoboCopyJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ param (
[string]$additionalArguments
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

$sourcePath = $sourcePath.Trim().TrimEnd('\', '/')
$targetPath = $targetPath.Trim().TrimEnd('\', '/')

Expand Down
2 changes: 1 addition & 1 deletion Tasks/WindowsMachineFileCopyV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"minimumAgentVersion": "1.104.0",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/WindowsMachineFileCopyV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 1,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"minimumAgentVersion": "1.104.0",
"groups": [
Expand Down
1 change: 0 additions & 1 deletion Tasks/WindowsMachineFileCopyV2/RoboCopyJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ param (
)
Import-Module "$scriptRoot\ps_modules\VstsTaskSdk"
Import-VstsLocStrings -LiteralPath $scriptRoot/Task.json
Import-Module "$scriptRoot\ps_modules\Sanitizer"

. "$scriptRoot/Utility.ps1"

Expand Down
2 changes: 1 addition & 1 deletion Tasks/WindowsMachineFileCopyV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"releaseNotes": "What's new in Version 2.0: <br/>&nbsp;&nbsp;Proxy support is being added. <br/>&nbsp;&nbsp; Removed support of legacy DTL machines.",
"minimumAgentVersion": "1.104.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/WindowsMachineFileCopyV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 227,
"Patch": 0
"Patch": 1
},
"releaseNotes": "ms-resource:loc.releaseNotes",
"minimumAgentVersion": "1.104.0",
Expand Down
4 changes: 2 additions & 2 deletions _generated/AzureFileCopyV2.versionmap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|2.227.3
Node16-225|2.227.2
Default|2.227.5
Node16-225|2.227.4
2 changes: 0 additions & 2 deletions _generated/AzureFileCopyV2/AzureFileCopyRemoteJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ $AzureFileCopyRemoteJob = {
[switch]$EnableDetailedLogging
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Write-DetailLogs
{
[CmdletBinding()]
Expand Down
1 change: 0 additions & 1 deletion _generated/AzureFileCopyV2/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ $ErrorActionPreference = 'Stop'
$azureStackEnvironment = "AzureStack"
$jobId = $env:SYSTEM_JOBID;

Import-Module $PSScriptRoot\ps_modules\Sanitizer
function Get-AzureCmdletsVersion
{
$module = Get-Module AzureRM -ListAvailable
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 227,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -370,7 +370,7 @@
"ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
},
"_buildConfigMapping": {
"Default": "2.227.3",
"Node16-225": "2.227.2"
"Default": "2.227.5",
"Node16-225": "2.227.4"
}
}
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 227,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -370,7 +370,7 @@
"ExpiredServicePrincipal": "ms-resource:loc.messages.ExpiredServicePrincipal"
},
"_buildConfigMapping": {
"Default": "2.227.3",
"Node16-225": "2.227.2"
"Default": "2.227.5",
"Node16-225": "2.227.4"
}
}
2 changes: 0 additions & 2 deletions _generated/AzureFileCopyV2_Node16/AzureFileCopyRemoteJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ $AzureFileCopyRemoteJob = {
[switch]$EnableDetailedLogging
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Write-DetailLogs
{
[CmdletBinding()]
Expand Down
1 change: 0 additions & 1 deletion _generated/AzureFileCopyV2_Node16/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ $ErrorActionPreference = 'Stop'
$azureStackEnvironment = "AzureStack"
$jobId = $env:SYSTEM_JOBID;

Import-Module $PSScriptRoot\ps_modules\Sanitizer
function Get-AzureCmdletsVersion
{
$module = Get-Module AzureRM -ListAvailable
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV2_Node16/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 227,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down Expand Up @@ -374,7 +374,7 @@
"ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
},
"_buildConfigMapping": {
"Default": "2.227.3",
"Node16-225": "2.227.2"
"Default": "2.227.5",
"Node16-225": "2.227.4"
}
}
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV2_Node16/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 227,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down Expand Up @@ -374,7 +374,7 @@
"ExpiredServicePrincipal": "ms-resource:loc.messages.ExpiredServicePrincipal"
},
"_buildConfigMapping": {
"Default": "2.227.3",
"Node16-225": "2.227.2"
"Default": "2.227.5",
"Node16-225": "2.227.4"
}
}
4 changes: 2 additions & 2 deletions _generated/AzureFileCopyV3.versionmap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|3.227.3
Node16-225|3.227.2
Default|3.227.5
Node16-225|3.227.4
2 changes: 0 additions & 2 deletions _generated/AzureFileCopyV3/AzureFileCopyRemoteJob.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ $AzureFileCopyRemoteJob = {
[switch]$EnableDetailedLogging
)

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Write-DetailLogs
{
[CmdletBinding()]
Expand Down
2 changes: 0 additions & 2 deletions _generated/AzureFileCopyV3/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ $ErrorActionPreference = 'Stop'
$azureStackEnvironment = "AzureStack"
$jobId = $env:SYSTEM_JOBID;

Import-Module $PSScriptRoot\ps_modules\Sanitizer

function Get-AzureCmdletsVersion
{
return (Get-Module AzureRM -ListAvailable).Version
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV3/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 3,
"Minor": 227,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -309,7 +309,7 @@
"ExpiredServicePrincipal": "Could not fetch access token for Azure. Verify if the Service Principal used is valid and not expired."
},
"_buildConfigMapping": {
"Default": "3.227.3",
"Node16-225": "3.227.2"
"Default": "3.227.5",
"Node16-225": "3.227.4"
}
}
Loading