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.

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

Removed unused definition of ResourceIdentityWithUserAssignedIdentities #15027

Merged
merged 2 commits into from
Jul 14, 2021

Conversation

alswanso
Copy link
Contributor

@alswanso alswanso commented Jun 29, 2021

Removed unused definition of ResourceIdentityWithUserAssignedIdentities in servers.json and ManagedInstances.json
These definition have been moved to common/v2/types.json in a previous pr and these definitions don't get used.
These definition are blocking making a change to IdentityTypes in types.json.

MSFT employees can try out our new experience at OpenAPI Hub - one location for using our validation tools and finding your workflow.

Changelog

Please ensure to add changelog with this PR by answering the following questions.

  1. What's the purpose of the update?
    • new service onboarding
    • new API version
    • update existing version for new feature
    • update existing version to fix swagger quality issue in s360
    • Other, please clarify
  2. When you are targeting to deploy new service/feature to public regions? Please provide date, or month to public if date is not available yet.
  3. When you expect to publish swagger? Please provide date, or month to public if date is not available yet.
  4. If it's an update to existing version, please select SDKs of specific language and CLIs that require refresh after swagger is published.
    • SDK of .NET (need service team to ensure code readiness)
    • SDK of Python
    • SDK of Java
    • SDK of Js
    • SDK of Go
    • PowerShell
    • CLI
    • Terraform
    • No, no need to refresh for updates in this PR

Contribution checklist:

If any further question about AME onboarding or validation tools, please view the FAQ.

ARM API Review Checklist

  • Ensure to check this box if one of the following scenarios meet updates in the PR, so that label “WaitForARMFeedback” will be added automatically to involve ARM API Review. Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs, all “removals” and “adding a new property” no more require ARM API review.

    • Adding new API(s)
    • Adding a new API version
    • Ensure to copy the existing version into new directory structure for first commit (including refactoring) and then push new changes including version updates in separate commits. This is required to review the changes efficiently.
    • Adding a new service
  • Please ensure you've reviewed following guidelines including ARM resource provider contract and REST guidelines. Estimated time (4 hours). This is required before you can request review from ARM API Review board.

  • If you are blocked on ARM review and want to get the PR merged with urgency, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them.

Breaking Change Review Checklist

If there are following updates in the PR, ensure to request an approval from Breaking Change Review Board as defined in the Breaking Change Policy.

  • Removing API(s) in stable version
  • Removing properties in stable version
  • Removing API version(s) in stable version
  • Updating API in stable or public preview version with Breaking Change Validation errors
  • Updating API(s) in public preview over 1 year (refer to Retirement of Previews)

Action: to initiate an evaluation of the breaking change, create a new intake using the template for breaking changes. Addition details on the process and office hours are on the Breaking change Wiki.

Please follow the link to find more details on PR review process.

…es in servers.json and ManagedInstances.json
@alswanso alswanso requested a review from bcham as a code owner June 29, 2021 22:27
@openapi-workflow-bot
Copy link

