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

Fixes name conflict in swift generated code #5181

Merged
merged 3 commits into from
Oct 15, 2022
Merged

Conversation

tarikeshaq
Copy link
Contributor

@tarikeshaq tarikeshaq commented Oct 13, 2022

I noticed that main was broken for iOS today and tracked it to a116875

This PR fixes that name conflict. We have #4820 for the namespacing problem

cc @skhamis not sure if this has implications on desktop (I don't think so?)

Pull Request checklist

  • Quality: This PR builds and tests run cleanly
    • Note:
      • For changes that need extra cross-platform testing, consider adding [ci full] to the PR title.
      • If this pull request includes a breaking change, consider cutting a new release after merging.
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Changelog: This PR includes a changelog entry in CHANGES_UNRELEASED.md or an explanation of why it does not need one
    • Any breaking changes to Swift or Kotlin binding APIs are noted explicitly
  • Dependencies: This PR follows our dependency management guidelines
    • Any new dependencies are accompanied by a summary of the due dilligence applied in selecting them.

Branch builds: add [ac: android-components-branch-name] and/or [fenix: fenix-branch-name] to the PR title.

@tarikeshaq tarikeshaq requested review from mhammond and a team October 13, 2022 19:05
@tarikeshaq tarikeshaq closed this Oct 13, 2022
@tarikeshaq tarikeshaq reopened this Oct 13, 2022
@firefoxci-taskcluster
Copy link

Uh oh! Looks like an error! Details

Client ID static/taskcluster/github does not have sufficient scopes and is missing the following scopes:

{
  "AnyOf": [
    "queue:rerun-task:app-services-level-1/GeZMsWuQQImzylXbZ8jRtA/OyxggAEyQ5C9wvEyV7puxg",
    "queue:rerun-task-in-project:none",
    {
      "AllOf": [
        "queue:rerun-task",
        "assume:scheduler-id:app-services-level-1/GeZMsWuQQImzylXbZ8jRtA"
      ]
    }
  ]
}

This request requires the client to satisfy the following scope expression:

{
  "AnyOf": [
    "queue:rerun-task:app-services-level-1/GeZMsWuQQImzylXbZ8jRtA/OyxggAEyQ5C9wvEyV7puxg",
    "queue:rerun-task-in-project:none",
    {
      "AllOf": [
        "queue:rerun-task",
        "assume:scheduler-id:app-services-level-1/GeZMsWuQQImzylXbZ8jRtA"
      ]
    }
  ]
}

  • method: rerunTask
  • errorCode: InsufficientScopes
  • statusCode: 403
  • time: 2022-10-13T19:30:23.344Z

Copy link
Contributor

@lougeniaC64 lougeniaC64 left a comment

Choose a reason for hiding this comment

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

Yeah sadly this pattern for the fix is all too familiar. Approved, assuming @skhamis doesn't have any reservations.

@skhamis
Copy link
Contributor

skhamis commented Oct 14, 2022

This will definitely affect desktop (we use the Guid) -- however it'll be a fairly simple change and only need to change it if we vendor in a new version of a-s. So no worries here but good to know moving forward!

@tarikeshaq tarikeshaq merged commit 914ac9c into main Oct 15, 2022
@tarikeshaq tarikeshaq deleted the fix-name-conflict-swift branch October 15, 2022 15:49
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.

3 participants