Skip to content

Commit f50f1ee

Browse files
idanielstevenidanielsteven
authored
Merge branch 'Azure:main' into main
2 parents e588afd + 40354a4 commit f50f1ee

810 files changed

Lines changed: 263185 additions & 90077 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/linter_exclusions.yml @kairu-ms @wangzelin007
44

5-
/src/index.json @kairu-ms @jsntcy @jiasli @zhoxing-ms @calvinhzy @necusjz @wangzelin007
5+
/src/index.json @kairu-ms @jsntcy @jiasli @yanzhudd @calvinhzy @necusjz @wangzelin007
66

77
/src/footprint/ @jonunezd @Diego-Perez-Botero
88

@@ -58,7 +58,7 @@
5858

5959
/src/front-door/ @pichandwork
6060

61-
/src/interactive/ @jiasli @zhoxing-ms @ReaNAiveD
61+
/src/interactive/ @jiasli @yanzhudd @ReaNAiveD
6262

6363
/src/aks-preview/ @andyzhangx @andyliuliming @fumingzhang
6464

@@ -124,7 +124,7 @@
124124

125125
/src/datadog/ @limingu
126126

127-
/src/hpc-cache/ @zhoxing-ms
127+
/src/hpc-cache/ @yanzhudd
128128

129129
/src/timeseriesinsights/ @jiasli
130130

@@ -146,7 +146,7 @@
146146

147147
/src/k8s-extension/ @NarayanThiru @bavneetsingh16 @deeksha345 @anagg929
148148

149-
/src/log-analytics-solution/ @zhoxing-ms
149+
/src/log-analytics-solution/ @yanzhudd
150150

151151
/src/kusto/ @ilayr @orhasban @astauben
152152

@@ -166,31 +166,31 @@
166166

167167
/src/guestconfig/ @gehuan
168168

169-
/src/swiftlet/ @zhoxing-ms
169+
/src/swiftlet/ @yanzhudd
170170

171171
/src/maintenance/ @sotaneja
172172

173173
/src/scheduled-query/ @jsntcy
174174

175175
/src/cli-translator/ @houk-ms @fengzhou-msft
176176

177-
/src/vmware/ @Juliehzl @zhoxing-ms
177+
/src/vmware/ @Juliehzl @yanzhudd
178178

179-
/src/stack-hci/ @zhoxing-ms
179+
/src/stack-hci/ @yanzhudd
180180

181181
/src/acrtransfer/ @mabenedi
182182

183183
/src/securityinsight/ @houk-ms
184184

185185
/src/communication/ @kairu-ms @jsntcy
186186

187-
/src/automation/ @zhoxing-ms
187+
/src/automation/ @yanzhudd
188188

189189
/src/monitor-control-service/ @jsntcy @kairu-ms
190190

191191
/src/rdbms-connect/ @mjain2 @Juliehzl
192192

193-
/src/confluent/ @zhoxing-ms @jsntcy
193+
/src/confluent/ @yanzhudd @jsntcy
194194

195195
/src/offazure/ @houk-ms
196196

@@ -202,11 +202,11 @@
202202

203203
/src/ad/ @calvinhzy
204204

205-
/src/next/ @zhoxing-ms
205+
/src/next/ @yanzhudd
206206

207207
/src/redisenterprise/ @greenms
208208

209-
/src/cloudservice/ @zhoxing-ms
209+
/src/cloudservice/ @yanzhudd
210210

211211
/src/webpubsub/ @zackliu
212212

@@ -226,11 +226,11 @@
226226

227227
/src/elastic/ @kairu-ms @jsntcy
228228

229-
/src/image-gallery/ @zhoxing-ms
229+
/src/image-gallery/ @yanzhudd
230230

231231
/src/keyvault-preview/ @notyashhh @calvinhzy
232232

233-
/src/init/ @zhoxing-ms @HuangYT2000
233+
/src/init/ @yanzhudd @HuangYT2000
234234

235235
/src/datamigration/ @ashutoshsuman99
236236

@@ -266,7 +266,7 @@
266266

267267
/src/reservation/ @gaoyp830 @rkapso @msft-adrianma @sornaks @juhee0202
268268

