Skip to content

Update #4

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

Merged
BigCat20196 merged 39 commits into from
Apr 2, 2021
Merged

Update #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0df58e9
{Misc} Drop `six` from core (#17366)
jiasli Mar 24, 2021
357805a
Revert "{CI} Update CODEOWNERS(Do not merge) (#17313)" (#17322)
msyyc Mar 24, 2021
983cb41
{Compute} Update function of auto_shutdown_vm (#17352)
BigCat20196 Mar 24, 2021
f721fd3
{Packaging} Hotfix: Only remove `dist-info` for azure packages in MSI…
fengzhou-msft Mar 24, 2021
962f0ca
{Packaging} Hotfix: Only remove `dist-info` for azure packages in MSI…
fengzhou-msft Mar 25, 2021
fb1fb85
Merge branch 'release' into dev
jiasli Mar 25, 2021
d727390
{Network} Fix network tests which will cause CI fail in Eventgrid mod…
evelyn-ys Mar 25, 2021
f821690
add microsoft.search scenario test for private endpoint connections (…
Mar 26, 2021
23facb0
Update azdev_setup.yml (#17463)
Infinite-Blue-1042 Mar 26, 2021
490cafb
[NetAppFiles] Update azure-mgmt-netapp version to 2.0.0 (#17370)
Mar 26, 2021
0bfe544
Adding optional parameter 'backup-management-type' in 'backup protect…
hiaga Mar 26, 2021
212f925
[ARM] Fix #17379: bicep auto install results in invalid json output f…
felipebbc Mar 26, 2021
19073d6
{EventGrid} Add support for StorageQueueMessageTTL, AdvancedFilters, …
VidyaKukke Mar 26, 2021
eb08437
{Packaging} Bump knack to 0.8.0 (#17470)
jiasli Mar 26, 2021
984e06a
{Feedback} Explain what `az feedback` does (#17396)
jiasli Mar 26, 2021
3bff786
{Log} Adapt az_command_data_logger to Knack 0.8.0 (#17324)
jiasli Mar 26, 2021
ad284d0
Fix ssl bind bug (#17479)
calvinsID Mar 29, 2021
8828c74
Update azdev to version 0.1.30 (#17489)
kairu-ms Mar 29, 2021
0194d3b
{CI} Restore `az self-test` (#17456)
jiasli Mar 29, 2021
f331b03
[Storage] `az storage fs file list`: Support --show-next-marker (#17408)
evelyn-ys Mar 29, 2021
44e1af8
[Interactive] Fix #16931: Fix `KeyError` in `az interactive --update`…
fengzhou-msft Mar 29, 2021
7a5538f
{AppConfig} Fix bug in print preview of restore command (#17344)
avanigupta Mar 29, 2021
39f2968
Fix live test (#17388)
zhoxing-ms Mar 30, 2021
e536c7e
[Core] Add spinner progress bar for long running operation (#17262)
Juliehzl Mar 30, 2021
b457d86
{EventGrid} Add support for delivery attribute mapping, topicKind (#1…
VidyaKukke Mar 30, 2021
bbf753f
{Core} Make _prepare_client_kwargs_track2 public (#17411)
jiasli Mar 30, 2021
db4c326
[RDBMS] Allowing DB server private access from different subscription…
DaeunYim Mar 30, 2021
57f33f0
[AKS] az aks create: add support for --private-dns-zone and --fqdn-su…
levimm Mar 31, 2021
4fffb69
[NetAppFiles] Updated backup tests (#17492)
Mar 31, 2021
86037fb
{storage} Add record_only() for tests needing additional configuratio…
Juliehzl Mar 31, 2021
0fa1fb5
{Packaging} Bump bcrypt and PyNaCl (#17369)
jiasli Mar 31, 2021
acd4633
{EventGrid} Refine and bugfix for StorageQueueMessageTTL and Delivery…
VidyaKukke Apr 1, 2021
7b68db9
[Core] Add service_name.json (#17159)
qwordy Apr 1, 2021
fd47801
[Network]`az network vnet-gateway`: `--vpn-auth-type` allow multi val…
msyyc Apr 1, 2021
ad30d55
[Core] Provide recommendation for JSON parsing error (#17445)
jiasli Apr 1, 2021
4eabb55
{Core} Remove the check on `managed_by_tenants` (#17526)
jiasli Apr 1, 2021
dd35146
Bugfix: rg not found if AZURE_CLI_TEST_DEV_RESOURCE_GROUP_NAME is set…
Apr 1, 2021
85d73f3
{Doc} Update track 2 migration roadmap (#17540)
jsntcy Apr 1, 2021
885be54
[Search] Introduce async options for service and shared-private-link-…
Apr 1, 2021
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
Prev Previous commit
Next Next commit
{EventGrid} Add support for delivery attribute mapping, topicKind (Az… 
…ure#17496)

* Add support for delivery attribute mapping, topicKind

* Fix linter, test issues

* Fix pipeline errors

* Fix Linter errors

* Linter fix

* Update linter_exclusions.yml

* Update linter_exclusions.yml

* Update linter_exclusions.yml

* Address review comments

* Fix style error

Co-authored-by: kai ru <[email protected]>
  • Loading branch information
@VidyaKukke @kairu-ms
VidyaKukke and kairu-ms authored Mar 30, 2021
commit b457d862fea353f59377e5beb7c2b043e90019ed
18 changes: 18 additions & 0 deletions linter_exclusions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,6 +1621,9 @@ eventgrid event-subscription create:
preferred_batch_size_in_kilobytes:
rule_exclusions:
- option_length_too_long
delivery_attribute_mapping:
rule_exclusions:
- option_length_too_long
eventgrid event-subscription show:
parameters:
include_full_endpoint_url:
Expand All @@ -1640,6 +1643,9 @@ eventgrid event-subscription update:
endpoint_type:
rule_exclusions:
- no_parameter_defaults_for_update_commands
delivery_attribute_mapping:
rule_exclusions:
- option_length_too_long
eventgrid partner namespace create:
parameters:
partner_registration_id:
Expand Down Expand Up @@ -1722,6 +1728,9 @@ eventgrid partner topic event-subscription create:
preferred_batch_size_in_kilobytes:
rule_exclusions:
- option_length_too_long
delivery_attribute_mapping:
rule_exclusions:
- option_length_too_long
eventgrid partner topic event-subscription show:
parameters:
include_full_endpoint_url:
Expand All @@ -1732,6 +1741,9 @@ eventgrid partner topic event-subscription update:
endpoint_type:
rule_exclusions:
- no_parameter_defaults_for_update_commands
delivery_attribute_mapping:
rule_exclusions:
- option_length_too_long
eventgrid system-topic event-subscription create:
parameters:
azure_active_directory_application_id_or_uri:
Expand All @@ -1752,6 +1764,9 @@ eventgrid system-topic event-subscription create:
preferred_batch_size_in_kilobytes:
rule_exclusions:
- option_length_too_long
delivery_attribute_mapping:
rule_exclusions:
- option_length_too_long
eventgrid system-topic event-subscription show:
parameters:
include_full_endpoint_url:
Expand All @@ -1762,6 +1777,9 @@ eventgrid system-topic event-subscription update:
endpoint_type:
rule_exclusions:
- no_parameter_defaults_for_update_commands
delivery_attribute_mapping:
rule_exclusions:
- option_length_too_long
eventgrid topic create:
parameters:
input_mapping_default_values:
Expand Down
73 changes: 73 additions & 0 deletions src/azure-cli/azure/cli/command_modules/eventgrid/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,15 @@
Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName
- name: --endpoint-type
short-summary: The type of the destination endpoint.
- name: --delivery-attribute-mapping
short-summary: Add delivery attribute mapping to send additional information via HTTP headers when delivering events. This attribute is valid for all destination types except StorageQueue. Multiple attributes can be specified by using more than one `--delivery-attribute-mapping` argument.
long-summary: |
Usage: --delivery-attribute-mapping attribute-name attribute-type attribute-value [attribute-is-secret]
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue false
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue true
Dynamic Attribute Mapping: --delivery-attribute-mapping somename dynamic somevalue
Both Static and Dynamic: --delivery-attribute-mapping somename dynamic somevalue --delivery-attribute-mapping somename2 static somevalue
examples:
- name: Create a new event subscription for an Event Grid system topic, using default filters.
text: |
Expand Down Expand Up @@ -537,6 +546,10 @@
text: |
az eventgrid system-topic event-subscription show --name es1 \\
-g rg1 --system-topic-name systemtopic1
- name: Show the details of an event subscription for an Event Grid system topic include any static delivery attribute secrets.
text: |
az eventgrid system-topic event-subscription show --name es1 \\
-g rg1 --system-topic-name systemtopic1 --include-attrib-secret
"""

helps['eventgrid system-topic event-subscription update'] = """
Expand Down Expand Up @@ -569,6 +582,15 @@
IsNullOrUndefined: --advanced-filter data.property3 IsNullOrUndefined
IsNotNull: --advanced-filter data.property3 IsNotNull
Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
- name: --delivery-attribute-mapping
short-summary: Add delivery attribute mapping to send additional information via HTTP headers when delivering events. This attribute is valid for all destination types except StorageQueue. Multiple attributes can be specified by using more than one `--delivery-attribute-mapping` argument.
long-summary: |
Usage: --delivery-attribute-mapping attribute-name attribute-type attribute-value [attribute-is-secret]
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue false
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue true
Dynamic Attribute Mapping: --delivery-attribute-mapping somename dynamic somevalue
Both Static and Dynamic: --delivery-attribute-mapping somename dynamic somevalue --delivery-attribute-mapping somename2 static somevalue
examples:
- name: Update an event subscription for an Event Grid system topic to specify a new endpoint.
text: |
Expand Down Expand Up @@ -649,6 +671,15 @@
Example: --deadletter-endpoint /subscriptions/{SubID}/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/sa1/blobServices/default/containers/containerName
- name: --endpoint-type
short-summary: The type of the destination endpoint.
- name: --delivery-attribute-mapping
short-summary: Add delivery attribute mapping to send additional information via HTTP headers when delivering events. This attribute is valid for all destination types except StorageQueue. Multiple attributes can be specified by using more than one `--delivery-attribute-mapping` argument.
long-summary: |
Usage: --delivery-attribute-mapping attribute-name attribute-type attribute-value [attribute-is-secret]
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue false
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue true
Dynamic Attribute Mapping: --delivery-attribute-mapping somename dynamic somevalue
Both Static and Dynamic: --delivery-attribute-mapping somename dynamic somevalue --delivery-attribute-mapping somename2 static somevalue
examples:
- name: Create a new event subscription for an Event Grid partner topic, using default filters.
text: |
Expand Down Expand Up @@ -729,6 +760,10 @@
text: |
az eventgrid partner topic event-subscription show --name es1 \\
-g rg1 --partner-topic-name partnertopic1
- name: Show the details of an event subscription for an Event Grid partner topic and include static delivery attribute secrets
text: |
az eventgrid partner topic event-subscription show --name es1 \\
-g rg1 --partner-topic-name partnertopic1 --include-static-delivery-attribute-secret
"""

helps['eventgrid partner topic event-subscription update'] = """
Expand Down Expand Up @@ -761,6 +796,15 @@
IsNullOrUndefined: --advanced-filter data.property3 IsNullOrUndefined
IsNotNull: --advanced-filter data.property3 IsNotNull
Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
- name: --delivery-attribute-mapping
short-summary: Add delivery attribute mapping to send additional information via HTTP headers when delivering events. This attribute is valid for all destination types except StorageQueue. Multiple attributes can be specified by using more than one `--delivery-attribute-mapping` argument.
long-summary: |
Usage: --delivery-attribute-mapping attribute-name attribute-type attribute-value [attribute-is-secret]
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue false
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue true
Dynamic Attribute Mapping: --delivery-attribute-mapping somename dynamic somevalue
Both Static and Dynamic: --delivery-attribute-mapping somename dynamic somevalue --delivery-attribute-mapping somename2 static somevalue
examples:
- name: Update an event subscription for an Event Grid partner topic to specify a new endpoint.
text: |
Expand Down Expand Up @@ -859,6 +903,15 @@
short-summary: The type of the destination endpoint.
- name: --delivery-identity-endpoint-type
short-summary: The type of the destination endpoint with resource identity.
- name: --delivery-attribute-mapping
short-summary: Add delivery attribute mapping to send additional information via HTTP headers when delivering events. This attribute is valid for all destination types except StorageQueue. Multiple attributes can be specified by using more than one `--delivery-attribute-mapping` argument.
long-summary: |
Usage: --delivery-attribute-mapping attribute-name attribute-type attribute-value [attribute-is-secret]
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue false
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue true
Dynamic Attribute Mapping: --delivery-attribute-mapping somename dynamic somevalue
Both Static and Dynamic: --delivery-attribute-mapping somename dynamic somevalue --delivery-attribute-mapping somename2 static somevalue
examples:
- name: Create a new event subscription for an Event Grid topic, using default filters.
text: |
Expand Down Expand Up @@ -1118,6 +1171,11 @@
text: |
az eventgrid event-subscription show --name es3 \\
--source-resource-id /subscriptions/{SubID}/resourceGroups/rg1/providers/microsoft.storage/storageaccounts/kalsegblob
- name: Show the details of an event subscription for a resource group including any static delivery attribute secrets.
text: |
az eventgrid event-subscription show --name es3 \\
--source-resource-id /subscriptions/{SubID}/resourceGroups/rg1 \\
--include-static-delivery-attribute-secret
"""

helps['eventgrid event-subscription update'] = """
Expand Down Expand Up @@ -1162,6 +1220,15 @@
IsNullOrUndefined: --advanced-filter data.property3 IsNullOrUndefined
IsNotNull: --advanced-filter data.property3 IsNotNull
Multiple advanced filters can be specified by using more than one `--advanced-filter` argument.
- name: --delivery-attribute-mapping
short-summary: Add delivery attribute mapping to send additional information via HTTP headers when delivering events. This attribute is valid for all destination types except StorageQueue. Multiple attributes can be specified by using more than one `--delivery-attribute-mapping` argument.
long-summary: |
Usage: --delivery-attribute-mapping attribute-name attribute-type attribute-value [attribute-is-secret]
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue false
Static Attribute Mapping: --delivery-attribute-mapping somename static somevalue true
Dynamic Attribute Mapping: --delivery-attribute-mapping somename dynamic somevalue
Both Static and Dynamic: --delivery-attribute-mapping somename dynamic somevalue --delivery-attribute-mapping somename2 static somevalue
examples:
- name: Update an event subscription for an Event Grid topic to specify a new endpoint.
text: |
Expand Down Expand Up @@ -1243,6 +1310,12 @@
text: az eventgrid topic create -g rg1 --name topic1 -l westus2 --input-schema cloudeventschemav1_0
- name: Create a new topic which allows specific inbound ip rules with Basic Sku and system assigned identity
text: az eventgrid topic create -g rg1 --name topic1 -l westus2 --public-network-access enabled --inbound-ip-rules 10.0.0.0/8 Allow --inbound-ip-rules 10.2.0.0/8 Allow --sku Basic --identity systemassigned
- name: Create a new topic in Azure.
text: az eventgrid topic create -g rg1 --name topic1 -l westus2
- name: Create a new topic in Azure.
text: az eventgrid topic create -g rg1 --name topic1 -l westus2 --kind azure
- name: Create a new topic in AzureArc targeting a custom location.
text: az eventgrid topic create -g rg1 --name topic1 -l eastus2euap --kind azurearc --extended-location-name /subscriptions/<subid>/resourcegroups/<rgname>/providers/microsoft.extendedlocation/customlocations/<cust-loc-name> --extended-location-type customlocation
"""

helps['eventgrid topic delete'] = """
Expand Down
Loading