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

[Fix modeler Four error] remove duplicated schema #12779

Merged
merged 1 commit into from
Feb 9, 2021

Conversation

chenjianfei2017
Copy link
Contributor

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
    • 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 API 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 version with Breaking Change Validation errors
  • Updating API(s) in preview over 1 year

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.

@openapi-workflow-bot
Copy link

Hi, @chenjianfei2017 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. vsswagger@microsoft.com

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Feb 2, 2021

    Swagger Validation Report

    ️⚠️BreakingChange: 4 Warnings warning [Detail]

    Rule Message
    ⚠️ 1032 - DifferentAllOf The new version has a different 'allOf' property than the previous one.
    New: Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json#L1499:9
    Old: Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json#L1499:9
    ⚠️ 1032 - DifferentAllOf The new version has a different 'allOf' property than the previous one.
    New: Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json#L1517:9
    Old: Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json#L1517:9
    ⚠️ 1032 - DifferentAllOf The new version has a different 'allOf' property than the previous one.
    New: Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json#L1614:5
    Old: Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json#L1614:5
    ⚠️ 1032 - DifferentAllOf The new version has a different 'allOf' property than the previous one.
    New: Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json#L1628:5
    Old: Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json#L1631:5
    ️️✔️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.
    ️️✔️[Staging] Cross Version BreakingChange (Base on preview version) succeeded [Detail] [Expand]
    There are no breaking changes.
    ️️✔️[Staging] Cross Version BreakingChange (Base on stable version) succeeded [Detail] [Expand]
    There are no breaking changes.
    ️️✔️CredScan succeeded [Detail] [Expand]
    There is no credential detected.
    ️⚠️[Staging] SDK Track2 Validation: 44 Warnings warning [Detail] Only 10 items are listed, please refer to log for more details.

    Rule Message
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'OperationListResult' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'Operation-display' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'Resource' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'TrackedResource' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'ResourceProperties' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'CreateOrUpdateTrackedResourceProperties' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'EnvironmentCreateOrUpdateParameters' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'Gen1EnvironmentCreateOrUpdateParameters' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'Gen2EnvironmentCreateOrUpdateParameters' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    ⚠️ PreCheck/SchemaMissingType "readme":"timeseriesinsights/resource-manager/readme.md",
    "tag":"package-2020-05-15",
    "details":"The schema 'EnvironmentListResponse' with an undefined type and decalared properties is a bit ambigious. This has been auto-corrected to 'type:object'"
    Posted by Swagger Pipeline | How to fix these errors?

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Feb 2, 2021

    Swagger Generation Artifacts

    ️️✔️ azure-sdk-for-js succeeded [Detail] [Expand]
    • ️✔️Succeeded [Logs]Release - Generate from 42baaf8. SDK Automation 14.0.0
      warn	Skip initScript due to not configured
      command	autorest --version=V2 --typescript --license-header=MICROSOFT_MIT_NO_VERSION --use=@microsoft.azure/autorest.typescript@4.4.4 --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js/azure-sdk-for-js ../../azure-rest-api-specs/specification/timeseriesinsights/resource-manager/readme.md
    • ️✔️@azure/arm-timeseriesinsights [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/timeSeriesInsightsClient.js → ./dist/arm-timeseriesinsights.js...
      cmderr	[npmPack] created ./dist/arm-timeseriesinsights.js in 320ms
    ️️✔️ azure-sdk-for-go succeeded [Detail] [Expand]
    • ️✔️Succeeded [Logs]Release - Generate from 42baaf8. SDK Automation 14.0.0
      command	sh ./initScript.sh ../../../../../azure-sdk-for-go_tmp/initInput.json ../../../../../azure-sdk-for-go_tmp/initOutput.json
      command	go run ./tools/generator/main.go ../../../../../azure-sdk-for-go_tmp/generateInput.json ../../../../../azure-sdk-for-go_tmp/generateOutput.json
    • ️✔️timeseriesinsights/mgmt/2020-05-15/timeseriesinsights [View full logs]  [Release SDK Changes] Breaking Change Detected
      info	[Changelog] ### Breaking Changes
      info	[Changelog]
      info	[Changelog] - Field `ProvisioningState` of struct `Gen1EnvironmentResourceProperties` has been removed
      info	[Changelog] - Field `CreationTime` of struct `Gen1EnvironmentResourceProperties` has been removed
      info	[Changelog]
      info	[Changelog] Total 1 breaking change(s), 0 additive change(s).
      info	[Changelog]
    • ️✔️timeseriesinsights/mgmt/2017-11-15/timeseriesinsights [View full logs]  [Release SDK Changes]
      info	[Changelog] No exported changes
    • ️✔️preview/timeseriesinsights/mgmt/2018-08-15-preview/timeseriesinsights [View full logs]  [Release SDK Changes]
      info	[Changelog] No exported changes
    • ️✔️preview/timeseriesinsights/mgmt/2017-02-28-preview/timeseriesinsights [View full logs]  [Release SDK Changes]
      info	[Changelog] No exported changes
    ️⚠️ azure-sdk-for-python warning [Detail]
    • ⚠️Warning [Logs]Release - Generate from 42baaf8. 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
    • ️✔️azure-mgmt-timeseriesinsights [View full logs]  [Release SDK Changes] Breaking Change Detected
      info	[Changelog] **Features**
      info	[Changelog]
      info	[Changelog]   - Model EventSourceCreateOrUpdateParameters has a new parameter local_timestamp
      info	[Changelog]   - Model EventHubEventSourceCreateOrUpdateParameters has a new parameter local_timestamp
      info	[Changelog]   - Model IoTHubEventSourceCreateOrUpdateParameters has a new parameter local_timestamp
      info	[Changelog]
      info	[Changelog] **Breaking changes**
      info	[Changelog]
      info	[Changelog]   - Operation EnvironmentsOperations.update has a new signature
    ️️✔️ azure-resource-manager-schemas succeeded [Detail] [Expand]
    • ️✔️Succeeded [Logs]Release - Generate from 42baaf8. Schema Automation 14.0.0
      warn	Skip initScript due to not configured
      command	npx n 12
      command	autorest --use=@autorest/azureresourceschema@3.0.92 --version=3.0.6369 --azureresourceschema --multiapi --title=none --pass-thru:subset-reducer --azureresourceschema-folder=/home/vsts/work/1/s/azure-resource-manager-schemas/azure-resource-manager-schemas ../../azure-rest-api-specs/specification/timeseriesinsights/resource-manager/readme.md
    • ️✔️timeseriesinsights [View full logs]  [Release Schema Changes]
      cmderr	[resource-manager] node-pre-gyp
      cmderr	[resource-manager] WARN Using request for node-pre-gyp https download
      cmderr	[resource-manager]  template-schema-validation-tools@1.0.0 No repository field.
      cmderr	[resource-manager]  optional SKIPPING OPTIONAL DEPENDENCY: fsevents@2.1.3 (node_modules/fsevents):
      cmderr	[resource-manager] npm WARN notsup SKIPPING OPTIONAL DEPENDENCY: Unsupported platform for fsevents@2.1.3: wanted {"os":"darwin","arch":"any"} (current: {"os":"linux","arch":"x64"})
    ️️✔️[Staging] ApiDocPreview succeeded [Detail] [Expand]
     Please click here to preview with your @microsoft account. 
    Posted by Swagger Pipeline | How to fix these errors?

    @chenjianfei2017
    Copy link
    Contributor Author

    'ResourceProperties' has been defined in 'EnvironmentResourceProperties'
    

    Copy link
    Contributor

    @riserrad riserrad left a comment

    Choose a reason for hiding this comment

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

    It makes sense to me. EnvironmentResourceProperties is of type ResourceProperties, so making either Gen1EnvironmentResourceProperties and Gen2EnvironmentResourceProperties allOf both EnvironmentResourceProperties and ResourceProperties seems wrong. Making them only allOf EnvironmentResourceProperties seems reasonable.

    @akning-ms
    Copy link
    Contributor

    /azp run

    @azure-pipelines
    Copy link

    Azure Pipelines successfully started running 2 pipeline(s).

    @qianwens qianwens merged commit 42baaf8 into master Feb 9, 2021
    iscai-msft added a commit to iscai-msft/azure-rest-api-specs that referenced this pull request Feb 10, 2021
    …into fix_resource_multiapi_submodule
    
    * 'master' of https://github.com/Azure/azure-rest-api-specs: (452 commits)
      Dev cost management microsoft.cost management 2020 12 01 preview new (Azure#12259)
      Edit securityContact swagger for 2020-01-01 (Azure#12265)
      [Hub Generated] Review request for Microsoft.Insights to add version stable/2020-10-01 (Azure#11579)
      [Hub Generated] Review request for Microsoft.Media to add version stable/2020-05-01 (Azure#12681)
      Fix TimeSeriesInsights swagger issues (Azure#12204)
      Fixing error in lastModifiedAt description (Azure#12854)
      Update comment.yml (Azure#12910)
      Fixing RI s360 Flagged corrections in 2019-10-01 version (Azure#12777)
      [Hub Generated] Review request for Microsoft.Web to add version stable/2020-10-01 (Azure#11636)
      [Ready For Review] New version 20210101 (Azure#12111)
      Update scheduledQueryRule_API.json (Azure#12895)
      Remove UserAssigned MSI (Azure#12900)
      Update library.json (Azure#12922)
      KeyVault: Feature/update security domain spec (Azure#12863)
      Fixes ExampleId type and incorrect ArmTokenParameter name (Azure#12896)
      Update contract for anomaly detector (Azure#12487)
      [NetAppFiles] Urgent bug fix, backup response, remove systemData(not in response yet) (Azure#12852)
      [AML] Add PipelineEndpoint with version and DataPathAssignments fields in AzureMLExecutePipeline (Azure#12744)
      remove duplicated schema (Azure#12779)
      [Web] Add Swagger for Service Principal (Azure#12780)
      ...
    mkarmark pushed a commit to mkarmark/azure-rest-api-specs that referenced this pull request Jul 21, 2021
    @JackTn JackTn deleted the timeseriesinsights branch August 9, 2021 10:16
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    4 participants