mirror of
https://github.com/psviderski/uncloud.git
synced 2026-10-06 13:18:58 +00:00
refactor: embed ServiceSpecResolver into Deployment to handle spec only there
This commit is contained in:
1 parent
7a9d0cf9db
commit
3910101a88
17 files changed
+191
-148
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user