Skip to content
This repository was archived by the owner on Jun 11, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion apps/infra/internal/app/graph/generated/generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apps/infra/internal/app/graph/model/models_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apps/infra/internal/app/graph/schema.graphqls
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ input SearchCluster {
isReady: MatchFilterIn
region: MatchFilterIn
text: MatchFilterIn
allClusters: MatchFilterIn
}

input SearchGlobalVPNs {
Expand Down
21 changes: 21 additions & 0 deletions apps/infra/internal/app/graph/schema.resolvers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions apps/infra/internal/domain/byok-clusters.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ func (d *domain) ListBYOKCluster(ctx InfraContext, search map[string]repos.Match

f := repos.Filter{
fields.AccountName: ctx.AccountName,
"$or": []map[string]any{
{fc.BYOKClusterOwnedBy: ctx.UserId},
{fc.BYOKClusterOwnedBy: nil},
},
// "$or": []map[string]any{
// {fc.BYOKClusterOwnedBy: ctx.UserId},
// {fc.BYOKClusterOwnedBy: nil},
// },
}

pRecords, err := d.byokClusterRepo.FindPaginated(ctx, d.byokClusterRepo.MergeMatchFilters(f, search), pagination)
Expand Down
8 changes: 4 additions & 4 deletions apps/infra/internal/domain/clusters.go
Original file line number Diff line number Diff line change
Expand Up @@ -903,10 +903,10 @@ func (d *domain) ListClusters(ctx InfraContext, mf map[string]repos.MatchFilter,
f := repos.Filter{
fields.AccountName: ctx.AccountName,
fields.MetadataNamespace: accNs,
"$or": []map[string]any{
{fc.ClusterOwnedBy: ctx.UserId},
{fc.ClusterOwnedBy: nil},
},
// "$or": []map[string]any{
// {fc.ClusterOwnedBy: ctx.UserId},
// {fc.ClusterOwnedBy: nil},
// },
}

pr, err := d.clusterRepo.FindPaginated(ctx, d.clusterRepo.MergeMatchFilters(f, mf), pagination)
Expand Down