Skip to content

Commit 5807b54

Browse files
author
SDKAuto
committed
CodeGen from PR 14689 in Azure/azure-rest-api-specs
Merge 054d81745d028787f56b0587af2cb088d72d2a06 into 10c93ad
1 parent 19a0ab7 commit 5807b54

File tree

53 files changed

+2727
-13147
lines changed

Some content is hidden

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

53 files changed

+2727
-13147
lines changed

src/datafactory/HISTORY.rst

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

6-
0.3.0
7-
+++++
8-
* [BREAKING CHANGE] Renamed command subgroup `az datafactory factory` to `az datafactory`.
9-
* [BREAKING CHANGE] `az datafactory integration-runtime managed create`: `--type-properties-compute-properties` renamed to `--compute-properties`,
10-
`--type-properties-ssis-properties` renamed to `--ssis-properties`.
11-
* [BREAKING CHANGE] `az datafactory integration-runtime self-hosted create`: `--type-properties-linked-info` renamed to `--linked-info`.
12-
* [BREAKING CHANGE] `az datafactory integration-runtime update`: `--properties` renamed to `--linked-service`.
13-
* [BREAKING CHANGE] `az datafactory linked-service delete`: `--properties` renamed to `--dataset`.
14-
* [BREAKING CHANGE] `az datafactory trigger list`: `--properties` renamed to `--trigger`.
15-
16-
0.2.1
17-
+++++
18-
* az datafactory factory create: Enable managed identity by default
19-
20-
0.2.0
21-
++++++
22-
* add update command for linked services and triggers and datasets
23-
246
0.1.0
257
++++++
268
* Initial release.

src/datafactory/azext_datafactory/generated/_client_factory.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,15 @@ def cf_trigger(cli_ctx, *_):
5454

5555
def cf_trigger_run(cli_ctx, *_):
5656
return cf_datafactory_cl(cli_ctx).trigger_runs
57+
58+
59+
def cf_private_end_point_connection(cli_ctx, *_):
60+
return cf_datafactory_cl(cli_ctx).private_end_point_connections
61+
62+
63+
def cf_private_endpoint_connection(cli_ctx, *_):
64+
return cf_datafactory_cl(cli_ctx).private_endpoint_connection
65+
66+
67+
def cf_private_link_resource(cli_ctx, *_):
68+
return cf_datafactory_cl(cli_ctx).private_link_resources

src/datafactory/azext_datafactory/generated/_help.py

