Label facets by thokra-nav · Pull Request #461 · nais/api

thokra-nav · 2026-06-09T10:12:58Z

No description provided.

Copilot

Pull request overview

This PR adds label-based facets across multiple GraphQL connections (workloads + persistence resources) and refactors facet computation to be lazy and request-scoped, avoiding repeated filter work when multiple facet fields are requested in the same query.

Changes:

Introduces a shared LabelFacetItem GraphQL type and adds labels facet fields to multiple *Facets GraphQL types.
Refactors facet implementations to methods on *Facets structs with sync.Once-cached filtering, enabling safe concurrent field resolution.
Adds shared facet helpers in internal/graph/model for environments and labels; updates resolvers and generated GraphQL code accordingly.

Reviewed changes

Copilot reviewed 47 out of 58 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
internal/workload/secret/queries.go	Stops pre-filtering watcher results so facets can be computed over the full team scope.
internal/workload/secret/models.go	Refactors `SecretFacets` to hold request-scope data + cached filtered results.
internal/workload/secret/facets.go	Moves facet computation to methods; adds label facets for secrets.
internal/workload/job/models.go	Refactors `JobFacets` to request-scope fields + cached filtering.
internal/workload/job/facets.go	Moves facet computation to methods; adds label facets for jobs.
internal/workload/config/queries.go	Stops pre-filtering watcher results so facets can be computed over the full team scope.
internal/workload/config/models.go	Refactors `ConfigFacets` to request-scope fields + cached filtered results.
internal/workload/config/facets.go	Moves facet computation to methods; adds label facets for configs.
internal/workload/application/models.go	Refactors `ApplicationFacets` to request-scope fields + cached filtering.
internal/workload/application/facets.go	Moves facet computation to methods; adds label facets for applications.
internal/persistence/valkey/models.go	Refactors `ValkeyFacets` to request-scope fields + cached filtered results.
internal/persistence/valkey/facets.go	Moves facet computation to methods; adds label facets for Valkey.
internal/persistence/postgres/models.go	Refactors `PostgresInstanceFacets` to request-scope fields + cached filtered results.
internal/persistence/postgres/facets.go	Moves facet computation to methods; adds label facets for Postgres instances.
internal/persistence/postgres/facets_test.go	Updates tests to use new facets methods (but does not yet test label facets).
internal/persistence/opensearch/models.go	Refactors `OpenSearchFacets` to request-scope fields + cached filtered results.
internal/persistence/opensearch/facets.go	Moves facet computation to methods; adds label facets for OpenSearch.
internal/persistence/kafkatopic/models.go	Refactors `KafkaTopicFacets` to request-scope fields + cached filtered results.
internal/persistence/kafkatopic/facets.go	Moves facet computation to methods; adds label facets for Kafka topics.
internal/persistence/bucket/models.go	Refactors `BucketFacets` to request-scope fields + cached filtered results.
internal/persistence/bucket/facets.go	Moves facet computation to methods; adds label facets for buckets.
internal/persistence/bigquery/models.go	Refactors `BigQueryDatasetFacets` to request-scope fields + cached filtered results.
internal/persistence/bigquery/facets.go	Moves facet computation to methods; adds label facets for BigQuery datasets.
internal/graph/valkey.resolvers.go	Returns `ValkeyFacets` object instead of precomputed facets.
internal/graph/secret.resolvers.go	Returns `SecretFacets` object instead of precomputed facets.
internal/graph/postgres.resolvers.go	Returns `PostgresInstanceFacets` object instead of precomputed facets.
internal/graph/opensearch.resolvers.go	Returns `OpenSearchFacets` object instead of precomputed facets.
internal/graph/kafka.resolvers.go	Returns `KafkaTopicFacets` object instead of precomputed facets.
internal/graph/jobs.resolvers.go	Returns `JobFacets` object instead of precomputed facets.
internal/graph/config.resolvers.go	Returns `ConfigFacets` object instead of precomputed facets.
internal/graph/bucket.resolvers.go	Returns `BucketFacets` object instead of precomputed facets.
internal/graph/bigquery.resolvers.go	Returns `BigQueryDatasetFacets` object instead of precomputed facets.
internal/graph/applications.resolvers.go	Returns `ApplicationFacets` object instead of precomputed facets.
internal/graph/schema/valkey.graphqls	Adds `labels` to `ValkeyFacets`.
internal/graph/schema/secret.graphqls	Adds `labels` to `SecretFacets`.
internal/graph/schema/postgres.graphqls	Adds `labels` to `PostgresInstanceFacets`.
internal/graph/schema/opensearch.graphqls	Adds `labels` to `OpenSearchFacets`.
internal/graph/schema/kafka.graphqls	Adds `labels` to `KafkaTopicFacets`.
internal/graph/schema/jobs.graphqls	Adds `labels` to `JobFacets`.
internal/graph/schema/facets.graphqls	Adds shared `LabelFacetItem` type.
internal/graph/schema/config.graphqls	Adds `labels` to `ConfigFacets`.
internal/graph/schema/bucket.graphqls	Adds `labels` to `BucketFacets`.
internal/graph/schema/bigquery.graphqls	Adds `labels` to `BigQueryDatasetFacets`.
internal/graph/schema/applications.graphqls	Adds `labels` to `ApplicationFacets`.
internal/graph/model/facets.go	Adds `LabelFacetItem`, label sorting, and shared facet computation helpers.
internal/graph/gengql/valkey.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/secret.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/root_.generated.go	Regenerates schema/complexity plumbing for new fields/types.
internal/graph/gengql/postgres.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/opensearch.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/kafka.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/jobs.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/facets.generated.go	Regenerates GraphQL execution code for new `LabelFacetItem` type.
internal/graph/gengql/config.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/bucket.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/bigquery.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
internal/graph/gengql/applications.generated.go	Regenerates GraphQL execution code for method-based facets + labels.
integration_tests/label_selectors.lua	Adds integration coverage for Valkey label facets.

