Skip to content

Commit c92e279

Browse files
pdaruPankil Daru
andauthored
[fleet] sdk version upgrade and fixed strings (#5413)
* match swagger summary * upgrade sdk version to 2022-07-02-preview * use snake style * update tests * new release version * fix location help text * fix test Co-authored-by: Pankil Daru <[email protected]>
1 parent 60fb167 commit c92e279

File tree

71 files changed

+20942
-13793
lines changed

Some content is hidden

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

71 files changed

+20942
-13793
lines changed

src/fleet/HISTORY.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,9 @@ Release History
55

66
0.1.0
77
++++++
8-
* Initial release.
8+
* Initial release.
9+
10+
0.1.1
11+
++++++
12+
* Upgrade SDK version to 2022-07-02-preview
13+
* Bug fixes

src/fleet/azext_fleet/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def register_fleet_resource_type():
1515
register_resource_type(
1616
"latest",
1717
CUSTOM_MGMT_FLEET,
18-
SDKProfile("2022-06-02-preview", {"container_services": "2017-07-01"}),
18+
SDKProfile("2022-07-02-preview", {"container_services": "2017-07-01"}),
1919
)
2020

2121

src/fleet/azext_fleet/_help.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
helps['fleet create'] = """
1616
type: command
17-
short-summary: Create a new fleet.
17+
short-summary: Creates or updates a Fleet.
1818
parameters:
1919
- name: --tags
2020
type: string
@@ -27,7 +27,7 @@
2727

2828
helps['fleet update'] = """
2929
type: command
30-
short-summary: Update an existing fleet.
30+
short-summary: Patches a fleet resource.
3131
parameters:
3232
- name: --tags
3333
type: string
@@ -36,22 +36,22 @@
3636

3737
helps['fleet show'] = """
3838
type: command
39-
short-summary: Get an existing fleet.
39+
short-summary: Gets a Fleet.
4040
"""
4141

4242
helps['fleet list'] = """
4343
type: command
44-
short-summary: List fleet by resource group & subscription id.
44+
short-summary: Lists fleets in the specified subscription and resource group.
4545
"""
4646

4747
helps['fleet delete'] = """
4848
type: command
49-
short-summary: Delete an existing fleet.
49+
short-summary: Deletes a Fleet.
5050
"""
5151

5252
helps['fleet get-credentials'] = """
5353
type: command
54-
short-summary: List fleet kubeconfig credentials
54+
short-summary: Lists the user credentials of a Fleet.
5555
parameters:
5656
- name: --overwrite-existing
5757
type: bool
@@ -74,7 +74,7 @@
7474

7575
helps['fleet member create'] = """
7676
type: command
77-
short-summary: Join member cluster to a fleet.
77+
short-summary: Creates or updates a fleet member.
7878
parameters:
7979
- name: --member-cluster-id
8080
type: string
@@ -83,17 +83,17 @@
8383

8484
helps['fleet member list'] = """
8585
type: command
86-
short-summary: List member cluster(s) of a fleet.
86+
short-summary: Lists the members of a fleet.
8787
"""
8888

8989
helps['fleet member show'] = """
9090
type: command
91-
short-summary: Get member cluster of a fleet.
91+
short-summary: Gets a Fleet member.
9292
"""
9393

9494
helps['fleet member delete'] = """
9595
type: command
96-
short-summary: Remove member cluster from a fleet
96+
short-summary: Deletes a fleet member.
9797
"""
9898

9999
helps['fleet member wait'] = """

src/fleet/azext_fleet/_params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def load_arguments(self, _):
1919

2020
with self.argument_context('fleet') as c:
2121
c.argument('name', options_list=['--name', '-n'], help='Specify the fleet name.')
22-
c.argument('location', get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group, help='aaa')
22+
c.argument('location', get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group)
2323

2424
with self.argument_context('fleet create') as c:
2525
c.argument('tags', tags_type)

src/fleet/azext_fleet/custom.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ def create_fleet(cmd,
2323
location=None,
2424
tags=None,
2525
no_wait=False):
26-
FleetHubProfile = cmd.get_models(
26+
fleet_hub_profile_model = cmd.get_models(
2727
"FleetHubProfile",
2828
resource_type=CUSTOM_MGMT_FLEET,
2929
operation_group="fleets"
3030
)
31-
Fleet = cmd.get_models(
31+
fleet_model = cmd.get_models(
3232
"Fleet",
3333
resource_type=CUSTOM_MGMT_FLEET,
3434
operation_group="fleets"
@@ -42,11 +42,11 @@ def create_fleet(cmd,
4242
resource_group_part = re.sub('[^A-Za-z0-9-]', '', resource_group_name)[0:16]
4343
dns_name_prefix = f'{name_part}-{resource_group_part}-{subscription_id[0:6]}'
4444

45-
fleetHubProfile = FleetHubProfile(dns_prefix=dns_name_prefix)
46-
fleet = Fleet(
45+
fleet_hub_profile = fleet_hub_profile_model(dns_prefix=dns_name_prefix)
46+
fleet = fleet_model(
4747
location=location,
4848
tags=tags,
49-
hub_profile=fleetHubProfile
49+
hub_profile=fleet_hub_profile
5050
)
5151

5252
return sdk_no_wait(no_wait, client.begin_create_or_update, resource_group_name, name, fleet)
@@ -57,13 +57,13 @@ def update_fleet(cmd,
5757
resource_group_name,
5858
name,
5959
tags=None):
60-
FleetPatch = cmd.get_models(
60+
fleet_patch_model = cmd.get_models(
6161
"FleetPatch",
6262
resource_type=CUSTOM_MGMT_FLEET,
6363
operation_group="fleets"
6464
)
65-
fleetPatch = FleetPatch(tags=tags)
66-
return client.update(resource_group_name, name, None, fleetPatch)
65+
fleet_patch = fleet_patch_model(tags=tags)
66+
return client.update(resource_group_name, name, None, fleet_patch)
6767

6868

6969
def show_fleet(cmd, # pylint: disable=unused-argument
@@ -97,12 +97,12 @@ def get_credentials(cmd, # pylint: disable=unused-argument
9797
'~'), '.kube', 'config'),
9898
overwrite_existing=False,
9999
context_name=None):
100-
credentialResults = client.list_credentials(resource_group_name, name)
101-
if not credentialResults:
100+
credential_results = client.list_credentials(resource_group_name, name)
101+
if not credential_results:
102102
raise CLIError("No Kubernetes credentials found.")
103103

104104
try:
105-
kubeconfig = credentialResults.kubeconfigs[0].value.decode(
105+
kubeconfig = credential_results.kubeconfigs[0].value.decode(
106106
encoding='UTF-8')
107107
print_or_merge_credentials(
108108
path, kubeconfig, overwrite_existing, context_name)
@@ -117,13 +117,13 @@ def create_fleet_member(cmd,
117117
fleet_name,
118118
member_cluster_id,
119119
no_wait=False):
120-
FleetMember = cmd.get_models(
120+
fleet_member_model = cmd.get_models(
121121
"FleetMember",
122122
resource_type=CUSTOM_MGMT_FLEET,
123123
operation_group="fleet_members"
124124
)
125-
fleetMember = FleetMember(cluster_resource_id=member_cluster_id)
126-
return sdk_no_wait(no_wait, client.begin_create_or_update, resource_group_name, fleet_name, name, fleetMember)
125+
fleet_member = fleet_member_model(cluster_resource_id=member_cluster_id)
126+
return sdk_no_wait(no_wait, client.begin_create_or_update, resource_group_name, fleet_name, name, fleet_member)
127127

128128

129129
def list_fleet_member(cmd, # pylint: disable=unused-argument

0 commit comments

Comments
 (0)