Skip to content

Commit 6e67b5b

Browse files
starkmsustarkmsu
authored
Fixed vstsToken init for SqlAzureDacpacDeploymentV1 task (#19864)
Reworked vstsToken usage at shared PS library
1 parent acf50bd commit 6e67b5b

File tree

104 files changed

+1362
-1674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1362
-1674
lines changed

‎Tasks/AzureFileCopyV1/AzureFileCopy.ps1

+6-9
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,14 @@ try {
109109
# Getting connection type (Certificate/UserNamePassword/SPN) used for the task
110110
$connectionType = Get-TypeOfConnection -connectedServiceName $connectedServiceName
111111

112-
$vstsEndpoint = Get-VstsEndpoint -Name SystemVssConnection -Require
113-
$vstsAccessToken = $vstsEndpoint.auth.parameters.AccessToken
114-
115112
# Getting storage key for the storage account based on the connection type
116-
$storageKey = Get-StorageKey -storageAccountName $storageAccount -connectionType $connectionType -connectedServiceName $connectedServiceName -vstsAccessToken $vstsAccessToken
113+
$storageKey = Get-StorageKey -storageAccountName $storageAccount -connectionType $connectionType -connectedServiceName $connectedServiceName
117114

118115
# creating storage context to be used while creating container, sas token, deleting container
119116
$storageContext = Create-AzureStorageContext -StorageAccountName $storageAccount -StorageAccountKey $storageKey
120117

121118
# Geting Azure Storage Account type
122-
$storageAccountType = Get-StorageAccountType $storageAccount $connectionType $connectedServiceName $vstsAccessToken
119+
$storageAccountType = Get-StorageAccountType $storageAccount $connectionType $connectedServiceName
123120
Write-Verbose "Obtained Storage Account type: $storageAccountType"
124121
if(-not [string]::IsNullOrEmpty($storageAccountType) -and $storageAccountType.Contains('Premium'))
125122
{
@@ -132,7 +129,7 @@ try {
132129
$containerName = [guid]::NewGuid().ToString()
133130
Create-AzureContainer -containerName $containerName -storageContext $storageContext -isPremiumStorage $isPremiumStorage
134131
}
135-
132+
136133
# Geting Azure Blob Storage Endpoint
137134

138135
$blobStorageEndpoint = Get-blobStorageEndpoint -storageAccountName $storageAccount -connectionType $connectionType -connectedServiceName $connectedServiceName
@@ -186,7 +183,7 @@ try {
186183

187184
Remove-EndpointSecrets
188185
Write-Verbose "Completed Azure File Copy Task for Azure Blob Destination"
189-
186+
190187
return
191188
}
192189

@@ -201,15 +198,15 @@ try {
201198
# getting azure vms properties(name, fqdn, winrmhttps port)
202199
$azureVMResourcesProperties = Get-AzureVMResourcesProperties -resourceGroupName $environmentName -connectionType $connectionType `
203200
-resourceFilteringMethod $resourceFilteringMethod -machineNames $machineNames -enableCopyPrerequisites $enableCopyPrerequisites `
204-
-connectedServiceName $connectedServiceName -vstsAccessToken $vstsAccessToken
201+
-connectedServiceName $connectedServiceName
205202

206203
$skipCACheckOption = Get-SkipCACheckOption -skipCACheck $skipCACheck
207204
$azureVMsCredentials = Get-AzureVMsCredentials -vmsAdminUserName $vmsAdminUserName -vmsAdminPassword $vmsAdminPassword
208205

209206
# generate container sas token with full permissions
210207
$containerSasToken = Generate-AzureStorageContainerSASToken -containerName $containerName -storageContext $storageContext -tokenTimeOutInHours $defaultSasTokenTimeOutInHours
211208

212-
#copies files on azureVMs
209+
#copies files on azureVMs
213210
Copy-FilesToAzureVMsFromStorageContainer `
214211
-storageAccountName $storageAccount -containerName $containerName -containerSasToken $containerSasToken -blobStorageEndpoint $blobStorageEndpoint -targetPath $targetPath -azCopyLocation $azCopyLocation `
215212
-resourceGroupName $environmentName -azureVMResourcesProperties $azureVMResourcesProperties -azureVMsCredentials $azureVMsCredentials `

‎Tasks/AzureFileCopyV1/AzureUtilityGTE1.0.ps1

+33-38
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function Get-AzureStorageAccountResourceGroupName
2828
if (-not [string]::IsNullOrEmpty($storageAccountName))
2929
{
3030
Write-Verbose "[Azure Call]Getting resource details for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"
31-
if (CmdletHasMember -cmdlet "Get-AzureRMResource" -memberName "Name")
31+
if (CmdletHasMember -cmdlet "Get-AzureRMResource" -memberName "Name")
3232
{
3333
if ($featureFlags.retireAzureRM)
3434
{
@@ -38,7 +38,7 @@ function Get-AzureStorageAccountResourceGroupName
3838
{
3939
$azureStorageAccountResourceDetails = (Get-AzureRMResource -ErrorAction Stop) | Where-Object { ($_.ResourceType -eq $ARMStorageAccountResourceType) -and ($_.Name -eq $storageAccountName)}
4040
}
41-
41+
4242
}
4343
else
4444
{
@@ -50,8 +50,8 @@ function Get-AzureStorageAccountResourceGroupName
5050
{
5151
$azureStorageAccountResourceDetails = (Get-AzureRMResource -ErrorAction Stop) | Where-Object { ($_.ResourceType -eq $ARMStorageAccountResourceType) -and ($_.ResourceName -eq $storageAccountName)}
5252
}
53-
}
54-
53+
}
54+
5555
Write-Verbose "[Azure Call]Retrieved resource details successfully for azure storage account resource: $storageAccountName with resource type: $ARMStorageAccountResourceType"
5656

5757
$azureResourceGroupName = $azureStorageAccountResourceDetails.ResourceGroupName
@@ -134,8 +134,7 @@ function Get-AzureBlobStorageEndpointFromARM
134134
{
135135
param([string]$storageAccountName,
136136
[object]$endpoint,
137-
[string]$connectedServiceNameARM,
138-
[string]$vstsAccessToken)
137+
[string]$connectedServiceNameARM)
139138

140139
if(-not [string]::IsNullOrEmpty($storageAccountName))
141140
{
@@ -155,7 +154,7 @@ function Get-AzureBlobStorageEndpointFromARM
155154
Write-Verbose "[Azure Call]Retrieved storage account endpoint successfully for the storage account: $storageAccount in resource group: $azureResourceGroupName"
156155

157156
return $storageAccountEnpoint
158-
}
157+
}
159158
}
160159

161160
function Get-AzureStorageAccountTypeFromRDFE
@@ -178,8 +177,7 @@ function Get-AzureStorageAccountTypeFromARM
178177
{
179178
param([string]$storageAccountName,
180179
[object]$endpoint,
181-
[string]$connectedServiceNameARM,
182-
[string]$vstsAccessToken)
180+
[string]$connectedServiceNameARM)
183181

184182
if(-not [string]::IsNullOrEmpty($storageAccountName))
185183
{
@@ -199,7 +197,7 @@ function Get-AzureStorageAccountTypeFromARM
199197
Write-Verbose "[Azure Call]Retrieved storage account type successfully for the storage account: $storageAccount in resource group: $azureResourceGroupName"
200198

201199
return $storageAccountType
202-
}
200+
}
203201
}
204202

205203
function Create-AzureContainer
@@ -213,7 +211,7 @@ function Create-AzureContainer
213211
$storageAccountName = $storageContext.StorageAccountName
214212

215213
Write-Verbose "[Azure Call]Creating container: $containerName in storage account: $storageAccountName"
216-
if ($isPremiumStorage)
214+
if ($isPremiumStorage)
217215
{
218216
if ($featureFlags.retireAzureRM)
219217
{
@@ -369,26 +367,25 @@ function Get-AzureRMResourceGroupResourcesDetailsForAzureStack
369367
param([string]$resourceGroupName,
370368
[object]$azureRMVMResources,
371369
[object]$endpoint,
372-
[string]$connectedServiceNameARM,
373-
[string]$vstsAccessToken)
370+
[string]$connectedServiceNameARM)
374371

375372
[hashtable]$azureRGResourcesDetails = @{}
376373
[hashtable]$loadBalancerDetails = @{}
377374

378375
if(-not [string]::IsNullOrEmpty($resourceGroupName) -and $azureRMVMResources)
379376
{
380377
Write-Verbose "[Azure Call]Getting network interfaces in resource group $resourceGroupName"
381-
$networkInterfaceResources = Get-AzureNetworkInterfaceDetails $resourceGroupName $endpoint $connectedServiceNameARM $vstsAccessToken
378+
$networkInterfaceResources = Get-AzureNetworkInterfaceDetails $resourceGroupName $endpoint $connectedServiceNameARM
382379
Write-Verbose "[Azure Call]Got network interfaces in resource group $resourceGroupName"
383380
$azureRGResourcesDetails.Add("networkInterfaceResources", $networkInterfaceResources)
384381

385382
Write-Verbose "[Azure Call]Getting public IP Addresses in resource group $resourceGroupName"
386-
$publicIPAddressResources = Get-AzurePublicIpAddressDetails $resourceGroupName $endpoint $connectedServiceNameARM $vstsAccessToken
383+
$publicIPAddressResources = Get-AzurePublicIpAddressDetails $resourceGroupName $endpoint $connectedServiceNameARM
387384
Write-Verbose "[Azure Call]Got public IP Addresses in resource group $resourceGroupName"
388385
$azureRGResourcesDetails.Add("publicIPAddressResources", $publicIPAddressResources)
389386

390387
Write-Verbose "[Azure Call]Getting load balancers in resource group $resourceGroupName"
391-
$lbGroup = Get-AzureLoadBalancersDetails $resourceGroupName $endpoint $connectedServiceNameARM $vstsAccessToken
388+
$lbGroup = Get-AzureLoadBalancersDetails $resourceGroupName $endpoint $connectedServiceNameARM
392389
Write-Verbose "[Azure Call]Got load balancers in resource group $resourceGroupName"
393390

394391
if($lbGroup)
@@ -397,7 +394,7 @@ function Get-AzureRMResourceGroupResourcesDetailsForAzureStack
397394
{
398395
$lbDetails = @{}
399396
Write-Verbose "[Azure Call]Getting load balancer in resource group $resourceGroupName"
400-
$loadBalancer = Get-AzureLoadBalancerDetails $resourceGroupName $lb.Name $endpoint $connectedServiceNameARM $vstsAccessToken
397+
$loadBalancer = Get-AzureLoadBalancerDetails $resourceGroupName $lb.Name $endpoint $connectedServiceNameARM
401398
Write-Verbose "[Azure Call]Got load balancer in resource group $resourceGroupName"
402399

403400
Write-Verbose "[Azure Call]Getting LoadBalancer Frontend Ip Config"
@@ -451,7 +448,7 @@ function Get-AzureRMResourceGroupResourcesDetails
451448
{
452449
$publicIPAddressResources = Get-AzureRMPublicIpAddress -ResourceGroupName $resourceGroupName -ErrorAction Stop -Verbose
453450
}
454-
451+
455452
Write-Verbose "[Azure Call]Got public IP Addresses in resource group $resourceGroupName"
456453
$azureRGResourcesDetails.Add("publicIPAddressResources", $publicIPAddressResources)
457454

@@ -569,8 +566,7 @@ function Get-AzureMachineCustomScriptExtension
569566
[string]$vmName,
570567
[string]$name,
571568
[object]$endpoint,
572-
[string]$connectedServiceNameARM,
573-
[string]$vstsAccessToken)
569+
[string]$connectedServiceNameARM)
574570

575571
if(-not [string]::IsNullOrEmpty($resourceGroupName) -and -not [string]::IsNullOrEmpty($vmName))
576572
{
@@ -622,8 +618,7 @@ function Remove-AzureMachineCustomScriptExtension
622618
[string]$vmName,
623619
[string]$name,
624620
[object]$endpoint,
625-
[string]$connectedServiceNameARM,
626-
[string]$vstsAccessToken)
621+
[string]$connectedServiceNameARM)
627622

628623
if(-not [string]::IsNullOrEmpty($resourceGroupName) -and -not [string]::IsNullOrEmpty($vmName) -and -not [string]::IsNullOrEmpty($name))
629624
{
@@ -661,7 +656,7 @@ function Get-NetworkSecurityGroups
661656
$networkInterfaces = Get-AzureRmNetworkInterface -ResourceGroupName $resourceGroupName | Where-Object { $_.VirtualMachine.Id -eq $vmId }
662657
}
663658
Write-Verbose "[Azure Call]Got network interfaces in resource group $resourceGroupName"
664-
659+
665660
if($networkInterfaces)
666661
{
667662
$noOfNics = $networkInterfaces.Count
@@ -674,21 +669,21 @@ function Get-NetworkSecurityGroups
674669
{
675670
$nsId = $networkSecurityGroupEntry.Id
676671
Write-Verbose "Network Security Group Id: $nsId"
677-
672+
678673
$securityGroupName = $nsId.Split('/')[-1]
679-
$sgResourceGroup = $nsId.Split('/')[4]
674+
$sgResourceGroup = $nsId.Split('/')[4]
680675
Write-Verbose "Security Group name is $securityGroupName and the related resource group $sgResourceGroup"
681676

682677
# Get the network security group object
683678
Write-Verbose "[Azure Call]Getting network security group $securityGroupName in resource group $sgResourceGroup"
684679
if ($featureFlags.retireAzureRM)
685680
{
686-
$securityGroup = Get-AzNetworkSecurityGroup -ResourceGroupName $sgResourceGroup -Name $securityGroupName
681+
$securityGroup = Get-AzNetworkSecurityGroup -ResourceGroupName $sgResourceGroup -Name $securityGroupName
687682
}
688683
else
689684
{
690-
$securityGroup = Get-AzureRmNetworkSecurityGroup -ResourceGroupName $sgResourceGroup -Name $securityGroupName
691-
}
685+
$securityGroup = Get-AzureRmNetworkSecurityGroup -ResourceGroupName $sgResourceGroup -Name $securityGroupName
686+
}
692687
Write-Verbose "[Azure Call]Got network security group $securityGroupName in resource group $sgResourceGroup"
693688

694689
$securityGroups.Add($securityGroup)
@@ -704,7 +699,7 @@ function Get-NetworkSecurityGroups
704699
{
705700
throw (Get-VstsLocString -Key "AFC_NullOrEmptyResourceGroup")
706701
}
707-
702+
708703
return $securityGroups
709704
}
710705

@@ -737,13 +732,13 @@ function Add-NetworkSecurityRuleConfig
737732
Write-Verbose "[Azure Call]Got network security rule config $ruleName under security group $securityGroupName"
738733
}
739734
catch
740-
{
735+
{
741736
#Ignore the exception
742737
}
743738

744739
# Add the network security rule if it doesn't exists
745-
if(-not $winRMConfigRule)
746-
{
740+
if(-not $winRMConfigRule)
741+
{
747742
$maxRetries = 3
748743
for($retryCnt=1; $retryCnt -le $maxRetries; $retryCnt++)
749744
{
@@ -758,7 +753,7 @@ function Add-NetworkSecurityRuleConfig
758753
{
759754
$securityGroup = Add-AzureRmNetworkSecurityRuleConfig -NetworkSecurityGroup $securityGroup -Name $ruleName -Direction Inbound -Access Allow -SourceAddressPrefix '*' -SourcePortRange '*' -DestinationAddressPrefix '*' -DestinationPortRange $winrmHttpsPort -Protocol * -Priority $rulePriotity
760755
}
761-
Write-Verbose "[Azure Call]Added inbound network security rule config $ruleName with priority $rulePriotity for port $winrmHttpsPort under security group $securityGroupName"
756+
Write-Verbose "[Azure Call]Added inbound network security rule config $ruleName with priority $rulePriotity for port $winrmHttpsPort under security group $securityGroupName"
762757

763758
Write-Verbose "[Azure Call]Setting the azure network security group"
764759
if ($featureFlags.retireAzureRM)
@@ -774,7 +769,7 @@ function Add-NetworkSecurityRuleConfig
774769
catch
775770
{
776771
Write-Verbose "Failed to add inbound network security rule config $ruleName with priority $rulePriotity for port $winrmHttpsPort under security group $securityGroupName : $_.Exception.Message"
777-
772+
778773
$newPort = [convert]::ToInt32($rulePriotity, 10) + 50;
779774
$rulePriotity = $newPort.ToString()
780775

@@ -788,18 +783,18 @@ function Add-NetworkSecurityRuleConfig
788783
$securityGroup = Get-AzureRmNetworkSecurityGroup -ResourceGroupName $resourceGroupName -Name $securityGroupName
789784
}
790785
Write-Verbose "[Azure Call]Got network security group $securityGroupName in resource group $resourceGroupName"
791-
786+
792787

793788
if($retryCnt -eq $maxRetries)
794789
{
795790
throw $_
796791
}
797792

798793
continue
799-
}
800-
794+
}
795+
801796
Write-Verbose "Successfully added the network security group rule $ruleName with priority $rulePriotity for port $winrmHttpsPort"
802-
break
797+
break
803798
}
804799
}
805800
}

0 commit comments

Comments
 (0)