Skip to content

update based on feedback #1

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
fengzhou-msft merged 2 commits into from
Jun 21, 2021
Merged

update based on feedback #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae600d8
update based on feedback
00Kai0 Jun 15, 2021
dbb23a3
add some checks
00Kai0 Jun 21, 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
24 changes: 18 additions & 6 deletions src/confluent/azext_confluent/manual/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def confluent_organization_create(cmd,
no_wait=False):
import jwt
from azure.cli.core._profile import Profile
from azure.cli.core.azclierror import UnauthorizedError
from azure.cli.command_modules.role.custom import list_role_assignments

token_info = Profile(cli_ctx=cmd.cli_ctx).get_raw_token()[0][2]
Expand All @@ -36,15 +37,15 @@ def confluent_organization_create(cmd,
body['user_detail']['last_name'] = decode['family_name']
body['user_detail']['email_address'] = decode['email'] if 'email' in decode else decode['unique_name']
except KeyError as ex:
raise Exception(f'Cannot create the organization as CLI cannot get the right value for {str(ex)} from access '
raise UnauthorizedError(f'Cannot create the organization as CLI cannot get the right value for {str(ex)} from access '
'token.') from ex

# Check owner or contributor role of subscription
user_object_id = decode['oid']
role_assignments = list_role_assignments(cmd, assignee=user_object_id, role='Owner') + \
list_role_assignments(cmd, assignee=user_object_id, role='Contributor')
if not role_assignments:
raise Exception('You must have Owner or Contributor role of the subscription to create an organization.')
raise UnauthorizedError('You must have Owner or Contributor role of the subscription to create an organization.')

body['tags'] = tags
body['location'] = location
Expand Down Expand Up @@ -75,7 +76,9 @@ def confluent_organization_delete(client,
'- Stop billing for the selected Confluent organization through Azure Marketplace.\n' \
'Do you want to proceed'

if org.offer_detail.plan_id.lower() == 'commit':
if org.offer_detail.plan_id in ['confluent-cloud-azure-payg-prod', 'confluent-cloud-azure-payg-stag']:
user_confirmation(default_msg)
else:
user_confirmation('- The action cannot be undone and will permanently delete this resource.\n'
'- Resource deletion is a permanent action. All the resources, contract purchased '
'and its Azure integration will be permanently deleted and will unsubscribe you '
Expand All @@ -90,8 +93,6 @@ def confluent_organization_delete(client,
'deletion process and timeline, please contact Confluent Support: '
'https://support.confluent.io/\n'
'Do you want to proceed')
else:
user_confirmation(default_msg)

return sdk_no_wait(no_wait,
client.begin_delete,
Expand All @@ -109,9 +110,20 @@ def confluent_offer_detail_show(cmd, publisher_id=None, offer_id=None):
plans = response.json()['plans']
plans = [{'planId': plan['planId'],
'planName': plan['displayName'],
'termUnits':[item for a in plan['availabilities'] for item in a['terms']]
'offerId': offer_id,
'publisherId': publisher_id,
'termUnits':[{
'price': item['price'],
'termDescription': item['termDescription'],
'termUnits': item['termUnits']
} for a in plan['availabilities'] for item in a['terms']]
} for plan in plans]
except KeyError as ex:
raise ArgumentUsageError('Not able to get offer details for the provided publisher id and offer id.') from ex

for plan in plans:
for term in plan['termUnits']:
if term['termUnits'] not in ['P1M', 'P1Y']:
del term['termUnits']

return plans
12 changes: 6 additions & 6 deletions src/confluent/azext_confluent/tests/latest/test_confluent_scenario_coverage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
|Scenario|Result|ErrorMessage|ErrorStack|ErrorNormalized|StartDt|EndDt|
|step_terms_list|successed||||2021-05-24 07:38:55.834022|2021-05-24 07:38:55.963383|
|step_organization_show|successed||||2021-05-24 07:38:56.149089|2021-05-24 07:38:56.202278|
|step_organization_list|successed||||2021-05-24 07:38:56.202490|2021-05-24 07:38:56.259075|
|step_organization_list2|successed||||2021-05-24 07:38:56.259292|2021-05-24 07:38:56.313915|
|step_organization_update|successed||||2021-05-24 07:38:56.314167|2021-05-24 07:38:56.367895|
|step_organization_delete|successed||||2021-05-24 07:38:56.368122|2021-05-24 07:38:56.538469|
|step_terms_list|successed||||2021-06-15 09:17:45.214872|2021-06-15 09:17:45.372821|
|step_organization_show|successed||||2021-06-15 09:17:45.680822|2021-06-15 09:17:45.774822|
|step_organization_list|successed||||2021-06-15 09:17:45.774822|2021-06-15 09:17:45.869822|
|step_organization_list2|successed||||2021-06-15 09:17:45.869822|2021-06-15 09:17:45.962821|
|step_organization_update|successed||||2021-06-15 09:17:45.962821|2021-06-15 09:17:46.060822|
|step_organization_delete|successed||||2021-06-15 09:17:46.060822|2021-06-15 09:17:46.280822|
Coverage: 6/6