diff --git a/apps/console/internal/app/graph/generated/generated.go b/apps/console/internal/app/graph/generated/generated.go index 19ea77d34..686c9faf5 100644 --- a/apps/console/internal/app/graph/generated/generated.go +++ b/apps/console/internal/app/graph/generated/generated.go @@ -6194,6 +6194,7 @@ enum ConsoleResType { environment registry_image vpn_device + secret_variable } type ConsoleCheckNameAvailabilityOutput @shareable { @@ -7197,6 +7198,7 @@ enum Github__com___kloudlite___api___apps___console___internal___entities__Resou managed_resource router secret + secret_variable service_binding } diff --git a/apps/console/internal/app/graph/model/models_gen.go b/apps/console/internal/app/graph/model/models_gen.go index a4f6568cc..1b10d71f0 100644 --- a/apps/console/internal/app/graph/model/models_gen.go +++ b/apps/console/internal/app/graph/model/models_gen.go @@ -1008,6 +1008,7 @@ const ( GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeManagedResource GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceType = "managed_resource" GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeRouter GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceType = "router" GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeSecret GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceType = "secret" + GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeSecretVariable GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceType = "secret_variable" GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeServiceBinding GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceType = "service_binding" ) @@ -1022,12 +1023,13 @@ var AllGithubComKloudliteAPIAppsConsoleInternalEntitiesResourceType = []GithubCo GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeManagedResource, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeRouter, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeSecret, + GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeSecretVariable, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeServiceBinding, } func (e GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceType) IsValid() bool { switch e { - case GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeApp, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeClusterManagedService, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeConfig, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeEnvironment, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeExternalApp, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeImagePullSecret, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeImportedManagedResource, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeManagedResource, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeRouter, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeSecret, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeServiceBinding: + case GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeApp, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeClusterManagedService, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeConfig, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeEnvironment, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeExternalApp, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeImagePullSecret, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeImportedManagedResource, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeManagedResource, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeRouter, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeSecret, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeSecretVariable, GithubComKloudliteAPIAppsConsoleInternalEntitiesResourceTypeServiceBinding: return true } return false diff --git a/apps/console/internal/app/graph/schema.graphqls b/apps/console/internal/app/graph/schema.graphqls index 61c81ce5c..94f55ad10 100644 --- a/apps/console/internal/app/graph/schema.graphqls +++ b/apps/console/internal/app/graph/schema.graphqls @@ -13,6 +13,7 @@ enum ConsoleResType { environment registry_image vpn_device + secret_variable } type ConsoleCheckNameAvailabilityOutput @shareable { diff --git a/apps/console/internal/app/graph/secretvariable.resolvers.go b/apps/console/internal/app/graph/secretvariable.resolvers.go index 4ae8099bb..dbcbeec1f 100644 --- a/apps/console/internal/app/graph/secretvariable.resolvers.go +++ b/apps/console/internal/app/graph/secretvariable.resolvers.go @@ -74,34 +74,3 @@ func (r *Resolver) SecretVariableIn() generated.SecretVariableInResolver { type secretVariableResolver struct{ *Resolver } type secretVariableInResolver struct{ *Resolver } - -// !!! WARNING !!! -// The code below was going to be deleted when updating resolvers. It has been copied here so you have -// one last chance to move it out of harms way if you want. There are two reasons this happens: -// - When renaming or deleting a resolver the old code will be put in here. You can safely delete -// it when you're done. -// - You have helper methods in this file. Move them out to keep these resolver files clean. -/* - func (r *secretVariableResolver) Metadata(ctx context.Context, obj *entities.SecretVariable) (string, error) { - if obj == nil { - return nil, errNilSecretVariable - } - - // Convert obj.Metadata (assuming it is a JSON-like structure) to the required model - m := model.SecretVariableMetadata{} - if err := fn.JsonConversion(obj.Metadata, &m); err != nil { - return nil, errors.NewE(err) - } - - return &m, nil -} -func (r *secretVariableInResolver) Metadata(ctx context.Context, obj *entities.SecretVariable, data string) error { - if obj == nil { - return errNilApp - } - if data != "" { - obj.Name = data - } - return nil -} -*/ diff --git a/apps/console/internal/app/graph/struct-to-graphql/common-types.graphqls b/apps/console/internal/app/graph/struct-to-graphql/common-types.graphqls index 5fa7baf53..962e6a73d 100644 --- a/apps/console/internal/app/graph/struct-to-graphql/common-types.graphqls +++ b/apps/console/internal/app/graph/struct-to-graphql/common-types.graphqls @@ -680,6 +680,7 @@ enum Github__com___kloudlite___api___apps___console___internal___entities__Resou managed_resource router secret + secret_variable service_binding } diff --git a/apps/console/internal/domain/names.go b/apps/console/internal/domain/names.go index 9c19e2081..a3f6589ad 100644 --- a/apps/console/internal/domain/names.go +++ b/apps/console/internal/domain/names.go @@ -58,6 +58,11 @@ func (d *domain) CheckNameAvailability(ctx context.Context, accountName string, return checkResourceName(ctx, repos.Filter{fields.AccountName: accountName, fields.MetadataName: name, fc.ManagedResourceManagedServiceName: msvcName}, d.mresRepo) } + case entities.ResourceTypeSecretVariable: + { + return checkResourceName(ctx, repos.Filter{fields.AccountName: accountName, fc.SecretVariableName: name}, d.secretVariableRepo) + } + default: { if environmentName == nil { diff --git a/apps/console/internal/entities/resource-mapping.go b/apps/console/internal/entities/resource-mapping.go index 855cdab36..ca72599d9 100644 --- a/apps/console/internal/entities/resource-mapping.go +++ b/apps/console/internal/entities/resource-mapping.go @@ -20,6 +20,7 @@ const ( ResourceTypeImportedManagedResource ResourceType = "imported_managed_resource" ResourceTypeClusterManagedService ResourceType = "cluster_managed_service" ResourceTypeServiceBinding ResourceType = "service_binding" + ResourceTypeSecretVariable ResourceType = "secret_variable" ) type ResourceHeirarchy string