Skip to content

Commit 7af0671

Browse files
Ruchii-27Ruchi MaheshwariCopilot
authored
fix(acrcssc): updated to allow for az login when the account doesn't have any active subs (#8770)
* Updated to allow for az login when the account dosent have any active subscriptions assigned * Updated to allow for az login when the account dosent have any active subscriptions - history log updated * Update src/acrcssc/HISTORY.rst Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Ruchi Maheshwari <rumahe@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent d084ea7 commit 7af0671

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

src/acrcssc/HISTORY.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
33
Release History
44
===============
5+
1.0.0b2
6+
++++++
7+
* Bug fix: Updated to allow for az login when the account doesn't have any active subscriptions
8+
59

610
1.0.0b1
711
++++++

src/acrcssc/azext_acrcssc/templates/task/cssc_scan_image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ steps:
4545
if [ "$eoslValue" = "true" ]; then \
4646
echo "PATCHING will be skipped as EOSL is $eoslValue for image {{.Values.SOURCE_REPOSITORY}}:{{.Values.SOURCE_IMAGE_TAG}}"; \
4747
elif [ $vulCount -gt 0 ]; then \
48-
az login --identity; \
48+
az login --identity --allow-no-subscriptions; \
4949
echo "Total OS vulnerabilities found -> $vulCount"; \
5050
echo "PATCHING task scheduled for image {{.Values.SOURCE_REPOSITORY}}:{{.Values.SOURCE_IMAGE_TAG}}, new patch tag will be {{.Values.SOURCE_IMAGE_ORIGINAL_TAG}}-{{.Values.SOURCE_IMAGE_NEWPATCH_TAG}}"; \
5151
az acr task run --name $patchimagetask --registry $RegistryName --set SOURCE_REPOSITORY={{.Values.SOURCE_REPOSITORY}} --set SOURCE_IMAGE_TAG={{.Values.SOURCE_IMAGE_ORIGINAL_TAG}} --set SOURCE_IMAGE_NEWPATCH_TAG={{.Values.SOURCE_IMAGE_NEWPATCH_TAG}} --no-wait; \

src/acrcssc/azext_acrcssc/templates/task/cssc_trigger_workflow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ steps:
2323
- ACR_EXPERIMENTAL_CSSC=true
2424
- cmd: bash -c 'sed -n "/^Listing/,/^Matches/ {/^Listing/b;/^Matches/b;/^Repo/b;p}" filterReposWithPatchTags.txt' > filteredReposAndTags.txt
2525
- cmd: bash -c 'sed -n "/^Configured Tag Convention:/p" filterReposWithPatchTags.txt' > tagConvention.txt
26-
- cmd: az login --identity
26+
- cmd: az login --identity --allow-no-subscriptions
2727
- id: scan-and-schedule-patch
2828
timeout: 1800
2929
cmd: |

src/acrcssc/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from distutils import log as logger
1414
logger.warn("Wheel is not available, disabling bdist_wheel hook")
1515

16-
VERSION = '1.0.0b1'
16+
VERSION = '1.0.0b2'
1717

1818
# The full list of classifiers is available at
1919
# https://pypi.python.org/pypi?%3Aaction=list_classifiers

0 commit comments

Comments
 (0)