From 2716507c86b63f58fb3708a2088c5a592ff04bfc Mon Sep 17 00:00:00 2001 From: Samuel Lorch Date: Sun, 2 Apr 2023 02:11:15 +0200 Subject: [PATCH] Use ConfigManager --- internal/api/object/addresses.go | 21 +++++++++++++++------ internal/api/object/services.go | 21 +++++++++++++++------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/internal/api/object/addresses.go b/internal/api/object/addresses.go index 9c2cbee..369a3d7 100644 --- a/internal/api/object/addresses.go +++ b/internal/api/object/addresses.go @@ -28,8 +28,11 @@ func (f *Object) CreateAddress(ctx context.Context, params CreateAddressParamete return struct{}{}, fmt.Errorf("Address already Exists") } - f.ConfigManager.GetPendingConfig().Object.Addresses[params.Name] = params.Address - return struct{}{}, nil + t, conf := f.ConfigManager.StartTransaction() + defer t.Discard() + + conf.Object.Addresses[params.Name] = params.Address + return struct{}{}, t.Commit() } type UpdateAddressParameters struct { @@ -43,8 +46,11 @@ func (f *Object) UpdateAddress(ctx context.Context, params CreateAddressParamete return struct{}{}, fmt.Errorf("Address does not Exist") } - f.ConfigManager.GetPendingConfig().Object.Addresses[params.Name] = params.Address - return struct{}{}, nil + t, conf := f.ConfigManager.StartTransaction() + defer t.Discard() + + conf.Object.Addresses[params.Name] = params.Address + return struct{}{}, t.Commit() } type DeleteAddressParameters struct { @@ -57,6 +63,9 @@ func (f *Object) DeleteAddress(ctx context.Context, params DeleteAddressParamete return struct{}{}, fmt.Errorf("Interface does not Exist") } - delete(f.ConfigManager.GetPendingConfig().Object.Addresses, params.Name) - return struct{}{}, nil + t, conf := f.ConfigManager.StartTransaction() + defer t.Discard() + + delete(conf.Object.Addresses, params.Name) + return struct{}{}, t.Commit() } diff --git a/internal/api/object/services.go b/internal/api/object/services.go index 85c4a8a..326b1ed 100644 --- a/internal/api/object/services.go +++ b/internal/api/object/services.go @@ -28,8 +28,11 @@ func (f *Object) CreateService(ctx context.Context, params CreateServiceParamete return struct{}{}, fmt.Errorf("Service already Exists") } - f.ConfigManager.GetPendingConfig().Object.Services[params.Name] = params.Service - return struct{}{}, nil + t, conf := f.ConfigManager.StartTransaction() + defer t.Discard() + + conf.Object.Services[params.Name] = params.Service + return struct{}{}, t.Commit() } type UpdateServiceParameters struct { @@ -43,8 +46,11 @@ func (f *Object) UpdateService(ctx context.Context, params CreateServiceParamete return struct{}{}, fmt.Errorf("Service does not Exist") } - f.ConfigManager.GetPendingConfig().Object.Services[params.Name] = params.Service - return struct{}{}, nil + t, conf := f.ConfigManager.StartTransaction() + defer t.Discard() + + conf.Object.Services[params.Name] = params.Service + return struct{}{}, t.Commit() } type DeleteServiceParameters struct { @@ -57,6 +63,9 @@ func (f *Object) DeleteService(ctx context.Context, params DeleteServiceParamete return struct{}{}, fmt.Errorf("Interface does not Exist") } - delete(f.ConfigManager.GetPendingConfig().Object.Services, params.Name) - return struct{}{}, nil + t, conf := f.ConfigManager.StartTransaction() + defer t.Discard() + + delete(conf.Object.Services, params.Name) + return struct{}{}, t.Commit() }