Skip to content

fetching tenantID from subscription object instead of graph client (to pickup tenant Id of sub where cc is getting created instead of user/spn's tenant) #4336

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
zhoxing-ms merged 4 commits into from
Jan 25, 2022
Merged

fetching tenantID from subscription object instead of graph client (to pickup tenant Id of sub where cc is getting created instead of user/spn's tenant) #4336

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2101654
Fetch the tenant ID from the subscription object instead of graphclient
sikasire Jan 19, 2022
d8be9c4
nit
sikasire Jan 19, 2022
3d7bad5
nit
sikasire Jan 19, 2022
5c0c98e
revert proxy tenantid change
sikasire Jan 24, 2022
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
5 changes: 5 additions & 0 deletions src/connectedk8s/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

Release History
===============
1.2.3
++++++

* Fetching the tenantID from subscription object instead of graphclient

1.2.2
++++++

Expand Down
15 changes: 6 additions & 9 deletions src/connectedk8s/azext_connectedk8s/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,14 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, https_pr
disable_auto_upgrade=False, cl_oid=None, onboarding_timeout="600"):
logger.warning("This operation might take a while...\n")

# Setting subscription id
# Setting subscription id and tenant Id
subscription_id = get_subscription_id(cmd.cli_ctx)
account = Profile().get_subscription(subscription_id)
onboarding_tenant_id = account['homeTenantId']

# Send cloud information to telemetry
azure_cloud = send_cloud_telemetry(cmd)

# Fetching Tenant Id
graph_client = _graph_client_factory(cmd.cli_ctx)
onboarding_tenant_id = graph_client.config.tenant_id

# Checking provider registration status
utils.check_provider_registrations(cmd.cli_ctx)

Expand Down Expand Up @@ -1718,11 +1716,10 @@ def client_side_proxy_wrapper(cmd,
# if service account token is not passed
if token is None:
# Identifying type of logged in entity
account = get_subscription_id(cmd.cli_ctx)
account = Profile().get_subscription(account)
subscription_id = get_subscription_id(cmd.cli_ctx)
account = Profile().get_subscription(subscription_id)
user_type = account['user']['type']

tenantId = _graph_client_factory(cmd.cli_ctx).config.tenant_id
tenantId = account['homeTenantId']

if user_type == 'user':
dict_file = {'server': {'httpPort': int(client_proxy_port), 'httpsPort': int(api_server_port)}, 'identity': {'tenantID': tenantId, 'clientID': consts.CLIENTPROXY_CLIENT_ID}}
Expand Down
2 changes: 1 addition & 1 deletion src/connectedk8s/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# TODO: Confirm this is the right version number you want and it matches your
# HISTORY.rst entry.

VERSION = '1.2.2'
VERSION = '1.2.3'

# The full list of classifiers is available at
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
Expand Down