Skip to content

fix: add ClusterName for Kubernetes API calls in secret resolvers #313

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
frodesundby merged 1 commit into from
Jan 21, 2026
Merged

fix: add ClusterName for Kubernetes API calls in secret resolvers #313

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
13 changes: 7 additions & 6 deletions internal/graph/secret.resolvers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"slices"

"github.com/nais/api/internal/auth/authz"
"github.com/nais/api/internal/environmentmapper"
"github.com/nais/api/internal/graph/gengql"
"github.com/nais/api/internal/graph/model"
"github.com/nais/api/internal/graph/pagination"
Expand Down Expand Up @@ -39,7 +40,7 @@ func (r *mutationResolver) CreateSecret(ctx context.Context, input secret.Create
return nil, err
}

s, err := secret.Create(ctx, input.Team, input.Environment, input.Name)
s, err := secret.Create(ctx, input.Team, environmentmapper.ClusterName(input.Environment), input.Name)
if err != nil {
return nil, err
}
Expand All @@ -54,7 +55,7 @@ func (r *mutationResolver) AddSecretValue(ctx context.Context, input secret.AddS
return nil, err
}

s, err := secret.AddSecretValue(ctx, input.Team, input.Environment, input.Name, input.Value)
s, err := secret.AddSecretValue(ctx, input.Team, environmentmapper.ClusterName(input.Environment), input.Name, input.Value)
if err != nil {
return nil, err
}
Expand All @@ -69,7 +70,7 @@ func (r *mutationResolver) UpdateSecretValue(ctx context.Context, input secret.U
return nil, err
}

s, err := secret.UpdateSecretValue(ctx, input.Team, input.Environment, input.Name, input.Value)
s, err := secret.UpdateSecretValue(ctx, input.Team, environmentmapper.ClusterName(input.Environment), input.Name, input.Value)
if err != nil {
return nil, err
}
Expand All @@ -84,7 +85,7 @@ func (r *mutationResolver) RemoveSecretValue(ctx context.Context, input secret.R
return nil, err
}

s, err := secret.RemoveSecretValue(ctx, input.Team, input.Environment, input.SecretName, input.ValueName)
s, err := secret.RemoveSecretValue(ctx, input.Team, environmentmapper.ClusterName(input.Environment), input.SecretName, input.ValueName)
if err != nil {
return nil, err
}
Expand All @@ -99,7 +100,7 @@ func (r *mutationResolver) DeleteSecret(ctx context.Context, input secret.Delete
return nil, err
}

if err := secret.Delete(ctx, input.Team, input.Environment, input.Name); err != nil {
if err := secret.Delete(ctx, input.Team, environmentmapper.ClusterName(input.Environment), input.Name); err != nil {
return nil, err
}

Expand All @@ -125,7 +126,7 @@ func (r *secretResolver) Values(ctx context.Context, obj *secret.Secret) ([]*sec
return nil, err
}

return secret.GetSecretValues(ctx, obj.TeamSlug, obj.EnvironmentName, obj.Name)
return secret.GetSecretValues(ctx, obj.TeamSlug, environmentmapper.ClusterName(obj.EnvironmentName), obj.Name)
}

func (r *secretResolver) Applications(ctx context.Context, obj *secret.Secret, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*application.Application], error) {
Expand Down