Hi, @alswanso Thanks for your PR. I am workflow bot for review process. Here are some small tips.

  • Please ensure to do self-check against checklists in first PR comment.
  • PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging.
  • For specs comparison cross API versions, Use API Specs Comparison Report Generator
  • If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. How to fix?

  • Any feedback about review process or workflow bot, pls contact swagger and tools team. [email protected]

    @openapi-workflow-bot
    Copy link

    [Call for Action] To better understand Azure service dev/test scenario, and support Azure service developer better on Swagger and REST API related tests in early phase, please help to fill in with this survey https://aka.ms/SurveyForEarlyPhase. It will take 5 to 10 minutes. If you already complete survey, please neglect this comment. Thanks.

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Jun 29, 2021

    Swagger Validation Report

    ️️✔️BreakingChange succeeded [Detail] [Expand]
    There are no breaking changes.
    ️️✔️LintDiff succeeded [Detail] [Expand]
    Validation passes for LintDiff.
    ️️✔️Avocado succeeded [Detail] [Expand]
    Validation passes for Avocado.
    ️️✔️ModelValidation succeeded [Detail] [Expand]
    Validation passes for ModelValidation.
    ️️✔️SemanticValidation succeeded [Detail] [Expand]
    Validation passes for SemanticValidation.
    ️️✔️Cross-Version Breaking Changes succeeded [Detail] [Expand]
    There are no breaking changes.
    ️️✔️CredScan succeeded [Detail] [Expand]
    There is no credential detected.
    ️️✔️[Staging] SDK Track2 Validation succeeded [Detail] [Expand]
    Validation passes for SDKTrack2Validation
    ️️✔️[Staging] PrettierCheck succeeded [Detail] [Expand]
    Validation passes for PrettierCheck.
    ️️✔️[Staging] SpellCheck succeeded [Detail] [Expand]
    Validation passes for SpellCheck.
    ️️✔️[Staging] Lint(RPaaS) succeeded [Detail] [Expand]
    Validation passes for Lint(RPaaS).
    Posted by Swagger Pipeline | How to fix these errors?

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Jun 29, 2021

    Swagger Generation Artifacts

    ️️✔️[Staging] ApiDocPreview succeeded [Detail] [Expand]
    ️⌛[Staging] SDK Breaking Change Tracking pending [Detail]
    ️️✔️ azure-sdk-for-net succeeded [Detail] [Expand]
    ️⚠️ azure-sdk-for-python warning [Detail]
    • ⚠️Warning [Logs]Release - Generate from cc268fe. SDK Automation 14.0.0
      command	sh scripts/automation_init.sh ../azure-sdk-for-python_tmp/initInput.json ../azure-sdk-for-python_tmp/initOutput.json
      cmderr	[automation_init.sh] ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.
      cmderr	[automation_init.sh] azure-mgmt-core 1.3.0 requires azure-core<2.0.0,>=1.15.0, but you have azure-core 1.6.0 which is incompatible.
      cmderr	[automation_init.sh] ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.
      cmderr	[automation_init.sh] azure-mgmt-core 1.3.0 requires azure-core<2.0.0,>=1.15.0, but you have azure-core 1.6.0 which is incompatible.
      cmderr	[automation_init.sh] WARNING: Skipping azure-nspkg as it is not installed.
      command	sh scripts/automation_generate.sh ../azure-sdk-for-python_tmp/generateInput.json ../azure-sdk-for-python_tmp/generateOutput.json
    • ️✔️azure-mgmt-sql [View full logs]  [Release SDK Changes]
      info	[Changelog]
    ️⚠️ azure-sdk-for-python-track2 warning [Detail]
    • ⚠️Warning [Logs]Release - Generate from cc268fe. SDK Automation 14.0.0
      command	sh scripts/automation_init.sh ../azure-sdk-for-python_tmp/initInput.json ../azure-sdk-for-python_tmp/initOutput.json
      cmderr	[automation_init.sh] WARNING: Skipping azure-nspkg as it is not installed.
      command	sh scripts/automation_generate.sh ../azure-sdk-for-python_tmp/generateInput.json ../azure-sdk-for-python_tmp/generateOutput.json
    • ️✔️track2_azure-mgmt-sql [View full logs]  [Release SDK Changes]
      info	[Changelog]
    ️⚠️ azure-sdk-for-java warning [Detail]
    • ⚠️Warning [Logs]Release - Generate from cc268fe. SDK Automation 14.0.0
      command	./eng/mgmt/automation/init.sh ../azure-sdk-for-java_tmp/initInput.json ../azure-sdk-for-java_tmp/initOutput.json
      command	./eng/mgmt/automation/generate.py ../azure-sdk-for-java_tmp/generateInput.json ../azure-sdk-for-java_tmp/generateOutput.json
      cmderr	[generate.py] 2021-07-15 09:15:22 INFO [VERSION][Not Found] cannot find version for "com.azure.resourcemanager:azure-resourcemanager-sql-generated"
      cmderr	[generate.py] 2021-07-15 09:15:22 INFO [VERSION][Not Found] cannot find stable version, current version "1.0.0-beta.1"
      cmderr	[generate.py] 2021-07-15 09:15:22 INFO autorest --version=3.4.5 --use=@autorest/[email protected] --java.azure-libraries-for-java-folder=/home/vsts/work/1/s/azure-sdk-for-java --java.output-folder=/home/vsts/work/1/s/azure-sdk-for-java/sdk/sql/azure-resourcemanager-sql-generated --java.namespace=com.azure.resourcemanager.sql.generated   --java --pipeline.modelerfour.additional-checks=false --pipeline.modelerfour.lenient-model-deduplication=true --azure-arm --verbose --sdk-integration --fluent=lite --java.fluent=lite --java.license-header=MICROSOFT_MIT_SMALL  ../azure-rest-api-specs/specification/sql/resource-manager/readme.md
      cmderr	[generate.py] 2021-07-15 09:19:05 INFO [CI][Success] Write to ci.yml
      cmderr	[generate.py] 2021-07-15 09:19:05 INFO [POM][Process] dealing with pom.xml
      cmderr	[generate.py] 2021-07-15 09:19:05 INFO [POM][Skip] pom already has module azure-resourcemanager-sql-generated
      cmderr	[generate.py] 2021-07-15 09:19:05 INFO [POM][Success] Write to pom.xml
      cmderr	[generate.py] 2021-07-15 09:19:05 INFO [POM][Process] dealing with root pom
      cmderr	[generate.py] 2021-07-15 09:19:05 INFO [POM][Success] Write to root pom
    • ️✔️azure-resourcemanager-sql-generated [View full logs]  [Release SDK Changes]
      cmderr	[Inst] 2021-07-15 09:23:58 DEBUG Got artifact_id: azure-resourcemanager-sql-generated
      cmderr	[Inst] 2021-07-15 09:23:58 DEBUG Got artifact: pom.xml
      cmderr	[Inst] 2021-07-15 09:23:58 DEBUG Got artifact: azure-resourcemanager-sql-generated-1.0.0-beta.1.jar
      cmderr	[Inst] 2021-07-15 09:23:58 DEBUG Match jar package: azure-resourcemanager-sql-generated-1.0.0-beta.1.jar
      cmderr	[Inst] 2021-07-15 09:23:58 DEBUG output: {"full": "```sh\ncurl -L \"https://portal.azure-devex-tools.com/api/sdk-dl-pub?p=Azure/15027/azure-sdk-for-java/azure-resourcemanager-sql-generated/azure-resourcemanager-sql-generated-1.0.0-beta.1.jar\" -o azure-resourcemanager-sql-generated-1.0.0-beta.1.jar\nmvn install:install-file -DgroupId=com.azure.resourcemanager -DartifactId=azure-resourcemanager-sql-generated -Dversion=1.0.0-beta.0 -Dfile=azure-resourcemanager-sql-generated-1.0.0-beta.1.jar -Dpackaging=jar -DgeneratePom=true
      ```"}
    ️️✔️ azure-sdk-for-go succeeded [Detail] [Expand]
    • ️✔️Succeeded [Logs]Release - Generate from cc268fe. SDK Automation 14.0.0
      command	sh ./initScript.sh ../../../../../azure-sdk-for-go_tmp/initInput.json ../../../../../azure-sdk-for-go_tmp/initOutput.json
      command	generator automation ../../../../../azure-sdk-for-go_tmp/generateInput.json ../../../../../azure-sdk-for-go_tmp/generateOutput.json
    • ️✔️sql/mgmt/2014-04-01/sql [View full logs]  [Release SDK Changes]
      info	[Changelog] No exported changes
    • ️✔️preview/sql/mgmt/v5.0/sql [View full logsBreaking Change Detected
      info	[Changelog] ### Breaking Changes
      info	[Changelog]
      info	[Changelog] - Function `ResourceIdentityWithUserAssignedIdentities.MarshalJSON` has been removed
      info	[Changelog] - Struct `ResourceIdentityWithUserAssignedIdentities` has been removed
      info	[Changelog]
      info	[Changelog] ### New Content
      info	[Changelog]
      info	[Changelog] - New const `IdentityTypeSystemAssignedUserAssigned`
      info	[Changelog]
      info	[Changelog] Total 3 breaking change(s), 1 additive change(s).
      info	[Changelog]
    • ️✔️preview/sql/mgmt/v4.0/sql [View full logsBreaking Change Detected
      Only show 15 items here, please refer to log for details.
      info	[Changelog] - New struct `LongTermRetentionPoliciesClient`
      info	[Changelog] - New struct `LongTermRetentionPoliciesCreateOrUpdateFuture`
      info	[Changelog] - New struct `LongTermRetentionPolicy`
      info	[Changelog] - New struct `LongTermRetentionPolicyListResult`
      info	[Changelog] - New struct `LongTermRetentionPolicyListResultIterator`
      info	[Changelog] - New struct `LongTermRetentionPolicyListResultPage`
      info	[Changelog] - New struct `UpdateLongTermRetentionBackupParameters`
      info	[Changelog] - New struct `UpdateLongTermRetentionBackupParametersProperties`
      info	[Changelog] - New field `BackupStorageRedundancy` in struct `LongTermRetentionBackupProperties`
      info	[Changelog] - New field `RequestedBackupStorageRedundancy` in struct `LongTermRetentionBackupProperties`
      info	[Changelog] - New field `RequestedBackupStorageRedundancy` in struct `DatabaseProperties`
      info	[Changelog] - New field `CurrentBackupStorageRedundancy` in struct `DatabaseProperties`
      info	[Changelog]
      info	[Changelog] Total 93 breaking change(s), 112 additive change(s).
      info	[Changelog]
    • ️✔️preview/sql/mgmt/v3.0/sql [View full logsBreaking Change Detected
      Only show 15 items here, please refer to log for details.
      info	[Changelog] - New struct `ManagedInstancePrivateEndpointConnectionProperties`
      info	[Changelog] - New struct `ManagedInstancePrivateEndpointProperty`
      info	[Changelog] - New struct `QueryMetricInterval`
      info	[Changelog] - New struct `QueryMetricProperties`
      info	[Changelog] - New struct `QueryStatisticsProperties`
      info	[Changelog] - New struct `TopQueries`
      info	[Changelog] - New struct `TopQueriesListResult`
      info	[Changelog] - New struct `TopQueriesListResultIterator`
      info	[Changelog] - New struct `TopQueriesListResultPage`
      info	[Changelog] - New field `PrivateEndpointConnections` in struct `ManagedInstanceProperties`
      info	[Changelog] - New field `ZoneRedundant` in struct `ManagedInstanceProperties`
      info	[Changelog] - New field `Identity` in struct `ManagedInstanceUpdate`
      info	[Changelog]
      info	[Changelog] Total 21 breaking change(s), 74 additive change(s).
      info	[Changelog]
    • ️✔️preview/sql/mgmt/2018-06-01-preview/sql [View full logsBreaking Change Detected
      Only show 15 items here, please refer to log for details.
      info	[Changelog] - Const `Critical` has been removed
      info	[Changelog] - Const `High` has been removed
      info	[Changelog]
      info	[Changelog] ### New Content
      info	[Changelog]
      info	[Changelog] - New const `SensitivityLabelRankHigh`
      info	[Changelog] - New const `SystemAssignedUserAssigned`
      info	[Changelog] - New const `SensitivityLabelRankLow`
      info	[Changelog] - New const `SensitivityLabelRankMedium`
      info	[Changelog] - New const `UserAssigned`
      info	[Changelog] - New const `SensitivityLabelRankCritical`
      info	[Changelog] - New const `SensitivityLabelRankNone`
      info	[Changelog]
      info	[Changelog] Total 5 breaking change(s), 7 additive change(s).
      info	[Changelog]
    • ️✔️preview/sql/mgmt/2017-10-01-preview/sql [View full logs
      info	[Changelog] No exported changes
    • ️✔️preview/sql/mgmt/2017-03-01-preview/sql [View full logsBreaking Change Detected
      Only show 15 items here, please refer to log for details.
      info	[Changelog] - New const `SystemAssignedUserAssigned`
      info	[Changelog] - New const `Seconds`
      info	[Changelog] - New const `PrimaryAggregationTypeNone`
      info	[Changelog] - New const `BytesPerSecond`
      info	[Changelog] - New const `PrimaryAggregationTypeCount`
      info	[Changelog] - New const `PrimaryAggregationTypeMaximum`
      info	[Changelog] - New const `PrimaryAggregationTypeMinimum`
      info	[Changelog] - New const `Percent`
      info	[Changelog] - New const `CountPerSecond`
      info	[Changelog] - New const `UserAssigned`
      info	[Changelog] - New const `Bytes`
      info	[Changelog] - New const `PrimaryAggregationTypeAverage`
      info	[Changelog]
      info	[Changelog] Total 12 breaking change(s), 13 additive change(s).
      info	[Changelog]
    • ️✔️preview/sql/mgmt/2015-05-01-preview/sql [View full logsBreaking Change Detected
      Only show 15 items here, please refer to log for details.
      info	[Changelog] - New const `Seconds`
      info	[Changelog] - New const `UserAssigned`
      info	[Changelog] - New const `BytesPerSecond`
      info	[Changelog] - New const `CountPerSecond`
      info	[Changelog] - New const `PrimaryAggregationTypeCount`
      info	[Changelog] - New const `PrimaryAggregationTypeTotal`
      info	[Changelog] - New const `PrimaryAggregationTypeMinimum`
      info	[Changelog] - New const `SystemAssignedUserAssigned`
      info	[Changelog] - New const `PrimaryAggregationTypeNone`
      info	[Changelog] - New const `PrimaryAggregationTypeAverage`
      info	[Changelog] - New const `PrimaryAggregationTypeMaximum`
      info	[Changelog] - New const `Percent`
      info	[Changelog]
      info	[Changelog] Total 12 breaking change(s), 13 additive change(s).
      info	[Changelog]
    ️️✔️ azure-sdk-for-js succeeded [Detail] [Expand]
    • ️✔️Succeeded [Logs]Release - Generate from cc268fe. SDK Automation 14.0.0
      warn	Skip initScript due to not configured
      command	autorest --version=V2 --typescript --license-header=MICROSOFT_MIT_NO_VERSION [email protected]/[email protected] --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js/azure-sdk-for-js ../../azure-rest-api-specs/specification/sql/resource-manager/readme.md
    • ️✔️@azure/arm-sql [View full logs]  [Release SDK Changes]
      cmderr	[npmPack] loaded rollup.config.js with warnings
      cmderr	[npmPack] (!) Unused external imports
      cmderr	[npmPack] default imported from external module 'rollup' but never used
      cmderr	[npmPack] ./esm/sqlManagementClient.js → ./dist/arm-sql.js...
      cmderr	[npmPack] created ./dist/arm-sql.js in 2.1s
    ️⚠️ azure-resource-manager-schemas warning [Detail]
    • ⚠️Warning [Logs]Release - Generate from cc268fe. Schema Automation 14.0.0
      command	.sdkauto/initScript.sh ../azure-resource-manager-schemas_tmp/initInput.json ../azure-resource-manager-schemas_tmp/initOutput.json
      cmderr	[initScript.sh] WARN old lockfile
      cmderr	[initScript.sh] npm WARN old lockfile The package-lock.json file was created with an old version of npm,
      cmderr	[initScript.sh] npm WARN old lockfile so supplemental metadata must be fetched from the registry.
      cmderr	[initScript.sh] npm WARN old lockfile
      cmderr	[initScript.sh] npm WARN old lockfile This is a one-time fix-up, please be patient...
      cmderr	[initScript.sh] npm WARN old lockfile
      warn	File azure-resource-manager-schemas_tmp/initOutput.json not found to read
      command	.sdkauto/generateScript.sh ../azure-resource-manager-schemas_tmp/generateInput.json ../azure-resource-manager-schemas_tmp/generateOutput.json
      warn	No file changes detected after generation
    • ️✔️sql [View full logs
    Posted by Swagger Pipeline | How to fix these errors?

    @ghost ghost added the customer-reported Issues that are reported by GitHub users external to the Azure organization. label Jun 29, 2021
    @ghost
    Copy link

    ghost commented Jun 29, 2021

    Thank you for your contribution alswanso! We will review the pull request and get back to you soon.

    @ghost ghost added the SQL label Jun 29, 2021
    @ghost
    Copy link

    ghost commented Jun 29, 2021

    CLA assistant check
    All CLA requirements met.

    @ericshape
    Copy link
    Contributor

    /azp run

    @azure-pipelines
    Copy link

    Azure Pipelines successfully started running 1 pipeline(s).

    @ericshape ericshape added the WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required label Jun 30, 2021
    @zhenglaizhang
    Copy link
    Contributor

    @ArcturusZhang pls help check the go sdk breaking change

    @zhenglaizhang
    Copy link
    Contributor

    @ericshape I noticed you added label WaitForARMFeedback does it because of update to sql common types definition. Originally I thought no need to do ARM review for this PR.

    @ArcturusZhang ArcturusZhang added the Approved-SdkBreakingChange-Go Approve the breaking change tracking for azure-sdk-for-go label Jul 14, 2021
    @ericshape
    Copy link
    Contributor

    I might mis-add the the ARM feedback tag. just removed

    @ericshape ericshape removed the WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required label Jul 14, 2021
    @RAY-316
    Copy link
    Contributor

    RAY-316 commented Jul 15, 2021

    /azp run

    1 similar comment
    @msyyc
    Copy link
    Member

    msyyc commented Jul 15, 2021

    /azp run

    mkarmark pushed a commit to mkarmark/azure-rest-api-specs that referenced this pull request Jul 21, 2021
    …es (Azure#15027)
    
    * Removed unused definition of ResourceIdentityWithUserAssignedIdentities in servers.json and ManagedInstances.json
    
    * Added "SystemAssigned,UserAssigned" identity type
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Labels
    Approved-SdkBreakingChange-Go Approve the breaking change tracking for azure-sdk-for-go CI-BreakingChange-Go customer-reported Issues that are reported by GitHub users external to the Azure organization. SQL
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    6 participants