Files not reviewed (11)

internal/graph/gengql/applications.generated.go: Language not supported
internal/graph/gengql/bigquery.generated.go: Language not supported
internal/graph/gengql/bucket.generated.go: Language not supported
internal/graph/gengql/config.generated.go: Language not supported
internal/graph/gengql/facets.generated.go: Language not supported
internal/graph/gengql/jobs.generated.go: Language not supported
internal/graph/gengql/kafka.generated.go: Language not supported
internal/graph/gengql/opensearch.generated.go: Language not supported
internal/graph/gengql/postgres.generated.go: Language not supported
internal/graph/gengql/secret.generated.go: Language not supported
internal/graph/gengql/valkey.generated.go: Language not supported

+	for _, item := range filtered {
+		for _, lbl := range getLabels(item) {
+			if lbl == nil {
+				continue
+			}
+			labelCounts[lbl.Key][lbl.Value]++
+		}
+	}


+			got := &PostgresInstanceFacets{
+				AllInstances: tt.instances,
+				Filter:       tt.filter,
+			}


Introduce `LabelFacetItem` in GraphQL and expose `labels` facets for all labelled resources. Change facet fields to be calculated using a resolver method to prevent excess calculations when not necessary.

nais-team-app Bot added the graphql-review-required label Jun 9, 2026

thokra-nav requested a review from Copilot June 9, 2026 10:15

Copilot started reviewing on behalf of thokra-nav June 9, 2026 10:15 View session

Copilot AI reviewed Jun 9, 2026

View reviewed changes

thokra-nav force-pushed the feat/labelResources branch from a9bd6ad to ee29efe Compare June 9, 2026 10:46

thokra-nav added 4 commits June 9, 2026 12:48

Add label facets across team resource connections

0ba04fa

Introduce `LabelFacetItem` in GraphQL and expose `labels` facets for all labelled resources. Change facet fields to be calculated using a resolver method to prevent excess calculations when not necessary.

Cleanup code

159214a

Fix lua formatting

6815824

format

b549dda

thokra-nav force-pushed the label_facets branch from 717d1dd to b549dda Compare June 9, 2026 10:50

christeredvartsen approved these changes Jun 9, 2026

View reviewed changes

nais-team-app Bot removed the graphql-review-required label Jun 9, 2026

thokra-nav marked this pull request as ready for review June 9, 2026 11:42

thokra-nav requested a review from a team as a code owner June 9, 2026 11:42

thokra-nav merged commit 80eb5ac into feat/labelResources Jun 9, 2026
10 of 11 checks passed

thokra-nav deleted the label_facets branch June 9, 2026 11:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Label facets#461

Label facets#461
thokra-nav merged 4 commits into
feat/labelResourcesfrom
label_facets

thokra-nav commented Jun 9, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

thokra-nav commented Jun 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants