Skip to content

feat: rename configmap to config and add binary value support #377

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

Open
jhrv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: rename configmap to config and add binary value support #377

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
2 changes: 1 addition & 1 deletion .configs/gqlgen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ autobind:
- "github.com/nais/api/internal/workload/logging"
- "github.com/nais/api/internal/workload/netpol"
- "github.com/nais/api/internal/workload/podlog"
- "github.com/nais/api/internal/workload/configmap"
- "github.com/nais/api/internal/workload/config"
- "github.com/nais/api/internal/workload/secret"

# Don't generate Get<FieldName> functions for fields included in the GraphQL interfaces
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/api/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import (
"github.com/nais/api/internal/vulnerability"
"github.com/nais/api/internal/workload"
"github.com/nais/api/internal/workload/application"
"github.com/nais/api/internal/workload/configmap"
"github.com/nais/api/internal/workload/config"
"github.com/nais/api/internal/workload/job"
"github.com/nais/api/internal/workload/logging"
"github.com/nais/api/internal/workload/podlog"
Expand Down Expand Up @@ -321,7 +321,7 @@ func ConfigureGraph(
ctx = kafkatopic.NewLoaderContext(ctx, watchers.KafkaTopicWatcher)
ctx = workload.NewLoaderContext(ctx, watchers.PodWatcher)
ctx = secret.NewLoaderContext(ctx, watchers.SecretWatcher, secretClientCreator, dynamicClients, clusters, log)
ctx = configmap.NewLoaderContext(ctx, watchers.ConfigMapWatcher, log)
ctx = config.NewLoaderContext(ctx, watchers.ConfigWatcher, log)
ctx = aiven.NewLoaderContext(ctx, aivenProjects)
ctx = opensearch.NewLoaderContext(ctx, tenantName, watchers.OpenSearchWatcher, aivenClient, log)
ctx = valkey.NewLoaderContext(ctx, tenantName, watchers.ValkeyWatcher, aivenClient)
Expand Down
72 changes: 36 additions & 36 deletions internal/graph/configmap.resolvers.go → internal/graph/config.resolvers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,32 @@ import (
"github.com/nais/api/internal/user"
"github.com/nais/api/internal/workload"
"github.com/nais/api/internal/workload/application"
"github.com/nais/api/internal/workload/configmap"
"github.com/nais/api/internal/workload/config"
"github.com/nais/api/internal/workload/job"
)

func (r *applicationResolver) Configs(ctx context.Context, obj *application.Application, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*configmap.Config], error) {
func (r *applicationResolver) Configs(ctx context.Context, obj *application.Application, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*config.Config], error) {
page, err := pagination.ParsePage(first, after, last, before)
if err != nil {
return nil, err
}

return configmap.ListForWorkload(ctx, obj.TeamSlug, obj.EnvironmentName, obj, page)
return config.ListForWorkload(ctx, obj.TeamSlug, obj.EnvironmentName, obj, page)
}

func (r *configResolver) TeamEnvironment(ctx context.Context, obj *configmap.Config) (*team.TeamEnvironment, error) {
func (r *configResolver) TeamEnvironment(ctx context.Context, obj *config.Config) (*team.TeamEnvironment, error) {
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
}

func (r *configResolver) Team(ctx context.Context, obj *configmap.Config) (*team.Team, error) {
func (r *configResolver) Team(ctx context.Context, obj *config.Config) (*team.Team, error) {
return team.Get(ctx, obj.TeamSlug)
}

func (r *configResolver) Values(ctx context.Context, obj *configmap.Config) ([]*configmap.ConfigValue, error) {
return configmap.GetConfigValues(ctx, obj.TeamSlug, obj.EnvironmentName, obj.Name)
func (r *configResolver) Values(ctx context.Context, obj *config.Config) ([]*config.ConfigValue, error) {
return config.GetConfigValues(ctx, obj.TeamSlug, obj.EnvironmentName, obj.Name)
}

func (r *configResolver) Applications(ctx context.Context, obj *configmap.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*application.Application], error) {
func (r *configResolver) Applications(ctx context.Context, obj *config.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*application.Application], error) {
page, err := pagination.ParsePage(first, after, last, before)
if err != nil {
return nil, err
Expand All @@ -59,7 +59,7 @@ func (r *configResolver) Applications(ctx context.Context, obj *configmap.Config
return pagination.NewConnection(apps, page, len(ret)), nil
}

func (r *configResolver) Jobs(ctx context.Context, obj *configmap.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*job.Job], error) {
func (r *configResolver) Jobs(ctx context.Context, obj *config.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*job.Job], error) {
page, err := pagination.ParsePage(first, after, last, before)
if err != nil {
return nil, err
Expand All @@ -78,7 +78,7 @@ func (r *configResolver) Jobs(ctx context.Context, obj *configmap.Config, first
return pagination.NewConnection(jobs, page, len(ret)), nil
}

func (r *configResolver) Workloads(ctx context.Context, obj *configmap.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[workload.Workload], error) {
func (r *configResolver) Workloads(ctx context.Context, obj *config.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[workload.Workload], error) {
page, err := pagination.ParsePage(first, after, last, before)
if err != nil {
return nil, err
Expand Down Expand Up @@ -107,7 +107,7 @@ func (r *configResolver) Workloads(ctx context.Context, obj *configmap.Config, f
return pagination.NewConnection(workloads, page, len(ret)), nil
}

func (r *configResolver) LastModifiedBy(ctx context.Context, obj *configmap.Config) (*user.User, error) {
func (r *configResolver) LastModifiedBy(ctx context.Context, obj *config.Config) (*user.User, error) {
if obj.ModifiedByUserEmail == nil {
return nil, nil
}
Expand All @@ -123,7 +123,7 @@ func (r *configResolver) LastModifiedBy(ctx context.Context, obj *configmap.Conf
return u, nil
}

func (r *configResolver) ActivityLog(ctx context.Context, obj *configmap.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) (*pagination.Connection[activitylog.ActivityLogEntry], error) {
func (r *configResolver) ActivityLog(ctx context.Context, obj *config.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, filter *activitylog.ActivityLogFilter) (*pagination.Connection[activitylog.ActivityLogEntry], error) {
page, err := pagination.ParsePage(first, after, last, before)
if err != nil {
return nil, err
Expand All @@ -140,107 +140,107 @@ func (r *configResolver) ActivityLog(ctx context.Context, obj *configmap.Config,
)
}

func (r *jobResolver) Configs(ctx context.Context, obj *job.Job, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*configmap.Config], error) {
func (r *jobResolver) Configs(ctx context.Context, obj *job.Job, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*config.Config], error) {
page, err := pagination.ParsePage(first, after, last, before)
if err != nil {
return nil, err
}

return configmap.ListForWorkload(ctx, obj.TeamSlug, obj.EnvironmentName, obj, page)
return config.ListForWorkload(ctx, obj.TeamSlug, obj.EnvironmentName, obj, page)
}

func (r *mutationResolver) CreateConfig(ctx context.Context, input configmap.CreateConfigInput) (*configmap.CreateConfigPayload, error) {
func (r *mutationResolver) CreateConfig(ctx context.Context, input config.CreateConfigInput) (*config.CreateConfigPayload, error) {
if err := authz.CanCreateConfigs(ctx, input.TeamSlug); err != nil {
return nil, err
}

c, err := configmap.Create(ctx, input.TeamSlug, input.EnvironmentName, input.Name)
c, err := config.Create(ctx, input.TeamSlug, input.EnvironmentName, input.Name)
if err != nil {
return nil, err
}

return &configmap.CreateConfigPayload{
return &config.CreateConfigPayload{
Config: c,
}, nil
}

func (r *mutationResolver) AddConfigValue(ctx context.Context, input configmap.AddConfigValueInput) (*configmap.AddConfigValuePayload, error) {
func (r *mutationResolver) AddConfigValue(ctx context.Context, input config.AddConfigValueInput) (*config.AddConfigValuePayload, error) {
if err := authz.CanUpdateConfigs(ctx, input.TeamSlug); err != nil {
return nil, err
}

c, err := configmap.AddConfigValue(ctx, input.TeamSlug, input.EnvironmentName, input.Name, input.Value)
c, err := config.AddConfigValue(ctx, input.TeamSlug, input.EnvironmentName, input.Name, input.Value)
if err != nil {
return nil, err
}

return &configmap.AddConfigValuePayload{
return &config.AddConfigValuePayload{
Config: c,
}, nil
}

func (r *mutationResolver) UpdateConfigValue(ctx context.Context, input configmap.UpdateConfigValueInput) (*configmap.UpdateConfigValuePayload, error) {
func (r *mutationResolver) UpdateConfigValue(ctx context.Context, input config.UpdateConfigValueInput) (*config.UpdateConfigValuePayload, error) {
if err := authz.CanUpdateConfigs(ctx, input.TeamSlug); err != nil {
return nil, err
}

c, err := configmap.UpdateConfigValue(ctx, input.TeamSlug, input.EnvironmentName, input.Name, input.Value)
c, err := config.UpdateConfigValue(ctx, input.TeamSlug, input.EnvironmentName, input.Name, input.Value)
if err != nil {
return nil, err
}

return &configmap.UpdateConfigValuePayload{
return &config.UpdateConfigValuePayload{
Config: c,
}, nil
}

func (r *mutationResolver) RemoveConfigValue(ctx context.Context, input configmap.RemoveConfigValueInput) (*configmap.RemoveConfigValuePayload, error) {
func (r *mutationResolver) RemoveConfigValue(ctx context.Context, input config.RemoveConfigValueInput) (*config.RemoveConfigValuePayload, error) {
if err := authz.CanUpdateConfigs(ctx, input.TeamSlug); err != nil {
return nil, err
}

c, err := configmap.RemoveConfigValue(ctx, input.TeamSlug, input.EnvironmentName, input.ConfigName, input.ValueName)
c, err := config.RemoveConfigValue(ctx, input.TeamSlug, input.EnvironmentName, input.ConfigName, input.ValueName)
if err != nil {
return nil, err
}

return &configmap.RemoveConfigValuePayload{
return &config.RemoveConfigValuePayload{
Config: c,
}, nil
}

func (r *mutationResolver) DeleteConfig(ctx context.Context, input configmap.DeleteConfigInput) (*configmap.DeleteConfigPayload, error) {
func (r *mutationResolver) DeleteConfig(ctx context.Context, input config.DeleteConfigInput) (*config.DeleteConfigPayload, error) {
if err := authz.CanDeleteConfigs(ctx, input.TeamSlug); err != nil {
return nil, err
}

if err := configmap.Delete(ctx, input.TeamSlug, input.EnvironmentName, input.Name); err != nil {
if err := config.Delete(ctx, input.TeamSlug, input.EnvironmentName, input.Name); err != nil {
return nil, err
}

return &configmap.DeleteConfigPayload{
return &config.DeleteConfigPayload{
ConfigDeleted: true,
}, nil
}

// Configs returns all configs for a team.
func (r *teamResolver) Configs(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *configmap.ConfigOrder, filter *configmap.ConfigFilter) (*pagination.Connection[*configmap.Config], error) {
func (r *teamResolver) Configs(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *config.ConfigOrder, filter *config.ConfigFilter) (*pagination.Connection[*config.Config], error) {
page, err := pagination.ParsePage(first, after, last, before)
if err != nil {
return nil, err
}

return configmap.ListForTeam(ctx, obj.Slug, page, orderBy, filter)
return config.ListForTeam(ctx, obj.Slug, page, orderBy, filter)
}

// Config returns a single config by name.
func (r *teamEnvironmentResolver) Config(ctx context.Context, obj *team.TeamEnvironment, name string) (*configmap.Config, error) {
return configmap.Get(ctx, obj.TeamSlug, obj.EnvironmentName, name)
func (r *teamEnvironmentResolver) Config(ctx context.Context, obj *team.TeamEnvironment, name string) (*config.Config, error) {
return config.Get(ctx, obj.TeamSlug, obj.EnvironmentName, name)
}

func (r *teamInventoryCountsResolver) Configs(ctx context.Context, obj *team.TeamInventoryCounts) (*configmap.TeamInventoryCountConfigs, error) {
return &configmap.TeamInventoryCountConfigs{
Total: configmap.CountForTeam(ctx, obj.TeamSlug),
func (r *teamInventoryCountsResolver) Configs(ctx context.Context, obj *team.TeamInventoryCounts) (*config.TeamInventoryCountConfigs, error) {
return &config.TeamInventoryCountConfigs{
Total: config.CountForTeam(ctx, obj.TeamSlug),
}, nil
}

Expand Down
18 changes: 9 additions & 9 deletions internal/graph/gengql/activitylog.generated.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions internal/graph/gengql/applications.generated.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions internal/graph/gengql/complexity.go
View file
Open in desktop

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

Loading
Loading