Lines changed: 113 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@
6969
collaboration-branch: Required. Collaboration branch.
7070
root-folder: Required. Root folder.
7171
last-commit-id: Last commit id.
72+
- name: --identity
73+
short-summary: "User assigned identity to use to authenticate to customer's key vault. If not provided Managed \
74+
Service Identity will be used."
75+
long-summary: |
76+
Usage: --identity user-assigned-identity=XX
77+
78+
user-assigned-identity: The resource id of the user assigned identity to authenticate to customer's key \
79+
vault.
7280
examples:
7381
- name: Factories_CreateOrUpdate
7482
text: |-
@@ -149,6 +157,14 @@
149157
helps['datafactory get-git-hub-access-token'] = """
150158
type: command
151159
short-summary: "Get GitHub Access Token."
160+
parameters:
161+
- name: --git-hub-client-secret
162+
short-summary: "GitHub bring your own app client secret information."
163+
long-summary: |
164+
Usage: --git-hub-client-secret byoa-secret-akv-url=XX byoa-secret-name=XX
165+
166+
byoa-secret-akv-url: Bring your own app client secret AKV URL.
167+
byoa-secret-name: Bring your own app client secret name in AKV.
152168
examples:
153169
- name: Factories_GetGitHubAccessToken
154170
text: |-
@@ -206,6 +222,13 @@
206222
helps['datafactory integration-runtime managed create'] = """
207223
type: command
208224
short-summary: "Create an integration runtime."
225+
parameters:
226+
- name: --managed-virtual-network
227+
short-summary: "Managed Virtual Network reference."
228+
long-summary: |
229+
Usage: --managed-virtual-network reference-name=XX
230+
231+
reference-name: Required. Reference ManagedVirtualNetwork name.
209232
"""
210233

211234
helps['datafactory integration-runtime self-hosted'] = """
@@ -591,7 +614,7 @@
591614
taset\\"}],\\"typeProperties\\":{\\"dataIntegrationUnits\\":32,\\"sink\\":{\\"type\\":\\"BlobSink\\"},\\"source\\":{\\"\
592615
type\\":\\"BlobSource\\"}}}],\\"isSequential\\":true,\\"items\\":{\\"type\\":\\"Expression\\",\\"value\\":\\"@pipeline(\
593616
).parameters.OutputBlobNameList\\"}}}]" --parameters "{\\"OutputBlobNameList\\":{\\"type\\":\\"Array\\"}}" --duration \
594-
"0.00:10:00" --name "examplePipeline" --resource-group "exampleResourceGroup"
617+
"0.00:10:00" --pipeline-name "examplePipeline" --resource-group "exampleResourceGroup"
595618
"""
596619

597620
helps['datafactory pipeline delete'] = """
@@ -902,3 +925,92 @@
902925
az datafactory trigger-run rerun --factory-name "exampleFactoryName" --resource-group \
903926
"exampleResourceGroup" --run-id "2f7fdb90-5df1-4b8e-ac2f-064cfa58202b" --trigger-name "exampleTrigger"
904927
"""
928+
929+
helps['datafactory private-end-point-connection'] = """
930+
type: group
931+
short-summary: Manage private end point connection with datafactory
932+
"""
933+
934+
helps['datafactory private-end-point-connection list'] = """
935+
type: command
936+
short-summary: "Lists Private endpoint connections."
937+
examples:
938+
- name: privateEndPointConnections_ListByFactory
939+
text: |-
940+
az datafactory private-end-point-connection list --factory-name "exampleFactoryName" --resource-group \
941+
"exampleResourceGroup"
942+
"""
943+
944+
helps['datafactory private-endpoint-connection'] = """
945+
type: group
946+
short-summary: Manage private endpoint connection with datafactory
947+
"""
948+
949+
helps['datafactory private-endpoint-connection show'] = """
950+
type: command
951+
short-summary: "Gets a private endpoint connection."
952+
examples:
953+
- name: Get a private endpoint connection for a datafactory.
954+
text: |-
955+
az datafactory private-endpoint-connection show --factory-name "exampleFactoryName" --name "connection" \
956+
--resource-group "exampleResourceGroup"
957+
"""
958+
959+
helps['datafactory private-endpoint-connection create'] = """
960+
type: command
961+
short-summary: "Approves or rejects a private endpoint connection."
962+
parameters:
963+
- name: --private-link-service-connection-state
964+
short-summary: "The state of a private link connection"
965+
long-summary: |
966+
Usage: --private-link-service-connection-state status=XX description=XX actions-required=XX
967+
968+
status: Status of a private link connection
969+
description: Description of a private link connection
970+
actions-required: ActionsRequired for a private link connection
971+
examples:
972+
- name: Approves or rejects a private endpoint connection for a factory.
973+
text: |-
974+
az datafactory private-endpoint-connection create --factory-name "exampleFactoryName" --name \
975+
"connection" --private-link-service-connection-state description="Approved by admin." actions-required="" \
976+
status="Approved" --resource-group "exampleResourceGroup"
977+
"""
978+
979+
helps['datafactory private-endpoint-connection update'] = """
980+
type: command
981+
short-summary: "Approves or rejects a private endpoint connection."
982+
parameters:
983+
- name: --private-link-service-connection-state
984+
short-summary: "The state of a private link connection"
985+
long-summary: |
986+
Usage: --private-link-service-connection-state status=XX description=XX actions-required=XX
987+
988+
status: Status of a private link connection
989+
description: Description of a private link connection
990+
actions-required: ActionsRequired for a private link connection
991+
"""
992+
993+
helps['datafactory private-endpoint-connection delete'] = """
994+
type: command
995+
short-summary: "Deletes a private endpoint connection."
996+
examples:
997+
- name: Delete a private endpoint connection for a datafactory.
998+
text: |-
999+
az datafactory private-endpoint-connection delete --factory-name "exampleFactoryName" --name \
1000+
"connection" --resource-group "exampleResourceGroup"
1001+
"""
1002+
1003+
helps['datafactory private-link-resource'] = """
1004+
type: group
1005+
short-summary: Manage private link resource with datafactory
1006+
"""
1007+
1008+
helps['datafactory private-link-resource show'] = """
1009+
type: command
1010+
short-summary: "Gets the private link resources."
1011+
examples:
1012+
- name: Get private link resources of a site
1013+
text: |-
1014+
az datafactory private-link-resource show --factory-name "exampleFactoryName" --resource-group \
1015+
"exampleResourceGroup"
1016+
"""

src/datafactory/azext_datafactory/generated/_params.py

Lines changed: 81 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@
2424
from azext_datafactory.action import (
2525
AddFactoryVstsConfiguration,
2626
AddFactoryGitHubConfiguration,
27+
AddIdentity,
28+
AddGitHubClientSecret,
29+
AddManagedVirtualNetwork,
2730
AddFolder,
2831
AddFilters,
29-
AddOrderBy
32+
AddOrderBy,
33+
AddPrivateLinkServiceConnectionState
3034
)
3135

3236

@@ -57,12 +61,33 @@ def load_arguments(self, _):
5761
'GitHub repo information.', arg_group='RepoConfiguration')
5862
c.argument('global_parameters', type=validate_file_or_dict, help='List of parameters for factory. Expected '
5963
'value: json-string/@json-file.')
64+
c.argument('public_network_access', arg_type=get_enum_type(['Enabled', 'Disabled']), help='Whether or not '
65+
'public network access is allowed for the data factory.')
66+
c.argument('key_name', type=str, help='The name of the key in Azure Key Vault to use as Customer Managed Key.',
67+
arg_group='Encryption')
68+
c.argument('vault_base_url', type=str, help='The url of the Azure Key Vault used for CMK.',
69+
arg_group='Encryption')
70+
c.argument('key_version', type=str, help='The version of the key used for CMK. If not provided, latest version '
71+
'will be used.', arg_group='Encryption')
72+
c.argument('identity', action=AddIdentity, nargs='+', help='User assigned identity to use to authenticate to '
73+
'customer\'s key vault. If not provided Managed Service Identity will be used.',
74+
arg_group='Encryption')
75+
c.argument('type_', options_list=['--type'], arg_type=get_enum_type(['SystemAssigned', 'UserAssigned',
76+
'SystemAssigned,UserAssigned']),
77+
help='The identity type.', arg_group='Identity')
78+
c.argument('user_assigned_identities', type=validate_file_or_dict, help='List of user assigned identities for '
79+
'the factory. Expected value: json-string/@json-file.', arg_group='Identity')
6080

6181
with self.argument_context('datafactory update') as c:
6282
c.argument('resource_group_name', resource_group_name_type)
6383
c.argument('factory_name', options_list=['--name', '-n', '--factory-name'], type=str, help='The factory name.',
6484
id_part='name')
6585
c.argument('tags', tags_type)
86+
c.argument('type_', options_list=['--type'], arg_type=get_enum_type(['SystemAssigned', 'UserAssigned',
87+
'SystemAssigned,UserAssigned']),
88+
help='The identity type.', arg_group='Identity')
89+
c.argument('user_assigned_identities', type=validate_file_or_dict, help='List of user assigned identities for '
90+
'the factory. Expected value: json-string/@json-file.', arg_group='Identity')
6691

6792
with self.argument_context('datafactory delete') as c:
6893
c.argument('resource_group_name', resource_group_name_type)
@@ -98,6 +123,8 @@ def load_arguments(self, _):
98123
id_part='name')
99124
c.argument('git_hub_access_code', type=str, help='GitHub access code.')
100125
c.argument('git_hub_client_id', type=str, help='GitHub application client ID.')
126+
c.argument('git_hub_client_secret', action=AddGitHubClientSecret, nargs='+', help='GitHub bring your own app '
127+
'client secret information.')
101128
c.argument('git_hub_access_token_base_url', type=str, help='GitHub access token base URL.')
102129

103130
with self.argument_context('datafactory integration-runtime list') as c:
@@ -133,6 +160,8 @@ def load_arguments(self, _):
133160
c.argument('if_match', type=str, help='ETag of the integration runtime entity. Should only be specified for '
134161
'update, for which it should match existing entity or can be * for unconditional update.')
135162
c.argument('description', type=str, help='Integration runtime description.')
163+
c.argument('managed_virtual_network', action=AddManagedVirtualNetwork, nargs='+', help='Managed Virtual '
164+
'Network reference.')
136165
c.argument('compute_properties', type=validate_file_or_dict, help='The compute resource for managed '
137166
'integration runtime. Expected value: json-string/@json-file.', arg_group='Type Properties')
138167
c.argument('ssis_properties', type=validate_file_or_dict, help='SSIS properties for managed integration '
@@ -386,8 +415,7 @@ def load_arguments(self, _):
386415
with self.argument_context('datafactory pipeline update') as c:
387416
c.argument('resource_group_name', resource_group_name_type)
388417
c.argument('factory_name', type=str, help='The factory name.', id_part='name')
389-
c.argument('pipeline_name', options_list=['--name', '-n', '--pipeline-name'], type=str, help='The pipeline '
390-
'name.', id_part='child_name_1')
418+
c.argument('pipeline_name', type=str, help='The pipeline name.', id_part='child_name_1')
391419
c.argument('if_match', type=str, help='ETag of the pipeline entity. Should only be specified for update, for '
392420
'which it should match existing entity or can be * for unconditional update.')
393421
c.argument('description', type=str, help='The description of the pipeline.')
@@ -404,8 +432,7 @@ def load_arguments(self, _):
404432
'json-string/@json-file.')
405433
c.argument('duration', type=validate_file_or_dict, help='TimeSpan value, after which an Azure Monitoring '
406434
'Metric is fired. Expected value: json-string/@json-file.', arg_group='Policy Elapsed Time Metric')
407-
c.argument('folder_name', type=str, help='The name of the folder that this Pipeline is in.',
408-
arg_group='Folder')
435+
c.argument('name', type=str, help='The name of the folder that this Pipeline is in.', arg_group='Folder')
409436
c.ignore('pipeline')
410437

411438
with self.argument_context('datafactory pipeline delete') as c:
@@ -578,3 +605,52 @@ def load_arguments(self, _):
578605
c.argument('factory_name', type=str, help='The factory name.', id_part='name')
579606
c.argument('trigger_name', type=str, help='The trigger name.', id_part='child_name_1')
580607
c.argument('run_id', type=str, help='The pipeline run identifier.', id_part='child_name_2')
608+
609+
with self.argument_context('datafactory private-end-point-connection list') as c:
610+
c.argument('resource_group_name', resource_group_name_type)
611+
c.argument('factory_name', type=str, help='The factory name.')
612+
613+
with self.argument_context('datafactory private-endpoint-connection show') as c:
614+
c.argument('resource_group_name', resource_group_name_type)
615+
c.argument('factory_name', type=str, help='The factory name.', id_part='name')
616+
c.argument('private_endpoint_connection_name', options_list=['--name', '-n', '--private-endpoint-connection-nam'
617+
'e'], type=str, help='The private endpoint '
618+
'connection name.', id_part='child_name_1')
619+
c.argument('if_none_match', type=str, help='ETag of the private endpoint connection entity. Should only be '
620+
'specified for get. If the ETag matches the existing entity tag, or if * was provided, then no '
621+
'content will be returned.')
622+
623+
with self.argument_context('datafactory private-endpoint-connection create') as c:
624+
c.argument('resource_group_name', resource_group_name_type)
625+
c.argument('factory_name', type=str, help='The factory name.')
626+
c.argument('private_endpoint_connection_name', options_list=['--name', '-n', '--private-endpoint-connection-nam'
627+
'e'], type=str, help='The private endpoint '
628+
'connection name.')
629+
c.argument('if_match', type=str, help='ETag of the private endpoint connection entity. Should only be '
630+
'specified for update, for which it should match existing entity or can be * for unconditional '
631+
'update.')
632+
c.argument('private_link_service_connection_state', action=AddPrivateLinkServiceConnectionState, nargs='+',
633+
help='The state of a private link connection')
634+
635+
with self.argument_context('datafactory private-endpoint-connection update') as c:
636+
c.argument('resource_group_name', resource_group_name_type)
637+
c.argument('factory_name', type=str, help='The factory name.', id_part='name')
638+
c.argument('private_endpoint_connection_name', options_list=['--name', '-n', '--private-endpoint-connection-nam'
639+
'e'], type=str, help='The private endpoint '
640+
'connection name.', id_part='child_name_1')
641+
c.argument('if_match', type=str, help='ETag of the private endpoint connection entity. Should only be '
642+
'specified for update, for which it should match existing entity or can be * for unconditional '
643+
'update.')
644+
c.argument('private_link_service_connection_state', action=AddPrivateLinkServiceConnectionState, nargs='+',
645+
help='The state of a private link connection')
646+
647+
with self.argument_context('datafactory private-endpoint-connection delete') as c:
648+
c.argument('resource_group_name', resource_group_name_type)
649+
c.argument('factory_name', type=str, help='The factory name.', id_part='name')
650+
c.argument('private_endpoint_connection_name', options_list=['--name', '-n', '--private-endpoint-connection-nam'
651+
'e'], type=str, help='The private endpoint '
652+
'connection name.', id_part='child_name_1')
653+
654+
with self.argument_context('datafactory private-link-resource show') as c:
655+
c.argument('resource_group_name', resource_group_name_type)
656+
c.argument('factory_name', type=str, help='The factory name.', id_part='name')

0 commit comments

Comments
 (0)