From bcda80fab703ebca62cdf94376a6b581a9005cdc Mon Sep 17 00:00:00 2001 From: coddmeistr Date: Fri, 14 Feb 2025 12:46:46 +0300 Subject: [PATCH 1/5] update proto --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 233db6447..173fd8480 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 github.com/rabbitmq/amqp091-go v1.9.0 github.com/rs/cors v1.10.1 - github.com/slntopp/nocloud-proto v0.0.0-20250212175505-5d285dcff60b + github.com/slntopp/nocloud-proto v0.0.0-20250214094441-092937860361 github.com/spf13/viper v1.18.2 github.com/stoewer/go-strcase v1.3.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 18e7533da..127afe062 100644 --- a/go.sum +++ b/go.sum @@ -118,8 +118,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/slntopp/nocloud-proto v0.0.0-20250212175505-5d285dcff60b h1:/RqOqgzF40Kp0LL4kzcOd34im9xpq+Hg8XYwVlTgxTw= -github.com/slntopp/nocloud-proto v0.0.0-20250212175505-5d285dcff60b/go.mod h1:qPbslPB2J9Q7qm6H9Jaqf/Ysf61YlPL0DUFhIdAEikI= +github.com/slntopp/nocloud-proto v0.0.0-20250214094441-092937860361 h1:vrqEGUrmIc+QLt31Ah0i7PnD+GI2Le5FlJC01tnFV8g= +github.com/slntopp/nocloud-proto v0.0.0-20250214094441-092937860361/go.mod h1:qPbslPB2J9Q7qm6H9Jaqf/Ysf61YlPL0DUFhIdAEikI= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= From 0d9c4be6364e69414e2249c29630d0c33a3bfb01 Mon Sep 17 00:00:00 2001 From: coddmeistr Date: Fri, 14 Feb 2025 14:00:56 +0300 Subject: [PATCH 2/5] update proto --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 173fd8480..c890f7a10 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 github.com/rabbitmq/amqp091-go v1.9.0 github.com/rs/cors v1.10.1 - github.com/slntopp/nocloud-proto v0.0.0-20250214094441-092937860361 + github.com/slntopp/nocloud-proto v0.0.0-20250214110012-4e949c866913 github.com/spf13/viper v1.18.2 github.com/stoewer/go-strcase v1.3.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 127afe062..7a178930f 100644 --- a/go.sum +++ b/go.sum @@ -118,8 +118,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/slntopp/nocloud-proto v0.0.0-20250214094441-092937860361 h1:vrqEGUrmIc+QLt31Ah0i7PnD+GI2Le5FlJC01tnFV8g= -github.com/slntopp/nocloud-proto v0.0.0-20250214094441-092937860361/go.mod h1:qPbslPB2J9Q7qm6H9Jaqf/Ysf61YlPL0DUFhIdAEikI= +github.com/slntopp/nocloud-proto v0.0.0-20250214110012-4e949c866913 h1:ZcYCaXe5XaJc03H75DxJFNK45gDQfdVlB/ZJsxRS6Gw= +github.com/slntopp/nocloud-proto v0.0.0-20250214110012-4e949c866913/go.mod h1:qPbslPB2J9Q7qm6H9Jaqf/Ysf61YlPL0DUFhIdAEikI= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= From c8d8a8aa507f2bf4c724a165591b8931f0d93c6e Mon Sep 17 00:00:00 2001 From: coddmeistr Date: Fri, 14 Feb 2025 14:14:50 +0300 Subject: [PATCH 3/5] update proto --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c890f7a10..d4372df01 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 github.com/rabbitmq/amqp091-go v1.9.0 github.com/rs/cors v1.10.1 - github.com/slntopp/nocloud-proto v0.0.0-20250214110012-4e949c866913 + github.com/slntopp/nocloud-proto v0.0.0-20250214111403-7e86f336aa60 github.com/spf13/viper v1.18.2 github.com/stoewer/go-strcase v1.3.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 7a178930f..c55229e48 100644 --- a/go.sum +++ b/go.sum @@ -118,8 +118,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/slntopp/nocloud-proto v0.0.0-20250214110012-4e949c866913 h1:ZcYCaXe5XaJc03H75DxJFNK45gDQfdVlB/ZJsxRS6Gw= -github.com/slntopp/nocloud-proto v0.0.0-20250214110012-4e949c866913/go.mod h1:qPbslPB2J9Q7qm6H9Jaqf/Ysf61YlPL0DUFhIdAEikI= +github.com/slntopp/nocloud-proto v0.0.0-20250214111403-7e86f336aa60 h1:1kLiPf43Xda+QSluJC/W2gD+fm/qbz2vPPQNVFjRegM= +github.com/slntopp/nocloud-proto v0.0.0-20250214111403-7e86f336aa60/go.mod h1:qPbslPB2J9Q7qm6H9Jaqf/Ysf61YlPL0DUFhIdAEikI= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= From e3a1e1cf90c3b1cd488211796e90dfe58217376a Mon Sep 17 00:00:00 2001 From: coddmeistr Date: Fri, 14 Feb 2025 14:28:03 +0300 Subject: [PATCH 4/5] send addon's ansible event --- pkg/graph/instances.go | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pkg/graph/instances.go b/pkg/graph/instances.go index 4cc940e5e..44cd84cf5 100644 --- a/pkg/graph/instances.go +++ b/pkg/graph/instances.go @@ -597,6 +597,24 @@ func (ctrl *instancesController) Create(ctx context.Context, group driver.Docume if err = ctrl.ansPs.Publish("hooks", services_registry.Topic("ansible_hooks"), &c); err != nil { log.Error("Failed to publish ansible hook", zap.Error(err)) } + for _, a := range i.GetAddons() { + addon, err := ctrl.addons.Get(ctx, a) + if err != nil { + log.Error("Failed to get instance addon", zap.Error(err), zap.String("addon", a)) + continue + } + if addon.Action != nil && addon.Action.GetPlaybook() != "" { + c := pb.Context{ + Instance: i.GetUuid(), + Sp: sp, + Event: "START", + Addon: &a, + } + if err = ctrl.ansPs.Publish("hooks", services_registry.Topic("ansible_hooks"), &c); err != nil { + log.Error("Failed to publish ansible hook addon event", zap.Error(err)) + } + } + } } e := epb.Event{ Uuid: i.GetUuid(), @@ -785,6 +803,24 @@ func (ctrl *instancesController) Update(ctx context.Context, _ string, inst, old if err = ctrl.ansPs.Publish("hooks", services_registry.Topic("ansible_hooks"), &c); err != nil { log.Error("Failed to publish ansible hook", zap.Error(err)) } + for _, a := range inst.GetAddons() { + addon, err := ctrl.addons.Get(ctx, a) + if err != nil { + log.Error("Failed to get instance addon", zap.Error(err), zap.String("addon", a)) + continue + } + if addon.Action != nil && addon.Action.GetPlaybook() != "" { + c := pb.Context{ + Instance: inst.GetUuid(), + Sp: sp, + Event: "START", + Addon: &a, + } + if err = ctrl.ansPs.Publish("hooks", services_registry.Topic("ansible_hooks"), &c); err != nil { + log.Error("Failed to publish ansible hook addon event", zap.Error(err)) + } + } + } } c := pb.Context{ Instance: uuid, From 6ec87d0b7c0c8b3541286146d12d5362e9e194fa Mon Sep 17 00:00:00 2001 From: coddmeistr Date: Wed, 19 Feb 2025 23:33:18 +0300 Subject: [PATCH 5/5] format date uses - --- pkg/billing/cron_send_services_data.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/billing/cron_send_services_data.go b/pkg/billing/cron_send_services_data.go index 70eb04534..7983c9051 100644 --- a/pkg/billing/cron_send_services_data.go +++ b/pkg/billing/cron_send_services_data.go @@ -455,7 +455,7 @@ func formatDate(date string, slashes bool, yearFirst bool, trimTime bool) string date = date[:10] } if slashes { - date = strings.Replace(date, "-", "/", -1) + date = strings.Replace(date, "-", "-", -1) } if yearFirst { date = date[6:] + string(date[5]) + string(date[3]) + string(date[4]) + string(date[2]) + string(date[0]) + string(date[1])