269-
/src/scenario-guide/ @zhoxing-ms @ReaNAiveD
269+
/src/scenario-guide/ @yanzhudd @ReaNAiveD
270270

271271
/src/dynatrace/ @jsntcy
272272

@@ -322,7 +322,7 @@
322322

323323
/src/azext_gallery-service-artifact/ @rohitbhoopalam
324324

325-
/src/azext_durabletask/ @RyanLettieri
325+
/src/azext_durabletask/ @berndverst @torosent
326326

327327
/src/acat @qinqingxu @Sherylueen @yongxin-ms @wh-alice
328328

‎.github/policies/resourceManagement.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -614,9 +614,8 @@ configuration:
614614
then:
615615
- mentionUsers:
616616
mentionees:
617-
- lasuredd-msft
618-
- fzkhan
619-
- pkuma-msft
617+
- ohnkoh-msft
618+
- joschung
620619
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
621620
assignMentionees: False
622621
- if:
@@ -2307,6 +2306,8 @@ configuration:
23072306
- mentionUsers:
23082307
mentionees:
23092308
- AzmonLogA
2309+
- raronen
2310+
- MeirMen
23102311
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
23112312
assignMentionees: False
23122313
- if:
@@ -2428,9 +2429,9 @@ configuration:
24282429
then:
24292430
- mentionUsers:
24302431
mentionees:
2431-
- t-bzhan
2432-
- gxue
2433-
- TracyYaoYao
2432+
- jingnanxu
2433+
- luxue
2434+
- arashz
24342435
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
24352436
assignMentionees: False
24362437
- if:

‎linter_exclusions.yml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ aks create:
124124
cluster_service_load_balancer_health_probe_mode:
125125
rule_exclusions:
126126
- option_length_too_long
127+
enable_service_account_image_pull:
128+
rule_exclusions:
129+
- option_length_too_long
130+
service_account_image_pull_default_managed_identity_id:
131+
rule_exclusions:
132+
- option_length_too_long
127133
aks update:
128134
parameters:
129135
aad_admin_group_object_ids:
@@ -207,6 +213,15 @@ aks update:
207213
disable_application_load_balancer:
208214
rule_exclusions:
209215
- option_length_too_long
216+
enable_service_account_image_pull:
217+
rule_exclusions:
218+
- option_length_too_long
219+
disable_service_account_image_pull:
220+
rule_exclusions:
221+
- option_length_too_long
222+
service_account_image_pull_default_managed_identity_id:
223+
rule_exclusions:
224+
- option_length_too_long
210225
aks agent:
211226
parameters:
212227
prompt:
@@ -401,6 +416,75 @@ codespace plan create:
401416
confidentialledger managedccfs update:
402417
rule_exclusions:
403418
- missing_command_test_coverage
419+
confluent organization environment:
420+
rule_exclusions:
421+
- require_wait_command_if_no_wait
422+
confluent organization environment cluster:
423+
rule_exclusions:
424+
- require_wait_command_if_no_wait
425+
confluent organization environment cluster connector:
426+
rule_exclusions:
427+
- require_wait_command_if_no_wait
428+
confluent organization environment cluster topic:
429+
rule_exclusions:
430+
- require_wait_command_if_no_wait
431+
confluent agreement default create:
432+
rule_exclusions:
433+
- missing_command_example
434+
confluent organization environment create:
435+
rule_exclusions:
436+
- missing_command_example
437+
parameters:
438+
stream_governance_config:
439+
rule_exclusions:
440+
- option_length_too_long
441+
confluent organization environment update:
442+
rule_exclusions:
443+
- missing_command_example
444+
parameters:
445+
stream_governance_config:
446+
rule_exclusions:
447+
- option_length_too_long
448+
confluent organization environment cluster create:
449+
rule_exclusions:
450+
- missing_command_example
451+
confluent organization environment cluster update:
452+
rule_exclusions:
453+
- missing_command_example
454+
confluent organization environment cluster connector create:
455+
rule_exclusions:
456+
- missing_command_example
457+
parameters:
458+
connector_service_type_info:
459+
rule_exclusions:
460+
- option_length_too_long
461+
confluent organization environment cluster connector update:
462+
rule_exclusions:
463+
- missing_command_example
464+
parameters:
465+
connector_service_type_info:
466+
rule_exclusions:
467+
- option_length_too_long
468+
confluent organization environment cluster topic create:
469+
rule_exclusions:
470+
- missing_command_example
471+
parameters:
472+
partitions_reassignments:
473+
rule_exclusions:
474+
- option_length_too_long
475+
confluent organization environment cluster topic update:
476+
rule_exclusions:
477+
- missing_command_example
478+
parameters:
479+
partitions_reassignments:
480+
rule_exclusions:
481+
- option_length_too_long
482+
confluent validation orgvalidate:
483+
rule_exclusions:
484+
- missing_command_example
485+
confluent validation orgvalidate-v2:
486+
rule_exclusions:
487+
- missing_command_example
404488
containerapp env create:
405489
parameters:
406490
infrastructure_subnet_resource_id:

