Fetch tenant-scoped tagsets only in the setup wizard#1237
Merged
Conversation
octopus-hideaki
approved these changes
May 26, 2026
sburmanoctopus
approved these changes
May 26, 2026
Contributor
sburmanoctopus
left a comment
There was a problem hiding this comment.
Loading the tenants looks to be the right move. Nice one.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Background
This PR ensures only tenant tags are shown on the tenant tags dropdown 🐛 in our tentacle installation wizard on recent versions (2026.1+) of Octopus.
With the extended tag sets feature,
TagSetrepository can no longer be assumed to return tenant tags. In order to only fetch the tenant tags, a scopes query parameter is necessary now.Our API ignores unknown query params, so older versions of Octopus should not see any issues.
Results
Fixes HPY-1408
Fixes #1238
See How we use GitHub Issues (including this flowchart
Before
Machine roles
Tenant tags
(This was before having a tenant tag so it only displays the machine roles, but this will display all tag sets from all scopes)

After
Machine roles
Tenant tags
How to review this PR
Pre-requisites