Skip to content

Resolve remaining path conflicts in v3#3855

Merged
thomas11 merged 9 commits into
masterfrom
tkappler/v3-resolve-path-conflicts
Jan 23, 2025
Merged

Resolve remaining path conflicts in v3#3855
thomas11 merged 9 commits into
masterfrom
tkappler/v3-resolve-path-conflicts

Conversation

@thomas11

@thomas11 thomas11 commented Jan 15, 2025

Copy link
Copy Markdown
Contributor

Resolves #2495.

The first two commits bring the conflicts down to one or two, depending on how you count.

{
  "MachineLearningServices": {
    "ConnectionRaiBlocklist": {
      "/subscriptions/{}/resourcegroups/{}/providers/microsoft.machinelearningservices/workspaces/{}/connections/{}/raiblocklists/{}": [
        "2024-07-01-preview",
        "2024-10-01-preview",
        "default"
      ],
      "/subscriptions/{}/resourcegroups/{}/providers/microsoft.machinelearningservices/workspaces/{}/connections/{}/raiblocklists/{}/raiblocklistitems/{}": [
        "2024-04-01-preview"
      ]
    },
    "ConnectionRaiBlocklistItem": {
      "/subscriptions/{}/resourcegroups/{}/providers/microsoft.machinelearningservices/workspaces/{}/connections/{}/raiblocklists/{}": [
        "2024-04-01-preview"
      ],
      "/subscriptions/{}/resourcegroups/{}/providers/microsoft.machinelearningservices/workspaces/{}/connections/{}/raiblocklists/{}/raiblocklistitems/{}": [
        "2024-07-01-preview",
        "2024-10-01-preview",
        "default"
      ]
    }
  }
}

TODO

  • ConnectionRaiBlocklist
    They made a mistake in 2024-0-01-preview, which is the v2 default version, in that they swapped the operationId’s of two resources.

    • GET for /raiblocklists/{} is ConnectionRaiBlocklistItem_Get
    • GET for /raiblocklists/{}/raiblocklistitems/{} is ConnectionRaiBlocklist_Get
  • Aliases

@thomas11 thomas11 requested review from a team, EronWright and danielrbradley January 15, 2025 06:37
@github-actions

Copy link
Copy Markdown
Contributor

Does the PR have any schema changes?

Looking good! No breaking changes found.
No new resources/functions.

@codecov

codecov Bot commented Jan 15, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 40.20619% with 58 lines in your changes missing coverage. Please review.

Project coverage is 57.37%. Comparing base (ee1cc82) to head (a372db5).
Report is 1 commits behind head on master.

Files with missing lines Patch % Lines
provider/pkg/resources/resources.go 44.31% 34 Missing and 15 partials ⚠️
provider/pkg/versioning/gen.go 0.00% 5 Missing ⚠️
provider/pkg/gen/types.go 0.00% 3 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3855      +/-   ##
==========================================
+ Coverage   57.26%   57.37%   +0.11%     
==========================================
  Files          79       79              
  Lines       12469    12456      -13     
==========================================
+ Hits         7140     7147       +7     
+ Misses       4799     4766      -33     
- Partials      530      543      +13     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@danielrbradley danielrbradley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Overall looks good. Might be worth a quick sync call to make sure I understand all the moving parts.

Comment thread versions/v2-lock.json Outdated
@thomas11 thomas11 enabled auto-merge (squash) January 23, 2025 16:21
@thomas11 thomas11 merged commit f73a1a3 into master Jan 23, 2025
@thomas11 thomas11 deleted the tkappler/v3-resolve-path-conflicts branch January 23, 2025 16:32
@pulumi-bot

Copy link
Copy Markdown
Contributor

This PR has been shipped in release v2.84.0.

thomas11 added a commit that referenced this pull request Jan 27, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Jan 29, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Jan 29, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Feb 1, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 7, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 13, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 17, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 18, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 18, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 20, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 20, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 26, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
thomas11 added a commit that referenced this pull request Mar 27, 2025
Resolves #3451

`az` 2.37 was released in May 2022.

Also includes a drive-by follow-up fix for #3855.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Disambiguate resources with different paths in any API version

3 participants