Skip to content

{HDInsight}Hdi migrate Microsoft.Azure.Graph to MicrosoftGraph#17219

Merged
BethanyZhou merged 5 commits intoAzure:mainfrom
aim-for-better:HdiMigrate2MSGraph
Mar 1, 2022
Merged

{HDInsight}Hdi migrate Microsoft.Azure.Graph to MicrosoftGraph#17219
BethanyZhou merged 5 commits intoAzure:mainfrom
aim-for-better:HdiMigrate2MSGraph

Conversation

@aim-for-better
Copy link
Copy Markdown
Member

@aim-for-better aim-for-better commented Feb 22, 2022 •
edited
Loading

Description

Migrate Microsoft.Azure.Graph to MicrosoftGraph

Checklist

  • I have read the Submitting Changes section of CONTRIBUTING.md
  • The title of the PR is clear and informative
  • The appropriate ChangeLog.md file(s) has been updated:
    • For any service, the ChangeLog.md file can be found at src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md
    • A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header -- no new version header should be added
  • The PR does not introduce breaking changes
  • If applicable, the changes made in the PR have proper test coverage
  • For public API changes to cmdlets:
    • a cmdlet design review was approved for the changes in this repository (Microsoft internal only)
      • {Please put the link here}
    • the markdown help files have been regenerated using the commands listed here

@isra-fel isra-fel self-assigned this Feb 22, 2022
isra-fel
isra-fel requested changes Feb 28, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@isra-fel isra-fel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please put the following content in the help document of NewAzureHDInsightClusterCommand:

The cmdlet may call below Microsoft Graph API according to input parameters:

GET /servicePrincipals/{id}

src/HDInsight/HDInsight/ChangeLog.md Outdated
- Additional information about change #1
-->
## Upcoming Release
This release migrates Microsoft.Azure.Graph SDK to MicrsoftGraph SDK, there is not customer impact.
Copy link
Copy Markdown
Member

@isra-fel isra-fel Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This migration might have impact on customers because the permission required to call AAD graph and MS graph APIs are different.

Suggested change
This release migrates Microsoft.Azure.Graph SDK to MicrsoftGraph SDK, there is not customer impact.
This release migrates Microsoft.Azure.Graph SDK to MicrsoftGraph SDK.

Copy link
Copy Markdown
Member Author

@aim-for-better aim-for-better Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs Outdated
try
{
sp = graphClient.ServicePrincipals.Get(ObjectId.ToString());
sp = graphClient.ServicePrincipals.GetServicePrincipalWithHttpMessagesAsync(ObjectId.ToString()).Result.Body;//graphClient.ServicePrincipals.Get(ObjectId.ToString());
Copy link
Copy Markdown
Member

@isra-fel isra-fel Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use this extension method to simplify code: https://github.com/Azure/azure-powershell-common/blob/main/src/Graph.Rbac/MicrosoftGraph/Version1_0/Applications/ServicePrincipalsOperationsExtensions.cs#L210

Suggested change
sp = graphClient.ServicePrincipals.GetServicePrincipalWithHttpMessagesAsync(ObjectId.ToString()).Result.Body;//graphClient.ServicePrincipals.Get(ObjectId.ToString());
sp = graphClient.ServicePrincipals.GetServicePrincipal(ObjectId.ToString());

Copy link
Copy Markdown
Member Author

@aim-for-better aim-for-better Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs Outdated
{
string errorMessage = e.Message + ". Please specify Application Id explicitly by providing ApplicationId parameter and retry.";
throw new Microsoft.Azure.Graph.RBAC.Version1_6.Models.GraphErrorException(errorMessage);
throw new Exception(errorMessage);
Copy link
Copy Markdown
Member

@isra-fel isra-fel Feb 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use AzPSArgumentException so we can get detailed telemetry data.

Copy link
Copy Markdown
Member Author

@aim-for-better aim-for-better Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

@aim-for-better aim-for-better requested a review from isra-fel March 1, 2022 03:04
@aim-for-better
Copy link
Copy Markdown
Member Author

aim-for-better commented Mar 1, 2022

Hi @isra-fel Thanks for your review, I have updated the PR.

@aim-for-better
Copy link
Copy Markdown
Member Author

aim-for-better commented Mar 1, 2022

Please put the following content in the help document of NewAzureHDInsightClusterCommand:

The cmdlet may call below Microsoft Graph API according to input parameters:

GET /servicePrincipals/{id}

Added

aim-for-better
aim-for-better commented Mar 1, 2022
View reviewed changes
src/HDInsight/HDInsight/help/New-AzHDInsightCluster.md

The cmdlet may call below Microsoft Graph API according to input parameters:

- GET /servicePrincipals/{id}
Copy link
Copy Markdown
Member Author

@aim-for-better aim-for-better Mar 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in the help doc

@isra-fel
Copy link
Copy Markdown
Member

isra-fel commented Mar 1, 2022

/azp run azure-powershell - security-tools

@azure-pipelines
Copy link
Copy Markdown
Contributor

azure-pipelines bot commented Mar 1, 2022

Azure Pipelines successfully started running 1 pipeline(s).

@BethanyZhou BethanyZhou merged commit fbc35fd into Azure:main Mar 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@isra-fel isra-fel isra-fel approved these changes

Assignees

@BethanyZhou BethanyZhou

Labels

Waiting for CI :shipit:

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@aim-for-better @isra-fel @BethanyZhou