Skip to content

Commit ead7fd1

Browse files
NoriZCNoriZC
committed
Resolve confilcts
2 parents c127835 + 256ab9d commit ead7fd1

File tree

13 files changed

+69
-30
lines changed

13 files changed

+69
-30
lines changed

‎.azure-pipelines/security-tools.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
outputFormat: sarif
5454
scanFolder: SecurityTmp
5555
suppressionsFile: tools/SecurityTools/CredScanSuppressions.json
56-
5756
- task: PowerShell@2
5857
displayName: Generate a response text file for BinSkim
5958
inputs:
@@ -88,3 +87,19 @@ jobs:
8887
inputs:
8988
artifactName: artifacts
9089
targetPath: artifacts
90+
- task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@3
91+
# see https://eng.ms/docs/microsoft-security/microsoft-threat-protection-mtp/cloud-and-enterprise-security-cesec/security-integration/guardian-wiki/sdl-azdo-extension/publish-security-analysis-logs
92+
displayName: 'Publish Security Analysis Logs'
93+
inputs:
94+
ArtifactName: CodeAnalysisLogs
95+
ArtifactType: Container
96+
PublishProcessedResults: false
97+
AllTools: true
98+
- task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2
99+
# see https://eng.ms/docs/microsoft-security/microsoft-threat-protection-mtp/cloud-and-enterprise-security-cesec/security-integration/guardian-wiki/sdl-azdo-extension/secure-development-tools-extension-for-azure-devops#post-analysis-build-break:~:text=To%20introduce%20a%20build%20break
100+
displayName: Analyze Results (may block build)
101+
inputs:
102+
GdnBreakAllTools: false
103+
GdnBreakGdnToolBinSkim: true
104+
GdnBreakGdnToolCredScan: true
105+
GdnBreakGdnToolPoliCheck: true

‎.azure-pipelines/util/live-test-steps.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,9 @@ jobs:
7070
definition: $(SignPipelineDefinitionId)
7171
buildVersionToDownload: 'latestFromBranch'
7272
branchName: 'refs/heads/internal/release'
73-
artifactName: 'artifacts'
73+
artifactName: $(ArtifactName)
7474
targetPath: $(Pipeline.Workspace)
75+
itemPattern: '**/artifacts/**'
7576

7677
- task: DownloadPipelineArtifact@2
7778
condition: and(succeeded(), ne(variables['skipLatest'], 'true'), eq(variables['GalleryName'], 'Sign'), ne(variables['PipelineBuildId'], ''))
@@ -82,9 +83,9 @@ jobs:
8283
definition: $(SignPipelineDefinitionId)
8384
buildVersionToDownload: 'specific'
8485
pipelineId: $(PipelineBuildId)
85-
artifactName: 'artifacts'
86+
artifactName: $(ArtifactName)
8687
targetPath: $(Pipeline.Workspace)
87-
88+
itemPattern: '**/artifacts/**'
8889
- task: PowerShell@2
8990
condition: and(succeeded(), ne(variables['skipLatest'], 'true'), ne(variables['GalleryName'], 'PSGallery'))
9091
displayName: Copy artifacts to local repository
@@ -93,7 +94,7 @@ jobs:
9394
targetType: inline
9495
script: |
9596
$azPackagesDir = New-Item -Name AzPreviewPackages -Path $(DataLocation) -ItemType Directory -Force
96-
$azPackagesFiles = Join-Path -Path $(Pipeline.Workspace) -ChildPath *.nupkg
97+
$azPackagesFiles = Get-ChildItem -Path "$(Pipeline.Workspace)" -Recurse -Filter "*.nupkg"
9798
Move-Item -Path $azPackagesFiles -Destination $azPackagesDir
9899
Get-ChildItem -LiteralPath $azPackagesDir
99100

‎.azure-pipelines/util/smoke-test-steps.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
buildVersionToDownload: 'latest'
5555
artifactName: $(ArtifactName)
5656
targetPath: $(Pipeline.Workspace)
57+
itemPattern: '**/artifacts/**'
5758

5859
- task: DownloadPipelineArtifact@2
5960
condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'), ne(variables['PipelineId'], ''))
@@ -66,6 +67,7 @@ jobs:
6667
pipelineId: $(PipelineId)
6768
artifactName: '$(ArtifactName)'
6869
targetPath: '$(Pipeline.Workspace)'
70+
itemPattern: '**/artifacts/**'
6971

