Skip to content

fix(api): support X-Tenant-ID header in tag requests #5618

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

Merged
gustavosbarreto merged 1 commit into from
Dec 10, 2025
Merged

fix(api): support X-Tenant-ID header in tag requests #5618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/routes/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ func (h *Handler) GetTags(c gateway.Context) error {
return err
}

req.Paginator.Normalize()
req.Sorter.Normalize()

tags, totalCount, err := h.service.ListTags(c.Ctx(), req)
if err != nil {
return err
Expand Down
12 changes: 6 additions & 6 deletions pkg/api/requests/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package requests
import "github.com/shellhub-io/shellhub/pkg/api/query"

type CreateTag struct {
TenantID string `param:"tenant" validate:"required,uuid"`
TenantID string `param:"tenant" header:"X-Tenant-ID" validate:"required,uuid"`
Name string `json:"name" validate:"required,min=3,max=255,alphanum,ascii,excludes=/@&:"`
}

type PushTag struct {
TenantID string `param:"tenant" validate:"required,uuid"`
TenantID string `param:"tenant" header:"X-Tenant-ID" validate:"required,uuid"`
Name string `param:"name" validate:"required,min=3,max=255,alphanum,ascii,excludes=/@&:"`
// TargetID is the identifier of the target to push the tag on.
// For the reason cannot of it can be a list of things (UID for device, ID for firewall, etc...), it
Expand All @@ -17,7 +17,7 @@ type PushTag struct {
}

type PullTag struct {
TenantID string `param:"tenant" validate:"required,uuid"`
TenantID string `param:"tenant" header:"X-Tenant-ID" validate:"required,uuid"`
Name string `param:"name" validate:"required,min=3,max=255,alphanum,ascii,excludes=/@&:"`
// TargetID is the identifier of the target to pull the tag of.
// For the reason cannot of it can be a list of things (UID for device, ID for firewall, etc...), it
Expand All @@ -26,21 +26,21 @@ type PullTag struct {
}

type ListTags struct {
TenantID string `param:"tenant" validate:"required,uuid"`
TenantID string `param:"tenant" header:"X-Tenant-ID" validate:"required,uuid"`
query.Paginator
query.Filters
query.Sorter
}

type UpdateTag struct {
TenantID string `param:"tenant" validate:"required,uuid"`
TenantID string `param:"tenant" header:"X-Tenant-ID" validate:"required,uuid"`
Name string `param:"name" validate:"required"`
// Similar to [UpdateTag.Name], but is used to update the tag's name instead of retrieve the tag.
NewName string `json:"name" validate:"omitempty,min=3,max=255,alphanum,ascii,excludes=/@&:"`
}

type DeleteTag struct {
TenantID string `param:"tenant" validate:"required,uuid"`
TenantID string `param:"tenant" header:"X-Tenant-ID" validate:"required,uuid"`
Name string `param:"name" validate:"required"`
}

Expand Down