Skip to content
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

Compatible with two methods to obtaining azlogin credentials #1364

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Compatible with two methods to obtaining azlogin credentials #1364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions plugins/module_utils/azure_rm_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def default_api_version(self):
from azure.mgmt.datafactory import DataFactoryManagementClient
import azure.mgmt.datafactory.models as DataFactoryModel
from azure.identity._credentials import client_secret, user_password, certificate, managed_identity
# from azure.identity import AzureCliCredential
from azure.identity import AzureCliCredential
from msgraph import GraphServiceClient

except ImportError as exc:
Expand Down Expand Up @@ -1586,9 +1586,9 @@ def _get_azure_cli_credentials(self, subscription_id=None, resource=None):
subscription_id=subscription_id)
cloud_environment = get_cli_active_cloud()

# az_cli = AzureCliCredential()
az_cli = AzureCliCredential()
cli_credentials = {
'credentials': cred,
'credentials': az_cli if self.is_ad_resource else cred,
'subscription_id': subscription_id,
'cloud_environment': cloud_environment
}
Expand Down