diff --git a/.configs/gqlgen.yaml b/.configs/gqlgen.yaml index 20b410861..4c4d301b2 100644 --- a/.configs/gqlgen.yaml +++ b/.configs/gqlgen.yaml @@ -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 functions for fields included in the GraphQL interfaces diff --git a/internal/cmd/api/http.go b/internal/cmd/api/http.go index 63c54dde7..51f353639 100644 --- a/internal/cmd/api/http.go +++ b/internal/cmd/api/http.go @@ -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" @@ -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) diff --git a/internal/graph/configmap.resolvers.go b/internal/graph/config.resolvers.go similarity index 65% rename from internal/graph/configmap.resolvers.go rename to internal/graph/config.resolvers.go index bd0e3e1c0..bf1552d54 100644 --- a/internal/graph/configmap.resolvers.go +++ b/internal/graph/config.resolvers.go @@ -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 @@ -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 @@ -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 @@ -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 } @@ -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 @@ -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 } diff --git a/internal/graph/gengql/activitylog.generated.go b/internal/graph/gengql/activitylog.generated.go index 00c289a71..8944de795 100644 --- a/internal/graph/gengql/activitylog.generated.go +++ b/internal/graph/gengql/activitylog.generated.go @@ -27,7 +27,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/secret" "github.com/vektah/gqlparser/v2/ast" @@ -567,23 +567,23 @@ func (ec *executionContext) _ActivityLogEntry(ctx context.Context, sel ast.Selec return graphql.Null } return ec._CredentialsActivityLogEntry(ctx, sel, obj) - case configmap.ConfigUpdatedActivityLogEntry: + case config.ConfigUpdatedActivityLogEntry: return ec._ConfigUpdatedActivityLogEntry(ctx, sel, &obj) - case *configmap.ConfigUpdatedActivityLogEntry: + case *config.ConfigUpdatedActivityLogEntry: if obj == nil { return graphql.Null } return ec._ConfigUpdatedActivityLogEntry(ctx, sel, obj) - case configmap.ConfigDeletedActivityLogEntry: + case config.ConfigDeletedActivityLogEntry: return ec._ConfigDeletedActivityLogEntry(ctx, sel, &obj) - case *configmap.ConfigDeletedActivityLogEntry: + case *config.ConfigDeletedActivityLogEntry: if obj == nil { return graphql.Null } return ec._ConfigDeletedActivityLogEntry(ctx, sel, obj) - case configmap.ConfigCreatedActivityLogEntry: + case config.ConfigCreatedActivityLogEntry: return ec._ConfigCreatedActivityLogEntry(ctx, sel, &obj) - case *configmap.ConfigCreatedActivityLogEntry: + case *config.ConfigCreatedActivityLogEntry: if obj == nil { return graphql.Null } @@ -690,9 +690,9 @@ func (ec *executionContext) _ActivityLogger(ctx context.Context, sel ast.Selecti return graphql.Null } return ec._ContainerImage(ctx, sel, obj) - case configmap.Config: + case config.Config: return ec._Config(ctx, sel, &obj) - case *configmap.Config: + case *config.Config: if obj == nil { return graphql.Null } diff --git a/internal/graph/gengql/applications.generated.go b/internal/graph/gengql/applications.generated.go index 11ccc7840..51511a9d3 100644 --- a/internal/graph/gengql/applications.generated.go +++ b/internal/graph/gengql/applications.generated.go @@ -28,7 +28,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/logging" "github.com/nais/api/internal/workload/netpol" "github.com/nais/api/internal/workload/secret" @@ -51,7 +51,7 @@ type ApplicationResolver interface { Issues(ctx context.Context, obj *application.Application, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) (*pagination.Connection[issue.Issue], error) BigQueryDatasets(ctx context.Context, obj *application.Application, orderBy *bigquery.BigQueryDatasetOrder) (*pagination.Connection[*bigquery.BigQueryDataset], error) Buckets(ctx context.Context, obj *application.Application, orderBy *bucket.BucketOrder) (*pagination.Connection[*bucket.Bucket], error) - Configs(ctx context.Context, obj *application.Application, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*configmap.Config], error) + Configs(ctx context.Context, obj *application.Application, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*config.Config], error) Cost(ctx context.Context, obj *application.Application) (*cost.WorkloadCost, error) Deployments(ctx context.Context, obj *application.Application, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*deployment.Deployment], error) KafkaTopicAcls(ctx context.Context, obj *application.Application, orderBy *kafkatopic.KafkaTopicACLOrder) (*pagination.Connection[*kafkatopic.KafkaTopicACL], error) diff --git a/internal/graph/gengql/complexity.go b/internal/graph/gengql/complexity.go index bf93e55e7..afbd43c34 100644 --- a/internal/graph/gengql/complexity.go +++ b/internal/graph/gengql/complexity.go @@ -22,7 +22,7 @@ import ( vulnerability "github.com/nais/api/internal/vulnerability" workload "github.com/nais/api/internal/workload" application "github.com/nais/api/internal/workload/application" - configmap "github.com/nais/api/internal/workload/configmap" + config "github.com/nais/api/internal/workload/config" job "github.com/nais/api/internal/workload/job" secret "github.com/nais/api/internal/workload/secret" ) @@ -198,7 +198,7 @@ func NewComplexityRoot() ComplexityRoot { c.Team.Buckets = func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bucket.BucketOrder) int { return cursorComplexity(first, last) * childComplexity } - c.Team.Configs = func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *configmap.ConfigOrder, filter *configmap.ConfigFilter) int { + c.Team.Configs = func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *config.ConfigOrder, filter *config.ConfigFilter) int { return cursorComplexity(first, last) * childComplexity } c.Team.Deployments = func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) int { diff --git a/internal/graph/gengql/configmap.generated.go b/internal/graph/gengql/config.generated.go similarity index 88% rename from internal/graph/gengql/configmap.generated.go rename to internal/graph/gengql/config.generated.go index bcff84ad8..2a3976d0e 100644 --- a/internal/graph/gengql/configmap.generated.go +++ b/internal/graph/gengql/config.generated.go @@ -16,7 +16,7 @@ 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" "github.com/vektah/gqlparser/v2/ast" ) @@ -24,15 +24,15 @@ import ( // region ************************** generated!.gotpl ************************** type ConfigResolver interface { - TeamEnvironment(ctx context.Context, obj *configmap.Config) (*team.TeamEnvironment, error) - Team(ctx context.Context, obj *configmap.Config) (*team.Team, error) - Values(ctx context.Context, obj *configmap.Config) ([]*configmap.ConfigValue, error) - Applications(ctx context.Context, obj *configmap.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*application.Application], error) - Jobs(ctx context.Context, obj *configmap.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*job.Job], error) - Workloads(ctx context.Context, obj *configmap.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[workload.Workload], error) + TeamEnvironment(ctx context.Context, obj *config.Config) (*team.TeamEnvironment, error) + Team(ctx context.Context, obj *config.Config) (*team.Team, error) + Values(ctx context.Context, obj *config.Config) ([]*config.ConfigValue, error) + Applications(ctx context.Context, obj *config.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*application.Application], error) + Jobs(ctx context.Context, obj *config.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*job.Job], error) + Workloads(ctx context.Context, obj *config.Config, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[workload.Workload], error) - LastModifiedBy(ctx context.Context, obj *configmap.Config) (*user.User, error) - 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) + LastModifiedBy(ctx context.Context, obj *config.Config) (*user.User, error) + 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) } // endregion ************************** generated!.gotpl ************************** @@ -156,7 +156,7 @@ func (ec *executionContext) field_Config_workloads_args(ctx context.Context, raw // region **************************** field.gotpl ***************************** -func (ec *executionContext) _AddConfigValuePayload_config(ctx context.Context, field graphql.CollectedField, obj *configmap.AddConfigValuePayload) (ret graphql.Marshaler) { +func (ec *executionContext) _AddConfigValuePayload_config(ctx context.Context, field graphql.CollectedField, obj *config.AddConfigValuePayload) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -166,7 +166,7 @@ func (ec *executionContext) _AddConfigValuePayload_config(ctx context.Context, f return obj.Config, nil }, nil, - ec.marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig, + ec.marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig, true, false, ) @@ -209,7 +209,7 @@ func (ec *executionContext) fieldContext_AddConfigValuePayload_config(_ context. return fc, nil } -func (ec *executionContext) _Config_id(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_id(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -238,7 +238,7 @@ func (ec *executionContext) fieldContext_Config_id(_ context.Context, field grap return fc, nil } -func (ec *executionContext) _Config_name(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_name(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -267,7 +267,7 @@ func (ec *executionContext) fieldContext_Config_name(_ context.Context, field gr return fc, nil } -func (ec *executionContext) _Config_teamEnvironment(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_teamEnvironment(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -338,7 +338,7 @@ func (ec *executionContext) fieldContext_Config_teamEnvironment(_ context.Contex return fc, nil } -func (ec *executionContext) _Config_team(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_team(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -451,7 +451,7 @@ func (ec *executionContext) fieldContext_Config_team(_ context.Context, field gr return fc, nil } -func (ec *executionContext) _Config_values(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_values(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -461,7 +461,7 @@ func (ec *executionContext) _Config_values(ctx context.Context, field graphql.Co return ec.Resolvers.Config().Values(ctx, obj) }, nil, - ec.marshalNConfigValue2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigValueᚄ, + ec.marshalNConfigValue2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigValueᚄ, true, true, ) @@ -479,6 +479,8 @@ func (ec *executionContext) fieldContext_Config_values(_ context.Context, field return ec.fieldContext_ConfigValue_name(ctx, field) case "value": return ec.fieldContext_ConfigValue_value(ctx, field) + case "encoding": + return ec.fieldContext_ConfigValue_encoding(ctx, field) } return nil, fmt.Errorf("no field named %q was found under type ConfigValue", field.Name) }, @@ -486,7 +488,7 @@ func (ec *executionContext) fieldContext_Config_values(_ context.Context, field return fc, nil } -func (ec *executionContext) _Config_applications(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_applications(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -535,7 +537,7 @@ func (ec *executionContext) fieldContext_Config_applications(ctx context.Context return fc, nil } -func (ec *executionContext) _Config_jobs(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_jobs(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -584,7 +586,7 @@ func (ec *executionContext) fieldContext_Config_jobs(ctx context.Context, field return fc, nil } -func (ec *executionContext) _Config_workloads(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_workloads(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -633,7 +635,7 @@ func (ec *executionContext) fieldContext_Config_workloads(ctx context.Context, f return fc, nil } -func (ec *executionContext) _Config_lastModifiedAt(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_lastModifiedAt(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -662,7 +664,7 @@ func (ec *executionContext) fieldContext_Config_lastModifiedAt(_ context.Context return fc, nil } -func (ec *executionContext) _Config_lastModifiedBy(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_lastModifiedBy(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -705,7 +707,7 @@ func (ec *executionContext) fieldContext_Config_lastModifiedBy(_ context.Context return fc, nil } -func (ec *executionContext) _Config_activityLog(ctx context.Context, field graphql.CollectedField, obj *configmap.Config) (ret graphql.Marshaler) { +func (ec *executionContext) _Config_activityLog(ctx context.Context, field graphql.CollectedField, obj *config.Config) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -754,7 +756,7 @@ func (ec *executionContext) fieldContext_Config_activityLog(ctx context.Context, return fc, nil } -func (ec *executionContext) _ConfigConnection_pageInfo(ctx context.Context, field graphql.CollectedField, obj *pagination.Connection[*configmap.Config]) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigConnection_pageInfo(ctx context.Context, field graphql.CollectedField, obj *pagination.Connection[*config.Config]) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -799,7 +801,7 @@ func (ec *executionContext) fieldContext_ConfigConnection_pageInfo(_ context.Con return fc, nil } -func (ec *executionContext) _ConfigConnection_nodes(ctx context.Context, field graphql.CollectedField, obj *pagination.Connection[*configmap.Config]) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigConnection_nodes(ctx context.Context, field graphql.CollectedField, obj *pagination.Connection[*config.Config]) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -809,7 +811,7 @@ func (ec *executionContext) _ConfigConnection_nodes(ctx context.Context, field g return obj.Nodes(), nil }, nil, - ec.marshalNConfig2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigᚄ, + ec.marshalNConfig2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigᚄ, true, true, ) @@ -852,7 +854,7 @@ func (ec *executionContext) fieldContext_ConfigConnection_nodes(_ context.Contex return fc, nil } -func (ec *executionContext) _ConfigConnection_edges(ctx context.Context, field graphql.CollectedField, obj *pagination.Connection[*configmap.Config]) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigConnection_edges(ctx context.Context, field graphql.CollectedField, obj *pagination.Connection[*config.Config]) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -887,7 +889,7 @@ func (ec *executionContext) fieldContext_ConfigConnection_edges(_ context.Contex return fc, nil } -func (ec *executionContext) _ConfigCreatedActivityLogEntry_id(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigCreatedActivityLogEntry_id(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -916,7 +918,7 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_id(_ cont return fc, nil } -func (ec *executionContext) _ConfigCreatedActivityLogEntry_actor(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigCreatedActivityLogEntry_actor(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -945,7 +947,7 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_actor(_ c return fc, nil } -func (ec *executionContext) _ConfigCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -974,7 +976,7 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_createdAt return fc, nil } -func (ec *executionContext) _ConfigCreatedActivityLogEntry_message(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigCreatedActivityLogEntry_message(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1003,7 +1005,7 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_message(_ return fc, nil } -func (ec *executionContext) _ConfigCreatedActivityLogEntry_resourceType(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigCreatedActivityLogEntry_resourceType(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1032,7 +1034,7 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_resourceT return fc, nil } -func (ec *executionContext) _ConfigCreatedActivityLogEntry_resourceName(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigCreatedActivityLogEntry_resourceName(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1061,7 +1063,7 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_resourceN return fc, nil } -func (ec *executionContext) _ConfigCreatedActivityLogEntry_teamSlug(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigCreatedActivityLogEntry_teamSlug(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1090,7 +1092,7 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_teamSlug( return fc, nil } -func (ec *executionContext) _ConfigCreatedActivityLogEntry_environmentName(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigCreatedActivityLogEntry_environmentName(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1119,7 +1121,7 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_environme return fc, nil } -func (ec *executionContext) _ConfigDeletedActivityLogEntry_id(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigDeletedActivityLogEntry_id(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1148,7 +1150,7 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_id(_ cont return fc, nil } -func (ec *executionContext) _ConfigDeletedActivityLogEntry_actor(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigDeletedActivityLogEntry_actor(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1177,7 +1179,7 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_actor(_ c return fc, nil } -func (ec *executionContext) _ConfigDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1206,7 +1208,7 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_createdAt return fc, nil } -func (ec *executionContext) _ConfigDeletedActivityLogEntry_message(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigDeletedActivityLogEntry_message(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1235,7 +1237,7 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_message(_ return fc, nil } -func (ec *executionContext) _ConfigDeletedActivityLogEntry_resourceType(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigDeletedActivityLogEntry_resourceType(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1264,7 +1266,7 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_resourceT return fc, nil } -func (ec *executionContext) _ConfigDeletedActivityLogEntry_resourceName(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigDeletedActivityLogEntry_resourceName(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1293,7 +1295,7 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_resourceN return fc, nil } -func (ec *executionContext) _ConfigDeletedActivityLogEntry_teamSlug(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigDeletedActivityLogEntry_teamSlug(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1322,7 +1324,7 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_teamSlug( return fc, nil } -func (ec *executionContext) _ConfigDeletedActivityLogEntry_environmentName(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigDeletedActivityLogEntry_environmentName(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1351,7 +1353,7 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_environme return fc, nil } -func (ec *executionContext) _ConfigEdge_cursor(ctx context.Context, field graphql.CollectedField, obj *pagination.Edge[*configmap.Config]) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigEdge_cursor(ctx context.Context, field graphql.CollectedField, obj *pagination.Edge[*config.Config]) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1380,7 +1382,7 @@ func (ec *executionContext) fieldContext_ConfigEdge_cursor(_ context.Context, fi return fc, nil } -func (ec *executionContext) _ConfigEdge_node(ctx context.Context, field graphql.CollectedField, obj *pagination.Edge[*configmap.Config]) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigEdge_node(ctx context.Context, field graphql.CollectedField, obj *pagination.Edge[*config.Config]) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1390,7 +1392,7 @@ func (ec *executionContext) _ConfigEdge_node(ctx context.Context, field graphql. return obj.Node, nil }, nil, - ec.marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig, + ec.marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig, true, true, ) @@ -1433,7 +1435,7 @@ func (ec *executionContext) fieldContext_ConfigEdge_node(_ context.Context, fiel return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_id(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_id(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1462,7 +1464,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_id(_ cont return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_actor(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_actor(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1491,7 +1493,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_actor(_ c return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1520,7 +1522,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_createdAt return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_message(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_message(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1549,7 +1551,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_message(_ return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_resourceType(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_resourceType(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1578,7 +1580,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_resourceT return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_resourceName(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_resourceName(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1607,7 +1609,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_resourceN return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_teamSlug(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_teamSlug(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1636,7 +1638,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_teamSlug( return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_environmentName(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_environmentName(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1665,7 +1667,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_environme return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntry_data(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_data(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1675,7 +1677,7 @@ func (ec *executionContext) _ConfigUpdatedActivityLogEntry_data(ctx context.Cont return obj.Data, nil }, nil, - ec.marshalNConfigUpdatedActivityLogEntryData2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigUpdatedActivityLogEntryData, + ec.marshalNConfigUpdatedActivityLogEntryData2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigUpdatedActivityLogEntryData, true, true, ) @@ -1698,7 +1700,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_data(_ co return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntryData_updatedFields(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntryData) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntryData_updatedFields(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntryData) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1708,7 +1710,7 @@ func (ec *executionContext) _ConfigUpdatedActivityLogEntryData_updatedFields(ctx return obj.UpdatedFields, nil }, nil, - ec.marshalNConfigUpdatedActivityLogEntryDataUpdatedField2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigUpdatedActivityLogEntryDataUpdatedFieldᚄ, + ec.marshalNConfigUpdatedActivityLogEntryDataUpdatedField2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigUpdatedActivityLogEntryDataUpdatedFieldᚄ, true, true, ) @@ -1735,7 +1737,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntryData_updat return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField_field(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntryDataUpdatedField) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField_field(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntryDataUpdatedField) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1764,7 +1766,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntryDataUpdate return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField_oldValue(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntryDataUpdatedField) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField_oldValue(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntryDataUpdatedField) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1793,7 +1795,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntryDataUpdate return fc, nil } -func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField_newValue(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigUpdatedActivityLogEntryDataUpdatedField) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField_newValue(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntryDataUpdatedField) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1822,7 +1824,7 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntryDataUpdate return fc, nil } -func (ec *executionContext) _ConfigValue_name(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigValue) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigValue_name(ctx context.Context, field graphql.CollectedField, obj *config.ConfigValue) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1851,7 +1853,7 @@ func (ec *executionContext) fieldContext_ConfigValue_name(_ context.Context, fie return fc, nil } -func (ec *executionContext) _ConfigValue_value(ctx context.Context, field graphql.CollectedField, obj *configmap.ConfigValue) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigValue_value(ctx context.Context, field graphql.CollectedField, obj *config.ConfigValue) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1880,7 +1882,36 @@ func (ec *executionContext) fieldContext_ConfigValue_value(_ context.Context, fi return fc, nil } -func (ec *executionContext) _CreateConfigPayload_config(ctx context.Context, field graphql.CollectedField, obj *configmap.CreateConfigPayload) (ret graphql.Marshaler) { +func (ec *executionContext) _ConfigValue_encoding(ctx context.Context, field graphql.CollectedField, obj *config.ConfigValue) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + ec.fieldContext_ConfigValue_encoding, + func(ctx context.Context) (any, error) { + return obj.Encoding, nil + }, + nil, + ec.marshalNValueEncoding2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋsecretᚐValueEncoding, + true, + true, + ) +} + +func (ec *executionContext) fieldContext_ConfigValue_encoding(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ConfigValue", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return nil, errors.New("field of type ValueEncoding does not have child fields") + }, + } + return fc, nil +} + +func (ec *executionContext) _CreateConfigPayload_config(ctx context.Context, field graphql.CollectedField, obj *config.CreateConfigPayload) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1890,7 +1921,7 @@ func (ec *executionContext) _CreateConfigPayload_config(ctx context.Context, fie return obj.Config, nil }, nil, - ec.marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig, + ec.marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig, true, false, ) @@ -1933,7 +1964,7 @@ func (ec *executionContext) fieldContext_CreateConfigPayload_config(_ context.Co return fc, nil } -func (ec *executionContext) _DeleteConfigPayload_configDeleted(ctx context.Context, field graphql.CollectedField, obj *configmap.DeleteConfigPayload) (ret graphql.Marshaler) { +func (ec *executionContext) _DeleteConfigPayload_configDeleted(ctx context.Context, field graphql.CollectedField, obj *config.DeleteConfigPayload) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1962,7 +1993,7 @@ func (ec *executionContext) fieldContext_DeleteConfigPayload_configDeleted(_ con return fc, nil } -func (ec *executionContext) _RemoveConfigValuePayload_config(ctx context.Context, field graphql.CollectedField, obj *configmap.RemoveConfigValuePayload) (ret graphql.Marshaler) { +func (ec *executionContext) _RemoveConfigValuePayload_config(ctx context.Context, field graphql.CollectedField, obj *config.RemoveConfigValuePayload) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -1972,7 +2003,7 @@ func (ec *executionContext) _RemoveConfigValuePayload_config(ctx context.Context return obj.Config, nil }, nil, - ec.marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig, + ec.marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig, true, false, ) @@ -2015,7 +2046,7 @@ func (ec *executionContext) fieldContext_RemoveConfigValuePayload_config(_ conte return fc, nil } -func (ec *executionContext) _TeamInventoryCountConfigs_total(ctx context.Context, field graphql.CollectedField, obj *configmap.TeamInventoryCountConfigs) (ret graphql.Marshaler) { +func (ec *executionContext) _TeamInventoryCountConfigs_total(ctx context.Context, field graphql.CollectedField, obj *config.TeamInventoryCountConfigs) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -2044,7 +2075,7 @@ func (ec *executionContext) fieldContext_TeamInventoryCountConfigs_total(_ conte return fc, nil } -func (ec *executionContext) _UpdateConfigValuePayload_config(ctx context.Context, field graphql.CollectedField, obj *configmap.UpdateConfigValuePayload) (ret graphql.Marshaler) { +func (ec *executionContext) _UpdateConfigValuePayload_config(ctx context.Context, field graphql.CollectedField, obj *config.UpdateConfigValuePayload) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, ec.OperationContext, @@ -2054,7 +2085,7 @@ func (ec *executionContext) _UpdateConfigValuePayload_config(ctx context.Context return obj.Config, nil }, nil, - ec.marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig, + ec.marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig, true, false, ) @@ -2101,8 +2132,8 @@ func (ec *executionContext) fieldContext_UpdateConfigValuePayload_config(_ conte // region **************************** input.gotpl ***************************** -func (ec *executionContext) unmarshalInputAddConfigValueInput(ctx context.Context, obj any) (configmap.AddConfigValueInput, error) { - var it configmap.AddConfigValueInput +func (ec *executionContext) unmarshalInputAddConfigValueInput(ctx context.Context, obj any) (config.AddConfigValueInput, error) { + var it config.AddConfigValueInput asMap := map[string]any{} for k, v := range obj.(map[string]any) { asMap[k] = v @@ -2138,7 +2169,7 @@ func (ec *executionContext) unmarshalInputAddConfigValueInput(ctx context.Contex it.TeamSlug = data case "value": ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("value")) - data, err := ec.unmarshalNConfigValueInput2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigValueInput(ctx, v) + data, err := ec.unmarshalNConfigValueInput2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigValueInput(ctx, v) if err != nil { return it, err } @@ -2148,8 +2179,8 @@ func (ec *executionContext) unmarshalInputAddConfigValueInput(ctx context.Contex return it, nil } -func (ec *executionContext) unmarshalInputConfigFilter(ctx context.Context, obj any) (configmap.ConfigFilter, error) { - var it configmap.ConfigFilter +func (ec *executionContext) unmarshalInputConfigFilter(ctx context.Context, obj any) (config.ConfigFilter, error) { + var it config.ConfigFilter asMap := map[string]any{} for k, v := range obj.(map[string]any) { asMap[k] = v @@ -2181,8 +2212,8 @@ func (ec *executionContext) unmarshalInputConfigFilter(ctx context.Context, obj return it, nil } -func (ec *executionContext) unmarshalInputConfigOrder(ctx context.Context, obj any) (configmap.ConfigOrder, error) { - var it configmap.ConfigOrder +func (ec *executionContext) unmarshalInputConfigOrder(ctx context.Context, obj any) (config.ConfigOrder, error) { + var it config.ConfigOrder asMap := map[string]any{} for k, v := range obj.(map[string]any) { asMap[k] = v @@ -2197,7 +2228,7 @@ func (ec *executionContext) unmarshalInputConfigOrder(ctx context.Context, obj a switch k { case "field": ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("field")) - data, err := ec.unmarshalNConfigOrderField2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigOrderField(ctx, v) + data, err := ec.unmarshalNConfigOrderField2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigOrderField(ctx, v) if err != nil { return it, err } @@ -2214,14 +2245,18 @@ func (ec *executionContext) unmarshalInputConfigOrder(ctx context.Context, obj a return it, nil } -func (ec *executionContext) unmarshalInputConfigValueInput(ctx context.Context, obj any) (configmap.ConfigValueInput, error) { - var it configmap.ConfigValueInput +func (ec *executionContext) unmarshalInputConfigValueInput(ctx context.Context, obj any) (config.ConfigValueInput, error) { + var it config.ConfigValueInput asMap := map[string]any{} for k, v := range obj.(map[string]any) { asMap[k] = v } - fieldsInOrder := [...]string{"name", "value"} + if _, present := asMap["encoding"]; !present { + asMap["encoding"] = "PLAIN_TEXT" + } + + fieldsInOrder := [...]string{"name", "value", "encoding"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -2242,13 +2277,20 @@ func (ec *executionContext) unmarshalInputConfigValueInput(ctx context.Context, return it, err } it.Value = data + case "encoding": + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("encoding")) + data, err := ec.unmarshalOValueEncoding2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋsecretᚐValueEncoding(ctx, v) + if err != nil { + return it, err + } + it.Encoding = data } } return it, nil } -func (ec *executionContext) unmarshalInputCreateConfigInput(ctx context.Context, obj any) (configmap.CreateConfigInput, error) { - var it configmap.CreateConfigInput +func (ec *executionContext) unmarshalInputCreateConfigInput(ctx context.Context, obj any) (config.CreateConfigInput, error) { + var it config.CreateConfigInput asMap := map[string]any{} for k, v := range obj.(map[string]any) { asMap[k] = v @@ -2287,8 +2329,8 @@ func (ec *executionContext) unmarshalInputCreateConfigInput(ctx context.Context, return it, nil } -func (ec *executionContext) unmarshalInputDeleteConfigInput(ctx context.Context, obj any) (configmap.DeleteConfigInput, error) { - var it configmap.DeleteConfigInput +func (ec *executionContext) unmarshalInputDeleteConfigInput(ctx context.Context, obj any) (config.DeleteConfigInput, error) { + var it config.DeleteConfigInput asMap := map[string]any{} for k, v := range obj.(map[string]any) { asMap[k] = v @@ -2327,8 +2369,8 @@ func (ec *executionContext) unmarshalInputDeleteConfigInput(ctx context.Context, return it, nil } -func (ec *executionContext) unmarshalInputRemoveConfigValueInput(ctx context.Context, obj any) (configmap.RemoveConfigValueInput, error) { - var it configmap.RemoveConfigValueInput +func (ec *executionContext) unmarshalInputRemoveConfigValueInput(ctx context.Context, obj any) (config.RemoveConfigValueInput, error) { + var it config.RemoveConfigValueInput asMap := map[string]any{} for k, v := range obj.(map[string]any) { asMap[k] = v @@ -2374,8 +2416,8 @@ func (ec *executionContext) unmarshalInputRemoveConfigValueInput(ctx context.Con return it, nil } -func (ec *executionContext) unmarshalInputUpdateConfigValueInput(ctx context.Context, obj any) (configmap.UpdateConfigValueInput, error) { - var it configmap.UpdateConfigValueInput +func (ec *executionContext) unmarshalInputUpdateConfigValueInput(ctx context.Context, obj any) (config.UpdateConfigValueInput, error) { + var it config.UpdateConfigValueInput asMap := map[string]any{} for k, v := range obj.(map[string]any) { asMap[k] = v @@ -2411,7 +2453,7 @@ func (ec *executionContext) unmarshalInputUpdateConfigValueInput(ctx context.Con it.TeamSlug = data case "value": ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("value")) - data, err := ec.unmarshalNConfigValueInput2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigValueInput(ctx, v) + data, err := ec.unmarshalNConfigValueInput2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigValueInput(ctx, v) if err != nil { return it, err } @@ -2431,7 +2473,7 @@ func (ec *executionContext) unmarshalInputUpdateConfigValueInput(ctx context.Con var addConfigValuePayloadImplementors = []string{"AddConfigValuePayload"} -func (ec *executionContext) _AddConfigValuePayload(ctx context.Context, sel ast.SelectionSet, obj *configmap.AddConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) _AddConfigValuePayload(ctx context.Context, sel ast.SelectionSet, obj *config.AddConfigValuePayload) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, addConfigValuePayloadImplementors) out := graphql.NewFieldSet(fields) @@ -2467,7 +2509,7 @@ func (ec *executionContext) _AddConfigValuePayload(ctx context.Context, sel ast. var configImplementors = []string{"Config", "Node", "ActivityLogger"} -func (ec *executionContext) _Config(ctx context.Context, sel ast.SelectionSet, obj *configmap.Config) graphql.Marshaler { +func (ec *executionContext) _Config(ctx context.Context, sel ast.SelectionSet, obj *config.Config) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configImplementors) out := graphql.NewFieldSet(fields) @@ -2798,7 +2840,7 @@ func (ec *executionContext) _Config(ctx context.Context, sel ast.SelectionSet, o var configConnectionImplementors = []string{"ConfigConnection"} -func (ec *executionContext) _ConfigConnection(ctx context.Context, sel ast.SelectionSet, obj *pagination.Connection[*configmap.Config]) graphql.Marshaler { +func (ec *executionContext) _ConfigConnection(ctx context.Context, sel ast.SelectionSet, obj *pagination.Connection[*config.Config]) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configConnectionImplementors) out := graphql.NewFieldSet(fields) @@ -2847,7 +2889,7 @@ func (ec *executionContext) _ConfigConnection(ctx context.Context, sel ast.Selec var configCreatedActivityLogEntryImplementors = []string{"ConfigCreatedActivityLogEntry", "ActivityLogEntry", "Node"} -func (ec *executionContext) _ConfigCreatedActivityLogEntry(ctx context.Context, sel ast.SelectionSet, obj *configmap.ConfigCreatedActivityLogEntry) graphql.Marshaler { +func (ec *executionContext) _ConfigCreatedActivityLogEntry(ctx context.Context, sel ast.SelectionSet, obj *config.ConfigCreatedActivityLogEntry) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configCreatedActivityLogEntryImplementors) out := graphql.NewFieldSet(fields) @@ -2918,7 +2960,7 @@ func (ec *executionContext) _ConfigCreatedActivityLogEntry(ctx context.Context, var configDeletedActivityLogEntryImplementors = []string{"ConfigDeletedActivityLogEntry", "ActivityLogEntry", "Node"} -func (ec *executionContext) _ConfigDeletedActivityLogEntry(ctx context.Context, sel ast.SelectionSet, obj *configmap.ConfigDeletedActivityLogEntry) graphql.Marshaler { +func (ec *executionContext) _ConfigDeletedActivityLogEntry(ctx context.Context, sel ast.SelectionSet, obj *config.ConfigDeletedActivityLogEntry) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configDeletedActivityLogEntryImplementors) out := graphql.NewFieldSet(fields) @@ -2989,7 +3031,7 @@ func (ec *executionContext) _ConfigDeletedActivityLogEntry(ctx context.Context, var configEdgeImplementors = []string{"ConfigEdge"} -func (ec *executionContext) _ConfigEdge(ctx context.Context, sel ast.SelectionSet, obj *pagination.Edge[*configmap.Config]) graphql.Marshaler { +func (ec *executionContext) _ConfigEdge(ctx context.Context, sel ast.SelectionSet, obj *pagination.Edge[*config.Config]) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configEdgeImplementors) out := graphql.NewFieldSet(fields) @@ -3033,7 +3075,7 @@ func (ec *executionContext) _ConfigEdge(ctx context.Context, sel ast.SelectionSe var configUpdatedActivityLogEntryImplementors = []string{"ConfigUpdatedActivityLogEntry", "ActivityLogEntry", "Node"} -func (ec *executionContext) _ConfigUpdatedActivityLogEntry(ctx context.Context, sel ast.SelectionSet, obj *configmap.ConfigUpdatedActivityLogEntry) graphql.Marshaler { +func (ec *executionContext) _ConfigUpdatedActivityLogEntry(ctx context.Context, sel ast.SelectionSet, obj *config.ConfigUpdatedActivityLogEntry) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configUpdatedActivityLogEntryImplementors) out := graphql.NewFieldSet(fields) @@ -3109,7 +3151,7 @@ func (ec *executionContext) _ConfigUpdatedActivityLogEntry(ctx context.Context, var configUpdatedActivityLogEntryDataImplementors = []string{"ConfigUpdatedActivityLogEntryData"} -func (ec *executionContext) _ConfigUpdatedActivityLogEntryData(ctx context.Context, sel ast.SelectionSet, obj *configmap.ConfigUpdatedActivityLogEntryData) graphql.Marshaler { +func (ec *executionContext) _ConfigUpdatedActivityLogEntryData(ctx context.Context, sel ast.SelectionSet, obj *config.ConfigUpdatedActivityLogEntryData) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configUpdatedActivityLogEntryDataImplementors) out := graphql.NewFieldSet(fields) @@ -3148,7 +3190,7 @@ func (ec *executionContext) _ConfigUpdatedActivityLogEntryData(ctx context.Conte var configUpdatedActivityLogEntryDataUpdatedFieldImplementors = []string{"ConfigUpdatedActivityLogEntryDataUpdatedField"} -func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField(ctx context.Context, sel ast.SelectionSet, obj *configmap.ConfigUpdatedActivityLogEntryDataUpdatedField) graphql.Marshaler { +func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField(ctx context.Context, sel ast.SelectionSet, obj *config.ConfigUpdatedActivityLogEntryDataUpdatedField) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configUpdatedActivityLogEntryDataUpdatedFieldImplementors) out := graphql.NewFieldSet(fields) @@ -3191,7 +3233,7 @@ func (ec *executionContext) _ConfigUpdatedActivityLogEntryDataUpdatedField(ctx c var configValueImplementors = []string{"ConfigValue"} -func (ec *executionContext) _ConfigValue(ctx context.Context, sel ast.SelectionSet, obj *configmap.ConfigValue) graphql.Marshaler { +func (ec *executionContext) _ConfigValue(ctx context.Context, sel ast.SelectionSet, obj *config.ConfigValue) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, configValueImplementors) out := graphql.NewFieldSet(fields) @@ -3210,6 +3252,11 @@ func (ec *executionContext) _ConfigValue(ctx context.Context, sel ast.SelectionS if out.Values[i] == graphql.Null { out.Invalids++ } + case "encoding": + out.Values[i] = ec._ConfigValue_encoding(ctx, field, obj) + if out.Values[i] == graphql.Null { + out.Invalids++ + } default: panic("unknown field " + strconv.Quote(field.Name)) } @@ -3235,7 +3282,7 @@ func (ec *executionContext) _ConfigValue(ctx context.Context, sel ast.SelectionS var createConfigPayloadImplementors = []string{"CreateConfigPayload"} -func (ec *executionContext) _CreateConfigPayload(ctx context.Context, sel ast.SelectionSet, obj *configmap.CreateConfigPayload) graphql.Marshaler { +func (ec *executionContext) _CreateConfigPayload(ctx context.Context, sel ast.SelectionSet, obj *config.CreateConfigPayload) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, createConfigPayloadImplementors) out := graphql.NewFieldSet(fields) @@ -3271,7 +3318,7 @@ func (ec *executionContext) _CreateConfigPayload(ctx context.Context, sel ast.Se var deleteConfigPayloadImplementors = []string{"DeleteConfigPayload"} -func (ec *executionContext) _DeleteConfigPayload(ctx context.Context, sel ast.SelectionSet, obj *configmap.DeleteConfigPayload) graphql.Marshaler { +func (ec *executionContext) _DeleteConfigPayload(ctx context.Context, sel ast.SelectionSet, obj *config.DeleteConfigPayload) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, deleteConfigPayloadImplementors) out := graphql.NewFieldSet(fields) @@ -3307,7 +3354,7 @@ func (ec *executionContext) _DeleteConfigPayload(ctx context.Context, sel ast.Se var removeConfigValuePayloadImplementors = []string{"RemoveConfigValuePayload"} -func (ec *executionContext) _RemoveConfigValuePayload(ctx context.Context, sel ast.SelectionSet, obj *configmap.RemoveConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) _RemoveConfigValuePayload(ctx context.Context, sel ast.SelectionSet, obj *config.RemoveConfigValuePayload) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, removeConfigValuePayloadImplementors) out := graphql.NewFieldSet(fields) @@ -3343,7 +3390,7 @@ func (ec *executionContext) _RemoveConfigValuePayload(ctx context.Context, sel a var teamInventoryCountConfigsImplementors = []string{"TeamInventoryCountConfigs"} -func (ec *executionContext) _TeamInventoryCountConfigs(ctx context.Context, sel ast.SelectionSet, obj *configmap.TeamInventoryCountConfigs) graphql.Marshaler { +func (ec *executionContext) _TeamInventoryCountConfigs(ctx context.Context, sel ast.SelectionSet, obj *config.TeamInventoryCountConfigs) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, teamInventoryCountConfigsImplementors) out := graphql.NewFieldSet(fields) @@ -3382,7 +3429,7 @@ func (ec *executionContext) _TeamInventoryCountConfigs(ctx context.Context, sel var updateConfigValuePayloadImplementors = []string{"UpdateConfigValuePayload"} -func (ec *executionContext) _UpdateConfigValuePayload(ctx context.Context, sel ast.SelectionSet, obj *configmap.UpdateConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) _UpdateConfigValuePayload(ctx context.Context, sel ast.SelectionSet, obj *config.UpdateConfigValuePayload) graphql.Marshaler { fields := graphql.CollectFields(ec.OperationContext, sel, updateConfigValuePayloadImplementors) out := graphql.NewFieldSet(fields) @@ -3420,16 +3467,16 @@ func (ec *executionContext) _UpdateConfigValuePayload(ctx context.Context, sel a // region ***************************** type.gotpl ***************************** -func (ec *executionContext) unmarshalNAddConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐAddConfigValueInput(ctx context.Context, v any) (configmap.AddConfigValueInput, error) { +func (ec *executionContext) unmarshalNAddConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐAddConfigValueInput(ctx context.Context, v any) (config.AddConfigValueInput, error) { res, err := ec.unmarshalInputAddConfigValueInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNAddConfigValuePayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐAddConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v configmap.AddConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) marshalNAddConfigValuePayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐAddConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v config.AddConfigValuePayload) graphql.Marshaler { return ec._AddConfigValuePayload(ctx, sel, &v) } -func (ec *executionContext) marshalNAddConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐAddConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v *configmap.AddConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) marshalNAddConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐAddConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v *config.AddConfigValuePayload) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3439,15 +3486,15 @@ func (ec *executionContext) marshalNAddConfigValuePayload2ᚖgithubᚗcomᚋnais return ec._AddConfigValuePayload(ctx, sel, v) } -func (ec *executionContext) marshalNConfig2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig(ctx context.Context, sel ast.SelectionSet, v configmap.Config) graphql.Marshaler { +func (ec *executionContext) marshalNConfig2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig(ctx context.Context, sel ast.SelectionSet, v config.Config) graphql.Marshaler { return ec._Config(ctx, sel, &v) } -func (ec *executionContext) marshalNConfig2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigᚄ(ctx context.Context, sel ast.SelectionSet, v []*configmap.Config) graphql.Marshaler { +func (ec *executionContext) marshalNConfig2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigᚄ(ctx context.Context, sel ast.SelectionSet, v []*config.Config) graphql.Marshaler { ret := graphql.MarshalSliceConcurrently(ctx, len(v), 0, false, func(ctx context.Context, i int) graphql.Marshaler { fc := graphql.GetFieldContext(ctx) fc.Result = &v[i] - return ec.marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig(ctx, sel, v[i]) + return ec.marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig(ctx, sel, v[i]) }) for _, e := range ret { @@ -3459,7 +3506,7 @@ func (ec *executionContext) marshalNConfig2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋint return ret } -func (ec *executionContext) marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig(ctx context.Context, sel ast.SelectionSet, v *configmap.Config) graphql.Marshaler { +func (ec *executionContext) marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig(ctx context.Context, sel ast.SelectionSet, v *config.Config) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3469,11 +3516,11 @@ func (ec *executionContext) marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋintern return ec._Config(ctx, sel, v) } -func (ec *executionContext) marshalNConfigConnection2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐConnection(ctx context.Context, sel ast.SelectionSet, v pagination.Connection[*configmap.Config]) graphql.Marshaler { +func (ec *executionContext) marshalNConfigConnection2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐConnection(ctx context.Context, sel ast.SelectionSet, v pagination.Connection[*config.Config]) graphql.Marshaler { return ec._ConfigConnection(ctx, sel, &v) } -func (ec *executionContext) marshalNConfigConnection2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐConnection(ctx context.Context, sel ast.SelectionSet, v *pagination.Connection[*configmap.Config]) graphql.Marshaler { +func (ec *executionContext) marshalNConfigConnection2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐConnection(ctx context.Context, sel ast.SelectionSet, v *pagination.Connection[*config.Config]) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3483,11 +3530,11 @@ func (ec *executionContext) marshalNConfigConnection2ᚖgithubᚗcomᚋnaisᚋap return ec._ConfigConnection(ctx, sel, v) } -func (ec *executionContext) marshalNConfigEdge2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐEdge(ctx context.Context, sel ast.SelectionSet, v pagination.Edge[*configmap.Config]) graphql.Marshaler { +func (ec *executionContext) marshalNConfigEdge2githubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐEdge(ctx context.Context, sel ast.SelectionSet, v pagination.Edge[*config.Config]) graphql.Marshaler { return ec._ConfigEdge(ctx, sel, &v) } -func (ec *executionContext) marshalNConfigEdge2ᚕgithubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐEdgeᚄ(ctx context.Context, sel ast.SelectionSet, v []pagination.Edge[*configmap.Config]) graphql.Marshaler { +func (ec *executionContext) marshalNConfigEdge2ᚕgithubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐEdgeᚄ(ctx context.Context, sel ast.SelectionSet, v []pagination.Edge[*config.Config]) graphql.Marshaler { ret := graphql.MarshalSliceConcurrently(ctx, len(v), 0, false, func(ctx context.Context, i int) graphql.Marshaler { fc := graphql.GetFieldContext(ctx) fc.Result = &v[i] @@ -3503,17 +3550,17 @@ func (ec *executionContext) marshalNConfigEdge2ᚕgithubᚗcomᚋnaisᚋapiᚋin return ret } -func (ec *executionContext) unmarshalNConfigOrderField2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigOrderField(ctx context.Context, v any) (configmap.ConfigOrderField, error) { - var res configmap.ConfigOrderField +func (ec *executionContext) unmarshalNConfigOrderField2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigOrderField(ctx context.Context, v any) (config.ConfigOrderField, error) { + var res config.ConfigOrderField err := res.UnmarshalGQL(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNConfigOrderField2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigOrderField(ctx context.Context, sel ast.SelectionSet, v configmap.ConfigOrderField) graphql.Marshaler { +func (ec *executionContext) marshalNConfigOrderField2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigOrderField(ctx context.Context, sel ast.SelectionSet, v config.ConfigOrderField) graphql.Marshaler { return v } -func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryData2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigUpdatedActivityLogEntryData(ctx context.Context, sel ast.SelectionSet, v *configmap.ConfigUpdatedActivityLogEntryData) graphql.Marshaler { +func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryData2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigUpdatedActivityLogEntryData(ctx context.Context, sel ast.SelectionSet, v *config.ConfigUpdatedActivityLogEntryData) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3523,11 +3570,11 @@ func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryData2ᚖgithub return ec._ConfigUpdatedActivityLogEntryData(ctx, sel, v) } -func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryDataUpdatedField2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigUpdatedActivityLogEntryDataUpdatedFieldᚄ(ctx context.Context, sel ast.SelectionSet, v []*configmap.ConfigUpdatedActivityLogEntryDataUpdatedField) graphql.Marshaler { +func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryDataUpdatedField2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigUpdatedActivityLogEntryDataUpdatedFieldᚄ(ctx context.Context, sel ast.SelectionSet, v []*config.ConfigUpdatedActivityLogEntryDataUpdatedField) graphql.Marshaler { ret := graphql.MarshalSliceConcurrently(ctx, len(v), 0, false, func(ctx context.Context, i int) graphql.Marshaler { fc := graphql.GetFieldContext(ctx) fc.Result = &v[i] - return ec.marshalNConfigUpdatedActivityLogEntryDataUpdatedField2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigUpdatedActivityLogEntryDataUpdatedField(ctx, sel, v[i]) + return ec.marshalNConfigUpdatedActivityLogEntryDataUpdatedField2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigUpdatedActivityLogEntryDataUpdatedField(ctx, sel, v[i]) }) for _, e := range ret { @@ -3539,7 +3586,7 @@ func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryDataUpdatedFiel return ret } -func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryDataUpdatedField2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigUpdatedActivityLogEntryDataUpdatedField(ctx context.Context, sel ast.SelectionSet, v *configmap.ConfigUpdatedActivityLogEntryDataUpdatedField) graphql.Marshaler { +func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryDataUpdatedField2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigUpdatedActivityLogEntryDataUpdatedField(ctx context.Context, sel ast.SelectionSet, v *config.ConfigUpdatedActivityLogEntryDataUpdatedField) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3549,11 +3596,11 @@ func (ec *executionContext) marshalNConfigUpdatedActivityLogEntryDataUpdatedFiel return ec._ConfigUpdatedActivityLogEntryDataUpdatedField(ctx, sel, v) } -func (ec *executionContext) marshalNConfigValue2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigValueᚄ(ctx context.Context, sel ast.SelectionSet, v []*configmap.ConfigValue) graphql.Marshaler { +func (ec *executionContext) marshalNConfigValue2ᚕᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigValueᚄ(ctx context.Context, sel ast.SelectionSet, v []*config.ConfigValue) graphql.Marshaler { ret := graphql.MarshalSliceConcurrently(ctx, len(v), 0, false, func(ctx context.Context, i int) graphql.Marshaler { fc := graphql.GetFieldContext(ctx) fc.Result = &v[i] - return ec.marshalNConfigValue2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigValue(ctx, sel, v[i]) + return ec.marshalNConfigValue2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigValue(ctx, sel, v[i]) }) for _, e := range ret { @@ -3565,7 +3612,7 @@ func (ec *executionContext) marshalNConfigValue2ᚕᚖgithubᚗcomᚋnaisᚋapi return ret } -func (ec *executionContext) marshalNConfigValue2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigValue(ctx context.Context, sel ast.SelectionSet, v *configmap.ConfigValue) graphql.Marshaler { +func (ec *executionContext) marshalNConfigValue2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigValue(ctx context.Context, sel ast.SelectionSet, v *config.ConfigValue) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3575,21 +3622,21 @@ func (ec *executionContext) marshalNConfigValue2ᚖgithubᚗcomᚋnaisᚋapiᚋi return ec._ConfigValue(ctx, sel, v) } -func (ec *executionContext) unmarshalNConfigValueInput2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigValueInput(ctx context.Context, v any) (*configmap.ConfigValueInput, error) { +func (ec *executionContext) unmarshalNConfigValueInput2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigValueInput(ctx context.Context, v any) (*config.ConfigValueInput, error) { res, err := ec.unmarshalInputConfigValueInput(ctx, v) return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNCreateConfigInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐCreateConfigInput(ctx context.Context, v any) (configmap.CreateConfigInput, error) { +func (ec *executionContext) unmarshalNCreateConfigInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐCreateConfigInput(ctx context.Context, v any) (config.CreateConfigInput, error) { res, err := ec.unmarshalInputCreateConfigInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNCreateConfigPayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐCreateConfigPayload(ctx context.Context, sel ast.SelectionSet, v configmap.CreateConfigPayload) graphql.Marshaler { +func (ec *executionContext) marshalNCreateConfigPayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐCreateConfigPayload(ctx context.Context, sel ast.SelectionSet, v config.CreateConfigPayload) graphql.Marshaler { return ec._CreateConfigPayload(ctx, sel, &v) } -func (ec *executionContext) marshalNCreateConfigPayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐCreateConfigPayload(ctx context.Context, sel ast.SelectionSet, v *configmap.CreateConfigPayload) graphql.Marshaler { +func (ec *executionContext) marshalNCreateConfigPayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐCreateConfigPayload(ctx context.Context, sel ast.SelectionSet, v *config.CreateConfigPayload) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3599,16 +3646,16 @@ func (ec *executionContext) marshalNCreateConfigPayload2ᚖgithubᚗcomᚋnais return ec._CreateConfigPayload(ctx, sel, v) } -func (ec *executionContext) unmarshalNDeleteConfigInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐDeleteConfigInput(ctx context.Context, v any) (configmap.DeleteConfigInput, error) { +func (ec *executionContext) unmarshalNDeleteConfigInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐDeleteConfigInput(ctx context.Context, v any) (config.DeleteConfigInput, error) { res, err := ec.unmarshalInputDeleteConfigInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNDeleteConfigPayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐDeleteConfigPayload(ctx context.Context, sel ast.SelectionSet, v configmap.DeleteConfigPayload) graphql.Marshaler { +func (ec *executionContext) marshalNDeleteConfigPayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐDeleteConfigPayload(ctx context.Context, sel ast.SelectionSet, v config.DeleteConfigPayload) graphql.Marshaler { return ec._DeleteConfigPayload(ctx, sel, &v) } -func (ec *executionContext) marshalNDeleteConfigPayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐDeleteConfigPayload(ctx context.Context, sel ast.SelectionSet, v *configmap.DeleteConfigPayload) graphql.Marshaler { +func (ec *executionContext) marshalNDeleteConfigPayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐDeleteConfigPayload(ctx context.Context, sel ast.SelectionSet, v *config.DeleteConfigPayload) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3618,16 +3665,16 @@ func (ec *executionContext) marshalNDeleteConfigPayload2ᚖgithubᚗcomᚋnais return ec._DeleteConfigPayload(ctx, sel, v) } -func (ec *executionContext) unmarshalNRemoveConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐRemoveConfigValueInput(ctx context.Context, v any) (configmap.RemoveConfigValueInput, error) { +func (ec *executionContext) unmarshalNRemoveConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐRemoveConfigValueInput(ctx context.Context, v any) (config.RemoveConfigValueInput, error) { res, err := ec.unmarshalInputRemoveConfigValueInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNRemoveConfigValuePayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐRemoveConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v configmap.RemoveConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) marshalNRemoveConfigValuePayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐRemoveConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v config.RemoveConfigValuePayload) graphql.Marshaler { return ec._RemoveConfigValuePayload(ctx, sel, &v) } -func (ec *executionContext) marshalNRemoveConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐRemoveConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v *configmap.RemoveConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) marshalNRemoveConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐRemoveConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v *config.RemoveConfigValuePayload) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3637,11 +3684,11 @@ func (ec *executionContext) marshalNRemoveConfigValuePayload2ᚖgithubᚗcomᚋn return ec._RemoveConfigValuePayload(ctx, sel, v) } -func (ec *executionContext) marshalNTeamInventoryCountConfigs2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐTeamInventoryCountConfigs(ctx context.Context, sel ast.SelectionSet, v configmap.TeamInventoryCountConfigs) graphql.Marshaler { +func (ec *executionContext) marshalNTeamInventoryCountConfigs2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐTeamInventoryCountConfigs(ctx context.Context, sel ast.SelectionSet, v config.TeamInventoryCountConfigs) graphql.Marshaler { return ec._TeamInventoryCountConfigs(ctx, sel, &v) } -func (ec *executionContext) marshalNTeamInventoryCountConfigs2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐTeamInventoryCountConfigs(ctx context.Context, sel ast.SelectionSet, v *configmap.TeamInventoryCountConfigs) graphql.Marshaler { +func (ec *executionContext) marshalNTeamInventoryCountConfigs2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐTeamInventoryCountConfigs(ctx context.Context, sel ast.SelectionSet, v *config.TeamInventoryCountConfigs) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3651,16 +3698,16 @@ func (ec *executionContext) marshalNTeamInventoryCountConfigs2ᚖgithubᚗcomᚋ return ec._TeamInventoryCountConfigs(ctx, sel, v) } -func (ec *executionContext) unmarshalNUpdateConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐUpdateConfigValueInput(ctx context.Context, v any) (configmap.UpdateConfigValueInput, error) { +func (ec *executionContext) unmarshalNUpdateConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐUpdateConfigValueInput(ctx context.Context, v any) (config.UpdateConfigValueInput, error) { res, err := ec.unmarshalInputUpdateConfigValueInput(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNUpdateConfigValuePayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐUpdateConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v configmap.UpdateConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) marshalNUpdateConfigValuePayload2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐUpdateConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v config.UpdateConfigValuePayload) graphql.Marshaler { return ec._UpdateConfigValuePayload(ctx, sel, &v) } -func (ec *executionContext) marshalNUpdateConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐUpdateConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v *configmap.UpdateConfigValuePayload) graphql.Marshaler { +func (ec *executionContext) marshalNUpdateConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐUpdateConfigValuePayload(ctx context.Context, sel ast.SelectionSet, v *config.UpdateConfigValuePayload) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { graphql.AddErrorf(ctx, "the requested element is null which the schema does not allow") @@ -3670,14 +3717,14 @@ func (ec *executionContext) marshalNUpdateConfigValuePayload2ᚖgithubᚗcomᚋn return ec._UpdateConfigValuePayload(ctx, sel, v) } -func (ec *executionContext) marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig(ctx context.Context, sel ast.SelectionSet, v *configmap.Config) graphql.Marshaler { +func (ec *executionContext) marshalOConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig(ctx context.Context, sel ast.SelectionSet, v *config.Config) graphql.Marshaler { if v == nil { return graphql.Null } return ec._Config(ctx, sel, v) } -func (ec *executionContext) unmarshalOConfigFilter2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigFilter(ctx context.Context, v any) (*configmap.ConfigFilter, error) { +func (ec *executionContext) unmarshalOConfigFilter2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigFilter(ctx context.Context, v any) (*config.ConfigFilter, error) { if v == nil { return nil, nil } @@ -3685,7 +3732,7 @@ func (ec *executionContext) unmarshalOConfigFilter2ᚖgithubᚗcomᚋnaisᚋapi return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalOConfigOrder2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigOrder(ctx context.Context, v any) (*configmap.ConfigOrder, error) { +func (ec *executionContext) unmarshalOConfigOrder2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigOrder(ctx context.Context, v any) (*config.ConfigOrder, error) { if v == nil { return nil, nil } diff --git a/internal/graph/gengql/jobs.generated.go b/internal/graph/gengql/jobs.generated.go index 52fe46270..6fc6e889e 100644 --- a/internal/graph/gengql/jobs.generated.go +++ b/internal/graph/gengql/jobs.generated.go @@ -26,7 +26,7 @@ import ( "github.com/nais/api/internal/team" "github.com/nais/api/internal/vulnerability" "github.com/nais/api/internal/workload" - "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/netpol" @@ -57,7 +57,7 @@ type JobResolver interface { Issues(ctx context.Context, obj *job.Job, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *issue.IssueOrder, filter *issue.ResourceIssueFilter) (*pagination.Connection[issue.Issue], error) BigQueryDatasets(ctx context.Context, obj *job.Job, orderBy *bigquery.BigQueryDatasetOrder) (*pagination.Connection[*bigquery.BigQueryDataset], error) Buckets(ctx context.Context, obj *job.Job, orderBy *bucket.BucketOrder) (*pagination.Connection[*bucket.Bucket], error) - Configs(ctx context.Context, obj *job.Job, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*configmap.Config], error) + Configs(ctx context.Context, obj *job.Job, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*config.Config], error) Cost(ctx context.Context, obj *job.Job) (*cost.WorkloadCost, error) Deployments(ctx context.Context, obj *job.Job, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*deployment.Deployment], error) KafkaTopicAcls(ctx context.Context, obj *job.Job, orderBy *kafkatopic.KafkaTopicACLOrder) (*pagination.Connection[*kafkatopic.KafkaTopicACL], error) diff --git a/internal/graph/gengql/root_.generated.go b/internal/graph/gengql/root_.generated.go index 1005e4cc4..945625105 100644 --- a/internal/graph/gengql/root_.generated.go +++ b/internal/graph/gengql/root_.generated.go @@ -40,7 +40,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/podlog" "github.com/nais/api/internal/workload/secret" @@ -510,8 +510,9 @@ type ComplexityRoot struct { } ConfigValue struct { - Name func(childComplexity int) int - Value func(childComplexity int) int + Encoding func(childComplexity int) int + Name func(childComplexity int) int + Value func(childComplexity int) int } ConfirmTeamDeletionPayload struct { @@ -1219,7 +1220,7 @@ type ComplexityRoot struct { } Mutation struct { - AddConfigValue func(childComplexity int, input configmap.AddConfigValueInput) int + AddConfigValue func(childComplexity int, input config.AddConfigValueInput) int AddRepositoryToTeam func(childComplexity int, input repository.AddRepositoryToTeamInput) int AddSecretValue func(childComplexity int, input secret.AddSecretValueInput) int AddTeamMember func(childComplexity int, input team.AddTeamMemberInput) int @@ -1228,7 +1229,7 @@ type ComplexityRoot struct { ChangeDeploymentKey func(childComplexity int, input deployment.ChangeDeploymentKeyInput) int ConfigureReconciler func(childComplexity int, input reconciler.ConfigureReconcilerInput) int ConfirmTeamDeletion func(childComplexity int, input team.ConfirmTeamDeletionInput) int - CreateConfig func(childComplexity int, input configmap.CreateConfigInput) int + CreateConfig func(childComplexity int, input config.CreateConfigInput) int CreateKafkaCredentials func(childComplexity int, input aivencredentials.CreateKafkaCredentialsInput) int CreateOpenSearch func(childComplexity int, input opensearch.CreateOpenSearchInput) int CreateOpenSearchCredentials func(childComplexity int, input aivencredentials.CreateOpenSearchCredentialsInput) int @@ -1240,7 +1241,7 @@ type ComplexityRoot struct { CreateValkey func(childComplexity int, input valkey.CreateValkeyInput) int CreateValkeyCredentials func(childComplexity int, input aivencredentials.CreateValkeyCredentialsInput) int DeleteApplication func(childComplexity int, input application.DeleteApplicationInput) int - DeleteConfig func(childComplexity int, input configmap.DeleteConfigInput) int + DeleteConfig func(childComplexity int, input config.DeleteConfigInput) int DeleteJob func(childComplexity int, input job.DeleteJobInput) int DeleteJobRun func(childComplexity int, input job.DeleteJobRunInput) int DeleteOpenSearch func(childComplexity int, input opensearch.DeleteOpenSearchInput) int @@ -1252,7 +1253,7 @@ type ComplexityRoot struct { DisableReconciler func(childComplexity int, input reconciler.DisableReconcilerInput) int EnableReconciler func(childComplexity int, input reconciler.EnableReconcilerInput) int GrantPostgresAccess func(childComplexity int, input postgres.GrantPostgresAccessInput) int - RemoveConfigValue func(childComplexity int, input configmap.RemoveConfigValueInput) int + RemoveConfigValue func(childComplexity int, input config.RemoveConfigValueInput) int RemoveRepositoryFromTeam func(childComplexity int, input repository.RemoveRepositoryFromTeamInput) int RemoveSecretValue func(childComplexity int, input secret.RemoveSecretValueInput) int RemoveTeamMember func(childComplexity int, input team.RemoveTeamMemberInput) int @@ -1264,7 +1265,7 @@ type ComplexityRoot struct { StartOpenSearchMaintenance func(childComplexity int, input servicemaintenance.StartOpenSearchMaintenanceInput) int StartValkeyMaintenance func(childComplexity int, input servicemaintenance.StartValkeyMaintenanceInput) int TriggerJob func(childComplexity int, input job.TriggerJobInput) int - UpdateConfigValue func(childComplexity int, input configmap.UpdateConfigValueInput) int + UpdateConfigValue func(childComplexity int, input config.UpdateConfigValueInput) int UpdateImageVulnerability func(childComplexity int, input vulnerability.UpdateImageVulnerabilityInput) int UpdateOpenSearch func(childComplexity int, input opensearch.UpdateOpenSearchInput) int UpdateSecretValue func(childComplexity int, input secret.UpdateSecretValueInput) int @@ -2257,7 +2258,7 @@ type ComplexityRoot struct { Applications func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *application.ApplicationOrder, filter *application.TeamApplicationsFilter) int BigQueryDatasets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bigquery.BigQueryDatasetOrder) int Buckets func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bucket.BucketOrder) int - Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *configmap.ConfigOrder, filter *configmap.ConfigFilter) int + Configs func(childComplexity int, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *config.ConfigOrder, filter *config.ConfigFilter) int Cost func(childComplexity int) int DeleteKey func(childComplexity int, key string) int DeletionInProgress func(childComplexity int) int @@ -4763,6 +4764,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ConfigUpdatedActivityLogEntryDataUpdatedField.OldValue(childComplexity), true + case "ConfigValue.encoding": + if e.ComplexityRoot.ConfigValue.Encoding == nil { + break + } + + return e.ComplexityRoot.ConfigValue.Encoding(childComplexity), true + case "ConfigValue.name": if e.ComplexityRoot.ConfigValue.Name == nil { break @@ -7462,7 +7470,7 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return 0, false } - return e.ComplexityRoot.Mutation.AddConfigValue(childComplexity, args["input"].(configmap.AddConfigValueInput)), true + return e.ComplexityRoot.Mutation.AddConfigValue(childComplexity, args["input"].(config.AddConfigValueInput)), true case "Mutation.addRepositoryToTeam": if e.ComplexityRoot.Mutation.AddRepositoryToTeam == nil { @@ -7570,7 +7578,7 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return 0, false } - return e.ComplexityRoot.Mutation.CreateConfig(childComplexity, args["input"].(configmap.CreateConfigInput)), true + return e.ComplexityRoot.Mutation.CreateConfig(childComplexity, args["input"].(config.CreateConfigInput)), true case "Mutation.createKafkaCredentials": if e.ComplexityRoot.Mutation.CreateKafkaCredentials == nil { @@ -7714,7 +7722,7 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return 0, false } - return e.ComplexityRoot.Mutation.DeleteConfig(childComplexity, args["input"].(configmap.DeleteConfigInput)), true + return e.ComplexityRoot.Mutation.DeleteConfig(childComplexity, args["input"].(config.DeleteConfigInput)), true case "Mutation.deleteJob": if e.ComplexityRoot.Mutation.DeleteJob == nil { @@ -7858,7 +7866,7 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return 0, false } - return e.ComplexityRoot.Mutation.RemoveConfigValue(childComplexity, args["input"].(configmap.RemoveConfigValueInput)), true + return e.ComplexityRoot.Mutation.RemoveConfigValue(childComplexity, args["input"].(config.RemoveConfigValueInput)), true case "Mutation.removeRepositoryFromTeam": if e.ComplexityRoot.Mutation.RemoveRepositoryFromTeam == nil { @@ -8002,7 +8010,7 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return 0, false } - return e.ComplexityRoot.Mutation.UpdateConfigValue(childComplexity, args["input"].(configmap.UpdateConfigValueInput)), true + return e.ComplexityRoot.Mutation.UpdateConfigValue(childComplexity, args["input"].(config.UpdateConfigValueInput)), true case "Mutation.updateImageVulnerability": if e.ComplexityRoot.Mutation.UpdateImageVulnerability == nil { @@ -12472,7 +12480,7 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return 0, false } - return e.ComplexityRoot.Team.Configs(childComplexity, args["first"].(*int), args["after"].(*pagination.Cursor), args["last"].(*int), args["before"].(*pagination.Cursor), args["orderBy"].(*configmap.ConfigOrder), args["filter"].(*configmap.ConfigFilter)), true + return e.ComplexityRoot.Team.Configs(childComplexity, args["first"].(*int), args["after"].(*pagination.Cursor), args["last"].(*int), args["before"].(*pagination.Cursor), args["orderBy"].(*config.ConfigOrder), args["filter"].(*config.ConfigFilter)), true case "Team.cost": if e.ComplexityRoot.Team.Cost == nil { @@ -18322,7 +18330,7 @@ type ClusterAuditActivityLogEntryData { resourceKind: String! } `, BuiltIn: false}, - {Name: "../schema/configmap.graphqls", Input: `extend type Mutation { + {Name: "../schema/config.graphqls", Input: `extend type Mutation { "Create a new config." createConfig(input: CreateConfigInput!): CreateConfigPayload! @@ -18543,6 +18551,9 @@ input ConfigValueInput { "The value to set." value: String! + + "Encoding of the value. Defaults to PLAIN_TEXT. Use BASE64 for binary data (certificates, keystores, etc.)." + encoding: ValueEncoding = PLAIN_TEXT } input CreateConfigInput { @@ -18678,6 +18689,9 @@ type ConfigValue { "The config value itself." value: String! + + "The encoding of the value. PLAIN_TEXT for UTF-8 text, BASE64 for binary data." + encoding: ValueEncoding! } extend enum ActivityLogEntryResourceType { diff --git a/internal/graph/gengql/schema.generated.go b/internal/graph/gengql/schema.generated.go index 8e63390fe..bae789722 100644 --- a/internal/graph/gengql/schema.generated.go +++ b/internal/graph/gengql/schema.generated.go @@ -50,7 +50,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" @@ -66,11 +66,11 @@ type MutationResolver interface { CreateKafkaCredentials(ctx context.Context, input aivencredentials.CreateKafkaCredentialsInput) (*aivencredentials.CreateKafkaCredentialsPayload, error) DeleteApplication(ctx context.Context, input application.DeleteApplicationInput) (*application.DeleteApplicationPayload, error) RestartApplication(ctx context.Context, input application.RestartApplicationInput) (*application.RestartApplicationPayload, error) - CreateConfig(ctx context.Context, input configmap.CreateConfigInput) (*configmap.CreateConfigPayload, error) - AddConfigValue(ctx context.Context, input configmap.AddConfigValueInput) (*configmap.AddConfigValuePayload, error) - UpdateConfigValue(ctx context.Context, input configmap.UpdateConfigValueInput) (*configmap.UpdateConfigValuePayload, error) - RemoveConfigValue(ctx context.Context, input configmap.RemoveConfigValueInput) (*configmap.RemoveConfigValuePayload, error) - DeleteConfig(ctx context.Context, input configmap.DeleteConfigInput) (*configmap.DeleteConfigPayload, error) + CreateConfig(ctx context.Context, input config.CreateConfigInput) (*config.CreateConfigPayload, error) + AddConfigValue(ctx context.Context, input config.AddConfigValueInput) (*config.AddConfigValuePayload, error) + UpdateConfigValue(ctx context.Context, input config.UpdateConfigValueInput) (*config.UpdateConfigValuePayload, error) + RemoveConfigValue(ctx context.Context, input config.RemoveConfigValueInput) (*config.RemoveConfigValuePayload, error) + DeleteConfig(ctx context.Context, input config.DeleteConfigInput) (*config.DeleteConfigPayload, error) ChangeDeploymentKey(ctx context.Context, input deployment.ChangeDeploymentKeyInput) (*deployment.ChangeDeploymentKeyPayload, error) DeleteJob(ctx context.Context, input job.DeleteJobInput) (*job.DeleteJobPayload, error) DeleteJobRun(ctx context.Context, input job.DeleteJobRunInput) (*job.DeleteJobRunPayload, error) @@ -157,7 +157,7 @@ type SubscriptionResolver interface { func (ec *executionContext) field_Mutation_addConfigValue_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNAddConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐAddConfigValueInput) + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNAddConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐAddConfigValueInput) if err != nil { return nil, err } @@ -256,7 +256,7 @@ func (ec *executionContext) field_Mutation_confirmTeamDeletion_args(ctx context. func (ec *executionContext) field_Mutation_createConfig_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNCreateConfigInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐCreateConfigInput) + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNCreateConfigInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐCreateConfigInput) if err != nil { return nil, err } @@ -388,7 +388,7 @@ func (ec *executionContext) field_Mutation_deleteApplication_args(ctx context.Co func (ec *executionContext) field_Mutation_deleteConfig_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNDeleteConfigInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐDeleteConfigInput) + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNDeleteConfigInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐDeleteConfigInput) if err != nil { return nil, err } @@ -520,7 +520,7 @@ func (ec *executionContext) field_Mutation_grantPostgresAccess_args(ctx context. func (ec *executionContext) field_Mutation_removeConfigValue_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNRemoveConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐRemoveConfigValueInput) + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNRemoveConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐRemoveConfigValueInput) if err != nil { return nil, err } @@ -652,7 +652,7 @@ func (ec *executionContext) field_Mutation_triggerJob_args(ctx context.Context, func (ec *executionContext) field_Mutation_updateConfigValue_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) { var err error args := map[string]any{} - arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNUpdateConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐUpdateConfigValueInput) + arg0, err := graphql.ProcessArgField(ctx, rawArgs, "input", ec.unmarshalNUpdateConfigValueInput2githubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐUpdateConfigValueInput) if err != nil { return nil, err } @@ -1441,10 +1441,10 @@ func (ec *executionContext) _Mutation_createConfig(ctx context.Context, field gr ec.fieldContext_Mutation_createConfig, func(ctx context.Context) (any, error) { fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Mutation().CreateConfig(ctx, fc.Args["input"].(configmap.CreateConfigInput)) + return ec.Resolvers.Mutation().CreateConfig(ctx, fc.Args["input"].(config.CreateConfigInput)) }, nil, - ec.marshalNCreateConfigPayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐCreateConfigPayload, + ec.marshalNCreateConfigPayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐCreateConfigPayload, true, true, ) @@ -1486,10 +1486,10 @@ func (ec *executionContext) _Mutation_addConfigValue(ctx context.Context, field ec.fieldContext_Mutation_addConfigValue, func(ctx context.Context) (any, error) { fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Mutation().AddConfigValue(ctx, fc.Args["input"].(configmap.AddConfigValueInput)) + return ec.Resolvers.Mutation().AddConfigValue(ctx, fc.Args["input"].(config.AddConfigValueInput)) }, nil, - ec.marshalNAddConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐAddConfigValuePayload, + ec.marshalNAddConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐAddConfigValuePayload, true, true, ) @@ -1531,10 +1531,10 @@ func (ec *executionContext) _Mutation_updateConfigValue(ctx context.Context, fie ec.fieldContext_Mutation_updateConfigValue, func(ctx context.Context) (any, error) { fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Mutation().UpdateConfigValue(ctx, fc.Args["input"].(configmap.UpdateConfigValueInput)) + return ec.Resolvers.Mutation().UpdateConfigValue(ctx, fc.Args["input"].(config.UpdateConfigValueInput)) }, nil, - ec.marshalNUpdateConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐUpdateConfigValuePayload, + ec.marshalNUpdateConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐUpdateConfigValuePayload, true, true, ) @@ -1576,10 +1576,10 @@ func (ec *executionContext) _Mutation_removeConfigValue(ctx context.Context, fie ec.fieldContext_Mutation_removeConfigValue, func(ctx context.Context) (any, error) { fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Mutation().RemoveConfigValue(ctx, fc.Args["input"].(configmap.RemoveConfigValueInput)) + return ec.Resolvers.Mutation().RemoveConfigValue(ctx, fc.Args["input"].(config.RemoveConfigValueInput)) }, nil, - ec.marshalNRemoveConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐRemoveConfigValuePayload, + ec.marshalNRemoveConfigValuePayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐRemoveConfigValuePayload, true, true, ) @@ -1621,10 +1621,10 @@ func (ec *executionContext) _Mutation_deleteConfig(ctx context.Context, field gr ec.fieldContext_Mutation_deleteConfig, func(ctx context.Context) (any, error) { fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Mutation().DeleteConfig(ctx, fc.Args["input"].(configmap.DeleteConfigInput)) + return ec.Resolvers.Mutation().DeleteConfig(ctx, fc.Args["input"].(config.DeleteConfigInput)) }, nil, - ec.marshalNDeleteConfigPayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐDeleteConfigPayload, + ec.marshalNDeleteConfigPayload2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐDeleteConfigPayload, true, true, ) @@ -6043,30 +6043,30 @@ func (ec *executionContext) _Node(ctx context.Context, sel ast.SelectionSet, obj return graphql.Null } return ec._ContainerImage(ctx, sel, obj) - case configmap.ConfigUpdatedActivityLogEntry: + case config.ConfigUpdatedActivityLogEntry: return ec._ConfigUpdatedActivityLogEntry(ctx, sel, &obj) - case *configmap.ConfigUpdatedActivityLogEntry: + case *config.ConfigUpdatedActivityLogEntry: if obj == nil { return graphql.Null } return ec._ConfigUpdatedActivityLogEntry(ctx, sel, obj) - case configmap.ConfigDeletedActivityLogEntry: + case config.ConfigDeletedActivityLogEntry: return ec._ConfigDeletedActivityLogEntry(ctx, sel, &obj) - case *configmap.ConfigDeletedActivityLogEntry: + case *config.ConfigDeletedActivityLogEntry: if obj == nil { return graphql.Null } return ec._ConfigDeletedActivityLogEntry(ctx, sel, obj) - case configmap.ConfigCreatedActivityLogEntry: + case config.ConfigCreatedActivityLogEntry: return ec._ConfigCreatedActivityLogEntry(ctx, sel, &obj) - case *configmap.ConfigCreatedActivityLogEntry: + case *config.ConfigCreatedActivityLogEntry: if obj == nil { return graphql.Null } return ec._ConfigCreatedActivityLogEntry(ctx, sel, obj) - case configmap.Config: + case config.Config: return ec._Config(ctx, sel, &obj) - case *configmap.Config: + case *config.Config: if obj == nil { return graphql.Null } diff --git a/internal/graph/gengql/teams.generated.go b/internal/graph/gengql/teams.generated.go index edce57672..841e89134 100644 --- a/internal/graph/gengql/teams.generated.go +++ b/internal/graph/gengql/teams.generated.go @@ -33,7 +33,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/secret" "github.com/vektah/gqlparser/v2/ast" @@ -60,7 +60,7 @@ type TeamResolver interface { Applications(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *application.ApplicationOrder, filter *application.TeamApplicationsFilter) (*pagination.Connection[*application.Application], error) BigQueryDatasets(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bigquery.BigQueryDatasetOrder) (*pagination.Connection[*bigquery.BigQueryDataset], error) Buckets(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor, orderBy *bucket.BucketOrder) (*pagination.Connection[*bucket.Bucket], error) - 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) + 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) Cost(ctx context.Context, obj *team.Team) (*cost.TeamCost, error) DeploymentKey(ctx context.Context, obj *team.Team) (*deployment.DeploymentKey, error) Deployments(ctx context.Context, obj *team.Team, first *int, after *pagination.Cursor, last *int, before *pagination.Cursor) (*pagination.Connection[*deployment.Deployment], error) @@ -92,7 +92,7 @@ type TeamEnvironmentResolver interface { Application(ctx context.Context, obj *team.TeamEnvironment, name string) (*application.Application, error) BigQueryDataset(ctx context.Context, obj *team.TeamEnvironment, name string) (*bigquery.BigQueryDataset, error) Bucket(ctx context.Context, obj *team.TeamEnvironment, name string) (*bucket.Bucket, error) - Config(ctx context.Context, obj *team.TeamEnvironment, name string) (*configmap.Config, error) + Config(ctx context.Context, obj *team.TeamEnvironment, name string) (*config.Config, error) Cost(ctx context.Context, obj *team.TeamEnvironment) (*cost.TeamEnvironmentCost, error) Environment(ctx context.Context, obj *team.TeamEnvironment) (*environment.Environment, error) Job(ctx context.Context, obj *team.TeamEnvironment, name string) (*job.Job, error) @@ -108,7 +108,7 @@ type TeamInventoryCountsResolver interface { Applications(ctx context.Context, obj *team.TeamInventoryCounts) (*application.TeamInventoryCountApplications, error) BigQueryDatasets(ctx context.Context, obj *team.TeamInventoryCounts) (*bigquery.TeamInventoryCountBigQueryDatasets, error) Buckets(ctx context.Context, obj *team.TeamInventoryCounts) (*bucket.TeamInventoryCountBuckets, error) - Configs(ctx context.Context, obj *team.TeamInventoryCounts) (*configmap.TeamInventoryCountConfigs, error) + Configs(ctx context.Context, obj *team.TeamInventoryCounts) (*config.TeamInventoryCountConfigs, error) Jobs(ctx context.Context, obj *team.TeamInventoryCounts) (*job.TeamInventoryCountJobs, error) KafkaTopics(ctx context.Context, obj *team.TeamInventoryCounts) (*kafkatopic.TeamInventoryCountKafkaTopics, error) OpenSearches(ctx context.Context, obj *team.TeamInventoryCounts) (*opensearch.TeamInventoryCountOpenSearches, error) @@ -485,12 +485,12 @@ func (ec *executionContext) field_Team_configs_args(ctx context.Context, rawArgs return nil, err } args["before"] = arg3 - arg4, err := graphql.ProcessArgField(ctx, rawArgs, "orderBy", ec.unmarshalOConfigOrder2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigOrder) + arg4, err := graphql.ProcessArgField(ctx, rawArgs, "orderBy", ec.unmarshalOConfigOrder2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigOrder) if err != nil { return nil, err } args["orderBy"] = arg4 - arg5, err := graphql.ProcessArgField(ctx, rawArgs, "filter", ec.unmarshalOConfigFilter2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfigFilter) + arg5, err := graphql.ProcessArgField(ctx, rawArgs, "filter", ec.unmarshalOConfigFilter2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfigFilter) if err != nil { return nil, err } @@ -2308,7 +2308,7 @@ func (ec *executionContext) _Team_configs(ctx context.Context, field graphql.Col ec.fieldContext_Team_configs, func(ctx context.Context) (any, error) { fc := graphql.GetFieldContext(ctx) - return ec.Resolvers.Team().Configs(ctx, obj, fc.Args["first"].(*int), fc.Args["after"].(*pagination.Cursor), fc.Args["last"].(*int), fc.Args["before"].(*pagination.Cursor), fc.Args["orderBy"].(*configmap.ConfigOrder), fc.Args["filter"].(*configmap.ConfigFilter)) + return ec.Resolvers.Team().Configs(ctx, obj, fc.Args["first"].(*int), fc.Args["after"].(*pagination.Cursor), fc.Args["last"].(*int), fc.Args["before"].(*pagination.Cursor), fc.Args["orderBy"].(*config.ConfigOrder), fc.Args["filter"].(*config.ConfigFilter)) }, nil, ec.marshalNConfigConnection2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋgraphᚋpaginationᚐConnection, @@ -5149,7 +5149,7 @@ func (ec *executionContext) _TeamEnvironment_config(ctx context.Context, field g return ec.Resolvers.TeamEnvironment().Config(ctx, obj, fc.Args["name"].(string)) }, nil, - ec.marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐConfig, + ec.marshalNConfig2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐConfig, true, true, ) @@ -6615,7 +6615,7 @@ func (ec *executionContext) _TeamInventoryCounts_configs(ctx context.Context, fi return ec.Resolvers.TeamInventoryCounts().Configs(ctx, obj) }, nil, - ec.marshalNTeamInventoryCountConfigs2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigmapᚐTeamInventoryCountConfigs, + ec.marshalNTeamInventoryCountConfigs2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋworkloadᚋconfigᚐTeamInventoryCountConfigs, true, true, ) diff --git a/internal/graph/schema/configmap.graphqls b/internal/graph/schema/config.graphqls similarity index 97% rename from internal/graph/schema/configmap.graphqls rename to internal/graph/schema/config.graphqls index 57feaedea..3058925a8 100644 --- a/internal/graph/schema/configmap.graphqls +++ b/internal/graph/schema/config.graphqls @@ -219,6 +219,9 @@ input ConfigValueInput { "The value to set." value: String! + + "Encoding of the value. Defaults to PLAIN_TEXT. Use BASE64 for binary data (certificates, keystores, etc.)." + encoding: ValueEncoding = PLAIN_TEXT } input CreateConfigInput { @@ -354,6 +357,9 @@ type ConfigValue { "The config value itself." value: String! + + "The encoding of the value. PLAIN_TEXT for UTF-8 text, BASE64 for binary data." + encoding: ValueEncoding! } extend enum ActivityLogEntryResourceType { diff --git a/internal/kubernetes/watchers/watchers.go b/internal/kubernetes/watchers/watchers.go index 430ede3e9..a8cd3597a 100644 --- a/internal/kubernetes/watchers/watchers.go +++ b/internal/kubernetes/watchers/watchers.go @@ -15,7 +15,7 @@ import ( "github.com/nais/api/internal/unleash" "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/secret" nais_io_v1 "github.com/nais/liberator/pkg/apis/nais.io/v1" @@ -42,7 +42,7 @@ type ( NamespaceWatcher = watcher.Watcher[*v1.Namespace] UnleashWatcher = watcher.Watcher[*unleash.UnleashInstance] SecretWatcher = watcher.Watcher[*secret.Secret] - ConfigMapWatcher = watcher.Watcher[*configmap.Config] + ConfigWatcher = watcher.Watcher[*config.Config] ) type Watchers struct { @@ -62,7 +62,7 @@ type Watchers struct { NamespaceWatcher *NamespaceWatcher UnleashWatcher *UnleashWatcher SecretWatcher *SecretWatcher - ConfigMapWatcher *ConfigMapWatcher + ConfigWatcher *ConfigWatcher } func SetupWatchers( @@ -87,6 +87,6 @@ func SetupWatchers( NamespaceWatcher: team.NewNamespaceWatcher(ctx, watcherMgr), UnleashWatcher: unleash.NewWatcher(ctx, mgmtWatcherMgr), SecretWatcher: secret.NewWatcher(ctx, watcherMgr), - ConfigMapWatcher: configmap.NewWatcher(ctx, watcherMgr), + ConfigWatcher: config.NewWatcher(ctx, watcherMgr), } } diff --git a/internal/workload/application/models.go b/internal/workload/application/models.go index 971e7810d..f81081700 100644 --- a/internal/workload/application/models.go +++ b/internal/workload/application/models.go @@ -56,7 +56,7 @@ func (a *Application) GetSecrets() []string { return ret } -// GetConfigs returns a list of configmap names used by the application +// GetConfigs returns a list of config names used by the application func (a *Application) GetConfigs() []string { ret := make([]string, 0) for _, v := range a.Spec.EnvFrom { diff --git a/internal/workload/configmap/activitylog.go b/internal/workload/config/activitylog.go similarity index 99% rename from internal/workload/configmap/activitylog.go rename to internal/workload/config/activitylog.go index 17637ebde..2b5d1ef73 100644 --- a/internal/workload/configmap/activitylog.go +++ b/internal/workload/config/activitylog.go @@ -1,4 +1,4 @@ -package configmap +package config import ( "fmt" diff --git a/internal/workload/configmap/dataloader.go b/internal/workload/config/dataloader.go similarity index 95% rename from internal/workload/configmap/dataloader.go rename to internal/workload/config/dataloader.go index 3e87b9cf6..cef21fa93 100644 --- a/internal/workload/configmap/dataloader.go +++ b/internal/workload/config/dataloader.go @@ -1,4 +1,4 @@ -package configmap +package config import ( "context" @@ -44,7 +44,7 @@ type loaders struct { log logrus.FieldLogger } -// Watcher returns the configmap watcher +// Watcher returns the config watcher func (l *loaders) Watcher() *watcher.Watcher[*Config] { return l.watcher } diff --git a/internal/workload/configmap/errors.go b/internal/workload/config/errors.go similarity index 96% rename from internal/workload/configmap/errors.go rename to internal/workload/config/errors.go index a13c5ec18..d8976541b 100644 --- a/internal/workload/configmap/errors.go +++ b/internal/workload/config/errors.go @@ -1,4 +1,4 @@ -package configmap +package config type errUnmanaged struct{} diff --git a/internal/workload/configmap/models.go b/internal/workload/config/models.go similarity index 91% rename from internal/workload/configmap/models.go rename to internal/workload/config/models.go index dbb0f32b8..c06459921 100644 --- a/internal/workload/configmap/models.go +++ b/internal/workload/config/models.go @@ -1,4 +1,4 @@ -package configmap +package config import ( "fmt" @@ -11,6 +11,7 @@ import ( "github.com/nais/api/internal/graph/pagination" "github.com/nais/api/internal/kubernetes" "github.com/nais/api/internal/slug" + "github.com/nais/api/internal/workload/secret" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -26,6 +27,7 @@ type Config struct { LastModifiedAt *time.Time `json:"lastModifiedAt"` ModifiedByUserEmail *string `json:"lastModifiedBy"` Data map[string]string `json:"-"` // ConfigMap data cached as-is (not sensitive) + Annotations map[string]string `json:"-"` // Cached annotations for binary-keys lookup TeamSlug slug.Slug `json:"-"` EnvironmentName string `json:"-"` @@ -53,8 +55,9 @@ type UpdateConfigPayload struct { } type ConfigValueInput struct { - Name string `json:"name"` - Value string `json:"value"` + Name string `json:"name"` + Value string `json:"value"` + Encoding *secret.ValueEncoding `json:"encoding"` } func (c *Config) ID() ident.Ident { @@ -111,12 +114,14 @@ func toGraphConfig(o *unstructured.Unstructured, environmentName string) (*Confi LastModifiedAt: lastModifiedAt, ModifiedByUserEmail: lastModifiedBy, Data: data, + Annotations: o.GetAnnotations(), }, true } type ConfigValue struct { - Name string `json:"name"` - Value string `json:"value"` + Name string `json:"name"` + Value string `json:"value"` + Encoding secret.ValueEncoding `json:"encoding"` } type DeleteConfigInput struct { diff --git a/internal/workload/configmap/node.go b/internal/workload/config/node.go similarity index 97% rename from internal/workload/configmap/node.go rename to internal/workload/config/node.go index 5d1913ba1..5ac4aaf93 100644 --- a/internal/workload/configmap/node.go +++ b/internal/workload/config/node.go @@ -1,4 +1,4 @@ -package configmap +package config import ( "fmt" diff --git a/internal/workload/configmap/queries.go b/internal/workload/config/queries.go similarity index 67% rename from internal/workload/configmap/queries.go rename to internal/workload/config/queries.go index 44aa88c03..3ada5779b 100644 --- a/internal/workload/configmap/queries.go +++ b/internal/workload/config/queries.go @@ -1,11 +1,13 @@ -package configmap +package config import ( "context" + "encoding/base64" "encoding/json" "fmt" "slices" "strings" + "unicode/utf8" "github.com/nais/api/internal/activitylog" "github.com/nais/api/internal/auth/authz" @@ -17,6 +19,7 @@ import ( "github.com/nais/api/internal/kubernetes/watcher" "github.com/nais/api/internal/slug" "github.com/nais/api/internal/workload" + "github.com/nais/api/internal/workload/secret" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -87,12 +90,11 @@ func GetConfigValues(ctx context.Context, teamSlug slug.Slug, environmentName, n return nil, err } + binaryKeys := getBinaryKeys(config.Annotations) + values := make([]*ConfigValue, 0, len(config.Data)) for k, v := range config.Data { - values = append(values, &ConfigValue{ - Name: k, - Value: v, - }) + values = append(values, decodeValueFromStorage(k, v, binaryKeys)) } slices.SortFunc(values, func(a, b *ConfigValue) int { @@ -152,7 +154,7 @@ func Create(ctx context.Context, teamSlug slug.Slug, environment, name string) ( retVal, ok := toGraphConfig(created, environment) if !ok { - return nil, fmt.Errorf("failed to convert configmap to graph config") + return nil, fmt.Errorf("failed to convert config") } return retVal, nil } @@ -168,7 +170,7 @@ func AddConfigValue(ctx context.Context, teamSlug slug.Slug, environment, config return nil, err } - // Check if the configmap exists and is managed by console + // Check if the config exists and is managed by console obj, err := client.Namespace(teamSlug.String()).Get(ctx, configName, v1.GetOptions{}) if err != nil { return nil, err @@ -184,19 +186,32 @@ func AddConfigValue(ctx context.Context, teamSlug slug.Slug, environment, config return nil, apierror.Errorf("The config already contains a value with the name %q.", valueToAdd.Name) } + // Encode the value for storage + encodedValue, err := encodeValueForStorage(valueToAdd) + if err != nil { + return nil, err + } + // Use JSON Patch to add the new key actor := authz.ActorFromContext(ctx) + // Track binary encoding in annotation for round-trip fidelity + isBinary := valueToAdd.Encoding != nil && *valueToAdd.Encoding == secret.ValueEncodingBase64 + extra := map[string]string{ + annotationBinaryKeys: updatedBinaryKeysAnnotation(obj.GetAnnotations(), valueToAdd.Name, isBinary), + } + mergedAnnotations := mergeAnnotations(obj.GetAnnotations(), actor.User.Identity(), extra) + var patch []map[string]any if !dataExists || data == nil { patch = []map[string]any{ - {"op": "add", "path": "/data", "value": map[string]any{valueToAdd.Name: valueToAdd.Value}}, - {"op": "replace", "path": "/metadata/annotations", "value": annotations(actor.User.Identity())}, + {"op": "add", "path": "/data", "value": map[string]any{valueToAdd.Name: encodedValue}}, + {"op": "replace", "path": "/metadata/annotations", "value": mergedAnnotations}, } } else { patch = []map[string]any{ - {"op": "add", "path": "/data/" + escapeJSONPointer(valueToAdd.Name), "value": valueToAdd.Value}, - {"op": "replace", "path": "/metadata/annotations", "value": annotations(actor.User.Identity())}, + {"op": "add", "path": "/data/" + escapeJSONPointer(valueToAdd.Name), "value": encodedValue}, + {"op": "replace", "path": "/metadata/annotations", "value": mergedAnnotations}, } } @@ -238,7 +253,7 @@ func AddConfigValue(ctx context.Context, teamSlug slug.Slug, environment, config retVal, ok := toGraphConfig(updated, environment) if !ok { - return nil, fmt.Errorf("failed to convert configmap") + return nil, fmt.Errorf("failed to convert config") } return retVal, nil } @@ -254,7 +269,7 @@ func UpdateConfigValue(ctx context.Context, teamSlug slug.Slug, environment, con return nil, err } - // Check if the configmap exists and is managed by console + // Check if the config exists and is managed by console obj, err := client.Namespace(teamSlug.String()).Get(ctx, configName, v1.GetOptions{}) if err != nil { return nil, err @@ -276,12 +291,25 @@ func UpdateConfigValue(ctx context.Context, teamSlug slug.Slug, environment, con oldValue = &s } + // Encode the value for storage + encodedValue, err := encodeValueForStorage(valueToUpdate) + if err != nil { + return nil, err + } + // Use JSON Patch to update the key actor := authz.ActorFromContext(ctx) + // Track binary encoding in annotation for round-trip fidelity + isBinary := valueToUpdate.Encoding != nil && *valueToUpdate.Encoding == secret.ValueEncodingBase64 + extra := map[string]string{ + annotationBinaryKeys: updatedBinaryKeysAnnotation(obj.GetAnnotations(), valueToUpdate.Name, isBinary), + } + mergedAnnotations := mergeAnnotations(obj.GetAnnotations(), actor.User.Identity(), extra) + patch := []map[string]any{ - {"op": "replace", "path": "/data/" + escapeJSONPointer(valueToUpdate.Name), "value": valueToUpdate.Value}, - {"op": "replace", "path": "/metadata/annotations", "value": annotations(actor.User.Identity())}, + {"op": "replace", "path": "/data/" + escapeJSONPointer(valueToUpdate.Name), "value": encodedValue}, + {"op": "replace", "path": "/metadata/annotations", "value": mergedAnnotations}, } patchBytes, err := json.Marshal(patch) @@ -323,7 +351,7 @@ func UpdateConfigValue(ctx context.Context, teamSlug slug.Slug, environment, con retVal, ok := toGraphConfig(updated, environment) if !ok { - return nil, fmt.Errorf("failed to convert configmap") + return nil, fmt.Errorf("failed to convert config") } return retVal, nil } @@ -335,7 +363,7 @@ func RemoveConfigValue(ctx context.Context, teamSlug slug.Slug, environment, con return nil, err } - // Check if the configmap exists and is managed by console + // Check if the config exists and is managed by console obj, err := client.Namespace(teamSlug.String()).Get(ctx, configName, v1.GetOptions{}) if err != nil { return nil, err @@ -360,9 +388,15 @@ func RemoveConfigValue(ctx context.Context, teamSlug slug.Slug, environment, con // Use JSON Patch to remove the key actor := authz.ActorFromContext(ctx) + // Remove the key from binary-keys annotation if present + extra := map[string]string{ + annotationBinaryKeys: updatedBinaryKeysAnnotation(obj.GetAnnotations(), valueName, false), + } + mergedAnnotations := mergeAnnotations(obj.GetAnnotations(), actor.User.Identity(), extra) + patch := []map[string]any{ {"op": "remove", "path": "/data/" + escapeJSONPointer(valueName)}, - {"op": "replace", "path": "/metadata/annotations", "value": annotations(actor.User.Identity())}, + {"op": "replace", "path": "/metadata/annotations", "value": mergedAnnotations}, } patchBytes, err := json.Marshal(patch) @@ -403,7 +437,7 @@ func RemoveConfigValue(ctx context.Context, teamSlug slug.Slug, environment, con retVal, ok := toGraphConfig(updated, environment) if !ok { - return nil, fmt.Errorf("failed to convert configmap") + return nil, fmt.Errorf("failed to convert config") } return retVal, nil } @@ -476,3 +510,134 @@ func escapeJSONPointer(s string) string { s = strings.ReplaceAll(s, "/", "~1") return s } + +const annotationBinaryKeys = "nais.io/binary-keys" + +// encodeValueForStorage prepares a config value for storage in a Kubernetes ConfigMap. +// ConfigMap data is stored as plain strings (unlike secrets which use base64). +// When encoding is BASE64, the client sends base64-encoded binary data — we store it as-is +// in the ConfigMap data field (the base64 string is valid UTF-8 and safe to store). +// When encoding is PLAIN_TEXT (or unset), we store the value directly. +func encodeValueForStorage(input *ConfigValueInput) (string, error) { + encoding := secret.ValueEncodingPlainText + if input.Encoding != nil { + encoding = *input.Encoding + } + + switch encoding { + case secret.ValueEncodingBase64: + // Validate that the value is valid base64 + if _, err := base64.StdEncoding.DecodeString(input.Value); err != nil { + return "", fmt.Errorf("value is not valid base64: %w", err) + } + // Store the base64 string as-is in the ConfigMap data field + return input.Value, nil + case secret.ValueEncodingPlainText: + return input.Value, nil + default: + return "", fmt.Errorf("unsupported encoding: %s", encoding) + } +} + +// getBinaryKeys parses the nais.io/binary-keys annotation from a ConfigMap. +// Returns a set of key names that are stored as binary (BASE64). +func getBinaryKeys(annotations map[string]string) map[string]bool { + if annotations == nil { + return nil + } + raw, ok := annotations[annotationBinaryKeys] + if !ok || raw == "" { + return nil + } + var keys []string + if err := json.Unmarshal([]byte(raw), &keys); err != nil { + return nil + } + m := make(map[string]bool, len(keys)) + for _, k := range keys { + m[k] = true + } + return m +} + +// updatedBinaryKeysAnnotation returns the updated nais.io/binary-keys annotation value +// after adding or removing a key. Returns empty string if no binary keys remain. +func updatedBinaryKeysAnnotation(existingAnnotations map[string]string, keyName string, isBinary bool) string { + existing := getBinaryKeys(existingAnnotations) + if existing == nil { + existing = make(map[string]bool) + } + + if isBinary { + existing[keyName] = true + } else { + delete(existing, keyName) + } + + if len(existing) == 0 { + return "" + } + + keys := make([]string, 0, len(existing)) + for k := range existing { + keys = append(keys, k) + } + slices.Sort(keys) + b, _ := json.Marshal(keys) + return string(b) +} + +// mergeAnnotations returns annotations for a JSON Patch that preserves existing annotations +// (like nais.io/binary-keys) while updating the standard ones (last-modified-at, etc.). +func mergeAnnotations(existingAnnotations map[string]string, user string, extraAnnotations map[string]string) map[string]string { + merged := make(map[string]string) + // Start with existing annotations to preserve nais.io/binary-keys etc. + for k, v := range existingAnnotations { + merged[k] = v + } + // Apply standard annotations (overwrites last-modified-at, etc.) + for k, v := range annotations(user) { + merged[k] = v + } + // Apply extra annotations + for k, v := range extraAnnotations { + if v == "" { + delete(merged, k) + } else { + merged[k] = v + } + } + return merged +} + +// decodeValueFromStorage converts a value from a Kubernetes ConfigMap into a ConfigValue. +// ConfigMap data is stored as plain strings. Binary values are base64-encoded strings. +// If binaryKeys is non-nil, it is used to determine encoding authoritatively. +// Otherwise falls back to utf8.Valid() heuristic for configs not written through our API. +func decodeValueFromStorage(name, raw string, binaryKeys map[string]bool) *ConfigValue { + isBinary := false + if binaryKeys != nil { + isBinary = binaryKeys[name] + } else { + // Fallback heuristic: if the value looks like base64-encoded data and is not valid UTF-8 + // when decoded, treat it as binary. For ConfigMaps, the stored value is always a string, + // so we check if it's a base64-encoded non-UTF-8 value. + if decoded, err := base64.StdEncoding.DecodeString(raw); err == nil { + isBinary = !utf8.Valid(decoded) + } + } + + if isBinary { + return &ConfigValue{ + Name: name, + Value: raw, // Already base64-encoded in the ConfigMap + Encoding: secret.ValueEncodingBase64, + } + } + + return &ConfigValue{ + Name: name, + Value: raw, + Encoding: secret.ValueEncodingPlainText, + } +} diff --git a/internal/workload/configmap/sortfilter.go b/internal/workload/config/sortfilter.go similarity index 98% rename from internal/workload/configmap/sortfilter.go rename to internal/workload/config/sortfilter.go index 98226928d..4998a5328 100644 --- a/internal/workload/configmap/sortfilter.go +++ b/internal/workload/config/sortfilter.go @@ -1,4 +1,4 @@ -package configmap +package config import ( "context" diff --git a/internal/workload/job/models.go b/internal/workload/job/models.go index cec93f5ff..4adf6e527 100644 --- a/internal/workload/job/models.go +++ b/internal/workload/job/models.go @@ -63,7 +63,7 @@ func (j *Job) GetSecrets() []string { return ret } -// GetConfigs returns a list of configmap names used by the job +// GetConfigs returns a list of config names used by the job func (j *Job) GetConfigs() []string { ret := make([]string, 0) for _, v := range j.Spec.EnvFrom { diff --git a/internal/workload/models.go b/internal/workload/models.go index 29b987214..1af37e672 100644 --- a/internal/workload/models.go +++ b/internal/workload/models.go @@ -39,7 +39,7 @@ type Workload interface { // GetSecrets returns a list of secret names used by the workload GetSecrets() []string - // GetConfigs returns a list of configmap names used by the workload + // GetConfigs returns a list of config names used by the workload GetConfigs() []string Image() *ContainerImage }