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.

Sign up for GitHub

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

Jump to bottom

fix(IoT): Fixing naming collision in SocketRocket #5004

Merged
merged 1 commit into from
Oct 23, 2023
Merged

fix(IoT): Fixing naming collision in SocketRocket #5004

merged 1 commit into from
Oct 23, 2023

Conversation

ruisebas
Copy link
Member

Issues

Description of changes:
We include a "fork" of SocketRocket inside AWSIoT. As with all other external libraries, we add the "AWS" prefix to their members, but it seems we forgot to do it on some.

This causes naming collision errors when an application has both the SocketRocket pod and the AWSIoT pod.

This PR renames the following:

  • SRFastLog -> AWSSRFastLog
  • SR_origin -> AWSSR_origin
  • SRHTTPResponseErrorKey -> AWSSRHTTPResponseErrorKey
  • SRIOConsumer -> AWSSRIOConsumer
  • SRIOConsumerPool -> AWSSRIOConsumerPool

Considering that all of these are defined inside an Internal folder and a .m file, I don't think they are considered breaking changes.

Check points:

  • Added new tests to cover change, if needed
  • All unit tests pass
  • All integration tests pass
  • Updated CHANGELOG.md
  • Documentation update for the change if required
  • PR title conforms to conventional commit style

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@ruisebas ruisebas requested review from awsmobilesdk and a team as code owners October 20, 2023 20:06
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:07 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:23 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 20, 2023 20:23 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
@ruisebas ruisebas temporarily deployed to IntegrationTest October 23, 2023 13:34 — with GitHub Actions Inactive
atierian
atierian approved these changes Oct 23, 2023
View reviewed changes
Copy link
Member

@atierian atierian left a comment

Choose a reason for hiding this comment

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

🚀

@ruisebas ruisebas merged commit ec1cf57 into main Oct 23, 2023
66 checks passed
@ruisebas ruisebas deleted the ruisebas/fix-naming-collision branch October 23, 2023 14:14
@ruisebas ruisebas mentioned this pull request Nov 3, 2023
Closed
harsh62 pushed a commit that referenced this pull request Nov 16, 2023
@ruisebas @harsh62
fix(IoT): Fixing naming collision with SocketRocket (#5004)
7360bfa
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@atierian atierian atierian approved these changes

@awsmobilesdk awsmobilesdk Awaiting requested review from awsmobilesdk awsmobilesdk is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ruisebas @atierian