7072
- task: PowerShell@2
7173
condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
@@ -74,7 +76,8 @@ jobs:
7476
targetType: 'inline'
7577
script: |
7678
New-Item -Path "$(Pipeline.Workspace)" -Name "LocalRepo" -ItemType "directory"
77-
Copy-Item -Path "$(Pipeline.Workspace)\\*.nupkg" -Destination "$(Pipeline.Workspace)\\LocalRepo\\"
79+
$fileList = Get-ChildItem -Path "$(Pipeline.Workspace)" -Recurse -Filter "*.nupkg"
80+
$fileList | ForEach-Object { Copy-Item -Path $_.FullName -Destination "$(Pipeline.Workspace)\LocalRepo\" -Force }
7881
Write-Host "List artifacts..."
7982
Get-ChildItem "$(Pipeline.Workspace)\\LocalRepo\\"
8083

‎.github/workflows/pr-labeled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
shell: pwsh
2323
env:
2424
LABEL: ${{ github.event.label.name }}
25-
run: .github/workflows/script/PrLabeled.ps1 -LabelName "$LABEL" -PrUrl $env:PR
25+
run: .github/workflows/script/PrLabeled.ps1 -LabelName $env:LABEL -PrUrl $env:PR

‎.github/workflows/script/PrLabeled.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ This PR was labeled "Breaking Change Release" because it contains breaking chang
2525
"needs-revision" = @"
2626
This PR was labeled "needs-revision" because it has unresolved review comments or CI failures.
2727
Please resolve all open review comments and make sure all CI checks are green. Refer to our [guide](https://eng.ms/docs/cloud-ai-platform/azure-core/azure-management-and-platforms/control-plane-bburns/azure-cli-tools-azure-cli-powershell-and-terraform/azure-cli-tools/devguide/azps/ci_tsg) to troubleshoot common CI failures.
28+
"@
29+
"codegen-survey" = @"
30+
Thanks for using autorest.powershell to develop your PowerShell module! Would you like to take [a 5-minute survey](https://forms.office.com/r/j6rQuFUqUf?origin=lprLink) to help us improve the tool? Much appreciated :)
2831
"@
2932
}
3033

‎src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,11 @@ public override void ExecuteCmdlet()
337337
AzConfigReader.Instance?.UpdateConfig(ConfigKeys.EnableLoginByWam, false, ConfigScope.CurrentUser);
338338
}
339339

340+
if (ParameterSetName.Equals(UserWithCredentialParameterSet))
341+
{
342+
WriteWarning(Resources.UsernamePasswordDeprecateWarningMessage);
343+
}
344+
340345
if (MyInvocation.BoundParameters.ContainsKey(nameof(Subscription)))
341346
{
342347
if (Guid.TryParse(Subscription, out subscriptionIdGuid))

‎src/Accounts/Accounts/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020

2121
## Upcoming Release
22+
* Added a warning message in `Connect-AzAccount` to discourage the use of the username/password (a.k.a ROPC) login flow.
23+
* Preannounced a breaking change in `Get-AzAccessToken` to change `Token` property from `String` to `SecureString`.
2224

2325
## Version 3.0.1
2426
* Disable WAM when the customers login with device code flow or username password (ROPC) flow to prevent a potential issue with token cache.

‎src/Accounts/Accounts/Properties/Resources.Designer.cs

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Accounts/Accounts/Properties/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,4 +631,7 @@
631631
<data name="ReportIssue" xml:space="preserve">
632632
<value>If you encounter any problem, please open an issue at: https://aka.ms/azpsissue</value>
633633
</data>
634+
<data name="UsernamePasswordDeprecateWarningMessage" xml:space="preserve">
635+
<value>Authentication with a username and password at the command line is strongly discouraged. Use one of the recommended authentication methods based on your requirements. For additional information, visit https://go.microsoft.com/fwlink/?linkid=2276971.</value>
636+
</data>
634637
</root>

‎src/RedisCache/RedisCache/help/Get-AzRedisCacheKey.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Get-AzRedisCacheKey -ResourceGroupName "MyResourceGroup" -Name "MyCacheKey"
2929
```
3030

3131
```output
32-
PrimaryKey : pJ+jruGKPHDKsEC8kmoybobH3TZx2njBR3ipEsquZFo=
33-
SecondaryKey : sJ+jruGKPHDKsEC8kmoybobH3TZx2njBR3ipEsquZFo=
32+
PrimaryKey : ******
33+
SecondaryKey : ******
3434
```
3535

3636
This command gets the access keys named MyCacheKey.

0 commit comments

Comments
 (0)