‎scripts/ci/credscan/CredScanSuppressions.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,35 @@
294294
"src\\storage-preview\\azext_storage_preview\\tests\\latest\\recordings\\test_storage_account_local_user.yaml"
295295
],
296296
"_justification": "Fake credentials for recordings reported by new version credential scanner."
297+
},
298+
{
299+
"file": [
300+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_ha_avset_difftransrgShare.yaml",
301+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_ha_avzone_cusrestrustedtransshare.yaml",
302+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_trustedaccessnotransshare.yaml",
303+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_singlesystem_cusrestrusted.yaml",
304+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_singlesystem_notrusted.yaml"
305+
],
306+
"_justification": "[Workloads] False positive."
307+
},
308+
{
309+
"file": [
310+
"src\\oracle-database\\azext_oracle_database\\tests\\latest\\test_oracle_db_systems.py",
311+
"src\\oracle-database\\azext_oracle_database\\tests\\latest\\recordings\\test_create_db_system.yaml"
312+
],
313+
"_justification": "[Oracle Database] False positive."
314+
},
315+
{
316+
"file": [
317+
"src\\load\\azext_load\\tests\\latest\\recordings\\test_load_test_run_download_files.yaml"
318+
],
319+
"_justification": "[Load] False positive."
320+
},
321+
{
322+
"file": [
323+
"src\\databox\\testkey.pvk"
324+
],
325+
"_justification": "[Databox] False positive."
297326
}
298327
]
299328
}

‎src/acrcssc/HISTORY.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
Release History
44
===============
55

6+
1.0.0b6
7+
++++++++
8+
* Fix issue with DNL registry names when scheduling tasks
9+
610
1.0.0b5
711
++++++++
812
* Update minCliCoreVersion

‎src/acrcssc/azext_acrcssc/templates/task/cssc_patch_image.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: v1.1.0
22
alias:
33
values:
44
ScanReport : os-vulnerability-report_trivy_{{ regexReplaceAll "[^a-zA-Z0-9]" .Values.SOURCE_REPOSITORY "-" }}_{{.Values.SOURCE_IMAGE_TAG}}_$(date "+%Y-%m-%d").json
5-
cssc : mcr.microsoft.com/acr/cssc:cbcf692
5+
cssc : mcr.microsoft.com/acr/cssc:1fb6e2a
66
steps:
77
- id: print-inputs
88
cmd: |

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ alias:
33
values:
44
patchimagetask: cssc-patch-image
55
DATE: $(date "+%Y-%m-%d")
6-
cssc : mcr.microsoft.com/acr/cssc:cbcf692
6+
cssc : mcr.microsoft.com/acr/cssc:1fb6e2a
77
steps:
88
- id: print-inputs
99
cmd: |
@@ -45,10 +45,15 @@ 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+
RegistryBaseName={{.Run.Registry}}
49+
if [[ $RegistryBaseName == *-* ]]; then
50+
RegistryBaseName="${RegistryBaseName%%-*}"
51+
echo "DNL registry name detected, readjusting RegistryBaseName to $RegistryBaseName for task scheduling"
52+
fi
4853
az login --identity --allow-no-subscriptions; \
4954
echo "Total OS vulnerabilities found -> $vulCount"; \
50-
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}}"; \
51-
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; \
55+
echo "PATCHING task scheduled for image ${RegistryBaseName}/{{.Values.SOURCE_REPOSITORY}}:{{.Values.SOURCE_IMAGE_TAG}}, new patch tag will be {{.Values.SOURCE_IMAGE_ORIGINAL_TAG}}-{{.Values.SOURCE_IMAGE_NEWPATCH_TAG}}"; \
56+
az acr task run --name $patchimagetask --registry $RegistryBaseName --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; \
5257
else \
5358
echo "PATCHING will be skipped as no vulnerability found in the image {{.Values.SOURCE_REPOSITORY}}:{{.Values.SOURCE_IMAGE_TAG}}"; \
5459
fi'

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: v1.1.0
22
alias:
33
values:
44
ScanImageAndSchedulePatchTask: cssc-scan-image
5-
cssc : mcr.microsoft.com/acr/cssc:cbcf692
5+
cssc : mcr.microsoft.com/acr/cssc:1fb6e2a
66
maxLimit: 100
77
steps:
88
- cmd: bash -c 'echo "Inside cssc-trigger-workflow task, getting list of images to be patched based on --filter-policy for Registry {{.Run.Registry}}."'
@@ -28,10 +28,14 @@ steps:
2828
timeout: 1800
2929
cmd: |
3030
az -c '
31-
counter=0; \
32-
batchSize=10; \
33-
sleepDuration=30; \
34-
RegistryName={{.Run.Registry}}; \
31+
counter=0
32+
batchSize=10
33+
sleepDuration=30
34+
RegistryBaseName={{.Run.Registry}}
35+
if [[ $RegistryBaseName == *-* ]]; then
36+
RegistryBaseName="${RegistryBaseName%%-*}"
37+
echo "DNL registry name detected, readjusting RegistryBaseName to $RegistryBaseName for task scheduling"
38+
fi
3539
while read line;do \
3640
IFS=',' read -r -a array <<< "${line}"
3741
RepoName=${array[0]}
@@ -44,15 +48,14 @@ steps:
4448
else
4549
IncrementedTagNumber="1"
4650
fi
47-
4851
if [ $TagName == "N/A" ]; then
4952
TagName=$OriginalTag
5053
elif [[ $TagName =~ -([0-9]{1,3})$ ]]; then
5154
TagNumber=${BASH_REMATCH[1]}
5255
IncrementedTagNumber=$((TagNumber+1))
5356
fi
54-
echo "Scheduling $ScanImageAndSchedulePatchTask for $RegistryName/$RepoName, Tag:$TagName, OriginalTag:$OriginalTag, PatchTag:$OriginalTag-$IncrementedTagNumber"; \
55-
az acr task run --name $ScanImageAndSchedulePatchTask --registry $RegistryName --set SOURCE_REPOSITORY=$RepoName --set SOURCE_IMAGE_TAG=$TagName --set SOURCE_IMAGE_ORIGINAL_TAG=$OriginalTag --set SOURCE_IMAGE_NEWPATCH_TAG=$IncrementedTagNumber --no-wait; \
57+
echo "Scheduling $ScanImageAndSchedulePatchTask for ${RegistryBaseName}/$RepoName, Tag:$TagName, OriginalTag:$OriginalTag, PatchTag:$OriginalTag-$IncrementedTagNumber"; \
58+
az acr task run --name $ScanImageAndSchedulePatchTask --registry $RegistryBaseName --set SOURCE_REPOSITORY=$RepoName --set SOURCE_IMAGE_TAG=$TagName --set SOURCE_IMAGE_ORIGINAL_TAG=$OriginalTag --set SOURCE_IMAGE_NEWPATCH_TAG=$IncrementedTagNumber --no-wait; \
5659
counter=$((counter+1)); \
5760
if [ $((counter%batchSize)) -eq 0 ]; then \
5861
echo "Waiting for $sleepDuration seconds before scheduling scans for next batch of images"; \

‎src/acrcssc/azext_acrcssc/templates/tmp_dry_run_template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: v1.1.0
22
alias:
33
values:
4-
cssc : mcr.microsoft.com/acr/cssc:cbcf692
4+
cssc : mcr.microsoft.com/acr/cssc:1fb6e2a
55
maxLimit: 100
66
steps:
77
- id: acr-cli-filter

0 commit comments

Comments
 (0)