Move Zalando Postgres stuff to own resolver, add some features #332

sechmann · 2026-02-10T13:05:44Z

This PR moves Zalando Postgres stuff to it's own resolver and adds the ability to get information about Zalando Postgres clusters for workloads / teams.

Co-authored-by: Roger Bjørnstad roger.bjornstad@nav.no
Co-authored-by: Morten Lied Johansen morten.lied.johansen@nav.no

This frees up the name Postgres for the general interface we want to add that should join the common fields of both the zalando postgres clusters and the cloud sql postgres databases. The current postgres mutations are not yet implemented by clients, so breaking them should be OK. Co-authored-by: Roger Bjørnstad <roger.bjornstad@nav.no> Co-authored-by: Morten Lied Johansen <morten.lied.johansen@nav.no>

Co-authored-by: Morten Lied Johansen <morten.lied.johansen@nav.no>

…lity

…ance and related functionality

…pplication, and Job types. No implementation for resolvers yet.

… and Job types

Copilot

Pull request overview

Refactors the existing “Postgres” (Zalando cluster) persistence/GraphQL implementation out of sqlinstance into a dedicated postgres package to free up the Postgres name for a future shared interface (Zalando + CloudSQL).

Changes:

Moved Zalando Postgres watch/query/search/grant-access logic from internal/persistence/sqlinstance into internal/persistence/postgres (now PostgresInstance-based).
Updated GraphQL schema and resolvers to expose PostgresInstance fields and grantPostgresAccess via the new package.
Wired up new watcher, dataloader context, search indexing, and updated integration test resources.

Reviewed changes

Copilot reviewed 43 out of 45 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
internal/persistence/sqlinstance/search.go	Removes legacy Postgres search client registration from `sqlinstance`.
internal/persistence/sqlinstance/queries.go	Removes legacy Postgres getters and grant-access implementation from `sqlinstance`.
internal/persistence/sqlinstance/node.go	Removes legacy Postgres ident type registration from `sqlinstance`.
internal/persistence/sqlinstance/models.go	Removes legacy Postgres types/inputs; minor enum unmarshalling + SQLDatabase name tweak.
internal/persistence/sqlinstance/dataloader.go	Removes Postgres watcher plumbing from `sqlinstance` loader context.
internal/persistence/postgres/sortfilter.go	Adds sorting for `PostgresInstance` connections.
internal/persistence/postgres/search.go	Adds search client registration for Zalando Postgres instances.
internal/persistence/postgres/queries.go	Adds list/get/grant-access operations for Zalando Postgres instances.
internal/persistence/postgres/node.go	Adds ident type + parsing for `PostgresInstance`.
internal/persistence/postgres/models.go	Adds `PostgresInstance` model, order types, validation, and converter.
internal/persistence/postgres/dataloader.go	Adds Zalando Postgres watcher + loader context.
internal/persistence/postgres/activitylog.go	Moves Postgres grant-access activitylog transformer into `postgres` package.
internal/kubernetes/watchers/watchers.go	Renames watcher wiring from `PostgresWatcher` to `ZalandoPostgresWatcher` and points to new package.
internal/graph/sqlinstance.resolvers.go	Removes old Postgres mutation + Postgres resolvers from sqlinstance resolver file.
internal/graph/schema/sqlinstance.graphqls	Removes legacy Postgres GraphQL types/mutation/search extensions from sqlinstance schema file.
internal/graph/schema/postgres.graphqls	Introduces new PostgresInstance GraphQL schema + mutation/search extensions.
internal/graph/postgres.resolvers.go	Adds resolvers for PostgresInstance fields and `grantPostgresAccess` mutation.
internal/graph/gengql/valkey.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/utilization.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/teams.generated.go	Regenerates team/team-environment resolver interfaces + execution wiring for Postgres.
internal/graph/gengql/serviceaccounts.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/secret.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/search.generated.go	Regenerates SearchNode union handling for `PostgresInstance`.
internal/graph/gengql/schema.generated.go	Regenerates root schema wiring (mutation/input/node unions) for postgres package types.
internal/graph/gengql/root_.generated.go	Regenerates root interfaces + complexity scaffolding for new Postgres schema.
internal/graph/gengql/repository.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/reconcilers.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/postgres.generated.go	New gqlgen output for PostgresInstance schema/types.
internal/graph/gengql/persistence.generated.go	Regenerates Persistence union handling for `PostgresInstance`.
internal/graph/gengql/opensearch.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/netpol.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/kafka.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/jobs.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/issues.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/complexity.go	Adds complexity calculation hook for `Team.postgresInstances`.
internal/graph/gengql/bucket.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/bigquery.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/applications.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/alerts.generated.go	Regenerates to include new `postgresInstances` field references.
internal/graph/gengql/activitylog.generated.go	Regenerates ActivityLogEntry union handling for postgres activity log entries.
internal/cmd/api/http.go	Wires new watcher into search + adds postgres loader context middleware.
integration_tests/k8s_resources/grant_zalando_postgres_access/dev/someteamname/postgres_foobar.yaml	Adds Postgres CR test fixture for grant-access integration test.
integration_tests/grant_postgres_access.lua	Updates integration tests to use the new Zalando Postgres fixtures and GraphQL behavior.
.configs/gqlgen.yaml	Adds postgres package to gqlgen autobind list.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

internal/persistence/postgres/search.go

internal/graph/schema/postgres.graphqls

internal/persistence/postgres/node.go

thokra-nav · 2026-02-11T10:13:29Z

internal/persistence/postgres/node.go

+func newZalandoPostgresIdent(teamSlug slug.Slug, environmentName, postgresInstanceName string) ident.Ident {
+	return ident.NewIdent(identZalandoPostgres, teamSlug.String(), environmentName, postgresInstanceName)
+}


Hva er egentlig forskjell på newIdent og denne?

thokra-nav · 2026-02-11T10:14:34Z

internal/persistence/postgres/queries.go

+var (
+	specMajorVersion = []string{"spec", "cluster", "majorVersion"}
+	specCPU          = []string{"spec", "cluster", "resources", "cpu"}
+	specMemory       = []string{"spec", "cluster", "resources", "memory"}
+	specDiskSize     = []string{"spec", "cluster", "resources", "diskSize"}
+)


Ser ut som at disse brukes ett sted i models.go, kan de ikke bare inlines eller flyttes dit?

thokra-nav · 2026-02-11T10:18:12Z

internal/persistence/postgres/queries.go

+		Version:  "v1",
+		Resource: "rolebindings",
+	}
+	client, err := fromContext(ctx).zalandoPostgresWatcher.ImpersonatedClientWithNamespace(ctx, input.EnvironmentName, namespace, watcher.WithImpersonatedClientGVR(gvr))


Har brukerne rettighet med sine egne brukere å opprette rollen og rollebindingen?

thokra-nav

Synes det ser fint ut. Uten at det er en blokker så hadde det vært fint med litt mer kommentarer/dokumentasjon i graphql fila så vi slepper å gjøre det senere med litt mindre husk om hva som er rett 😇

…ent function

…antPostgresAccess

sechmann requested a review from a team as a code owner February 10, 2026 13:05

nais-team-app bot added the graphql-review-required label Feb 10, 2026

sechmann and others added 7 commits February 11, 2026 10:32

fix: remote temp file

090c53a

feat(postgres): Remove all facing of zalando

cd00b6c

Co-authored-by: Morten Lied Johansen <morten.lied.johansen@nav.no>

feat(postgres): Introduce PostgresInstance type and related functiona…

c836f9e

…lity

feat(postgres): Add resources and majorVersion fields to PostgresInst…

5248db2

…ance and related functionality

wip: Introduced postgresInstances field in Team, TeamEnvironment, A…

3dfb95d

…pplication, and Job types. No implementation for resolvers yet.

feat(postgres): Implement PostgresInstances resolvers for Application…

cfb8b0c

… and Job types

rbjornstad force-pushed the refactor_zalando_postgres_stuff branch from e86241b to cfb8b0c Compare February 11, 2026 09:32

rbjornstad requested a review from Copilot February 11, 2026 09:36

Copilot started reviewing on behalf of rbjornstad February 11, 2026 09:37 View session

sechmann changed the title ~~refactor: rename Postgres to ZalandoPostgres~~ Move Zalando Postgres stuff to own resolver, add some features Feb 11, 2026

Copilot AI reviewed Feb 11, 2026

View reviewed changes

internal/persistence/postgres/search.go Show resolved Hide resolved

internal/graph/schema/postgres.graphqls Show resolved Hide resolved

internal/persistence/postgres/node.go Outdated Show resolved Hide resolved

fix(postgres): feedback from copilot

99b7c5a

thokra-nav reviewed Feb 11, 2026

View reviewed changes

thokra-nav approved these changes Feb 11, 2026

View reviewed changes

nais-team-app bot removed the graphql-review-required label Feb 11, 2026

rbjornstad added 2 commits February 11, 2026 12:05

refactor(postgres): Update resource field access and remove unused id…

91caea7

…ent function

refactor(postgres): Enhance documentation for PostgresInstance and gr…

40f4a97

…antPostgresAccess

rbjornstad merged commit 2b7bd23 into main Feb 11, 2026
10 checks passed

rbjornstad deleted the refactor_zalando_postgres_stuff branch February 11, 2026 11:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move Zalando Postgres stuff to own resolver, add some features #332

Move Zalando Postgres stuff to own resolver, add some features #332

Uh oh!

sechmann commented Feb 10, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

thokra-nav Feb 11, 2026

Uh oh!

thokra-nav Feb 11, 2026

Uh oh!

thokra-nav Feb 11, 2026

Uh oh!

thokra-nav left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Move Zalando Postgres stuff to own resolver, add some features #332

Move Zalando Postgres stuff to own resolver, add some features #332

Uh oh!

Conversation

sechmann commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

thokra-nav Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

thokra-nav Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

thokra-nav Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

thokra-nav left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

sechmann commented Feb 10, 2026 •

edited

Loading