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

Do a more robust check that peer_id does not correspond to the CENTRAL_CONTENT_BASE_INSTANCE_ID. #11106

Merged

Conversation

rtibbles
Copy link
Member

Summary

  • Some backend code assumed that peer_id = None was the way to express that Studio was being connected to, this assumption is now false
  • Updates this to compare to the precomputed CENTRAL_CONTENT_BASE_INSTANCE_ID

References

Fixes issues observed during testing of #11083

Reviewer guidance

Does importing with hotfixes set as the CENTRAL_CONTENT_BASE_URL work.

N.B. this will not fix an issue that will still arise if a Studio instance is added as a StaticNetworkLocation.


Testing checklist

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

PR process

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Reviewer checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@rtibbles rtibbles added the TODO: needs review Waiting for review label Aug 15, 2023
@rtibbles rtibbles requested a review from bjester August 15, 2023 23:52
@github-actions github-actions bot added DEV: backend Python, databases, networking, filesystem... SIZE: very small labels Aug 15, 2023
@rtibbles
Copy link
Member Author

Test failure is now fixed on release branch.

Copy link
Member

@bjester bjester left a comment

Choose a reason for hiding this comment

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

Confirmed this fixes the behavior I experienced.

@bjester
Copy link
Member

bjester commented Aug 16, 2023

Test failure is now fixed on release branch.

Merging noting this

@bjester bjester merged commit 31b83a5 into learningequality:release-v0.16.x Aug 16, 2023
34 of 35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DEV: backend Python, databases, networking, filesystem... SIZE: very small TODO: needs review Waiting for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants