philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-27 19:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: embed ServiceSpecResolver into Deployment to handle spec only there

Browse Source
This commit is contained in:
Pavel Sviderski
2025-03-24 20:10:28 +10:00
parent 7a9d0cf9db
commit 3910101a88
17 changed files with 191 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/client/deploy/resolver.go
+8 -5
View File
@@ -19,11 +19,13 @@ type ServiceSpecResolver struct {
}
// Resolve transforms a service spec into its fully resolved form ready for deployment.
func (r *ServiceSpecResolver) Resolve(spec *api.ServiceSpec) error {
func (r *ServiceSpecResolver) Resolve(spec api.ServiceSpec) (api.ServiceSpec, error) {
if err := spec.Validate(); err != nil {
return fmt.Errorf("invalid service spec: %w", err)
return spec, fmt.Errorf("invalid service spec: %w", err)
}
spec = spec.Clone()
steps := []func(*api.ServiceSpec) error{
r.applyDefaults,
r.resolveServiceName,
@@ -32,12 +34,12 @@ func (r *ServiceSpecResolver) Resolve(spec *api.ServiceSpec) error {
}
for _, step := range steps {
if err := step(spec); err != nil {
return err
if err := step(&spec); err != nil {
return spec, err
}
}
return nil
return spec, nil
}
func (r *ServiceSpecResolver) applyDefaults(spec *api.ServiceSpec) error {
@@ -52,6 +54,7 @@ func (r *ServiceSpecResolver) applyDefaults(spec *api.ServiceSpec) error {
return nil
}
// resolveServiceName generates a service name from the image when not provided.
func (r *ServiceSpecResolver) resolveServiceName(spec *api.ServiceSpec) error {
if spec.Name != "" {
return nil