Skip to content

Fetch tenant-scoped tagsets only in the setup wizard#1237

Merged
mik-ky merged 1 commit into
mainfrom
ck/fix-tenant-tags-list
May 26, 2026
Merged

Fetch tenant-scoped tagsets only in the setup wizard#1237
mik-ky merged 1 commit into
mainfrom
ck/fix-tenant-tags-list

Conversation

@mik-ky
Copy link
Copy Markdown
Contributor

@mik-ky mik-ky commented May 25, 2026

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, TagSet repository 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

image

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)
image

After

Machine roles

image

Tenant tags

image

How to review this PR

Pre-requisites

  • I have read How we use GitHub Issues for help deciding when and where it's appropriate to make an issue.
  • I have considered informing or consulting the right people, according to the ownership map.
  • I have considered appropriate testing for my change.

@mik-ky mik-ky changed the title Fetch tenant-scoped tagsets only Fetch tenant-scoped tagsets only in the setup wizard May 25, 2026
@mik-ky mik-ky marked this pull request as ready for review May 26, 2026 01:34
@mik-ky mik-ky requested a review from a team as a code owner May 26, 2026 01:34
@mik-ky mik-ky requested a review from a team May 26, 2026 01:35
Copy link
Copy Markdown

@octopus-hideaki octopus-hideaki left a comment

Choose a reason for hiding this comment

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

Looks good!

Copy link
Copy Markdown
Contributor

@sburmanoctopus sburmanoctopus left a comment

Choose a reason for hiding this comment

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

Loading the tenants looks to be the right move. Nice one.

@mik-ky mik-ky merged commit d9b3b34 into main May 26, 2026
56 checks passed
@mik-ky mik-ky deleted the ck/fix-tenant-tags-list branch May 26, 2026 02:48
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.

Tenant Tags dropdown in Tentacle Setup Wizard shows tag sets not scoped to tenants

3 participants