From 329f616f593f00f484fc439d648b38d8e6acc6d3 Mon Sep 17 00:00:00 2001 From: Joel Rebello Date: Mon, 29 Jul 2024 14:44:46 +0200 Subject: [PATCH 1/2] s/package controller/package ctrl/g --- config.go | 2 +- controller.go | 2 +- controller_test.go | 2 +- errors.go | 2 +- interface.go | 2 +- liveness.go | 2 +- liveness_test.go | 2 +- metrics.go | 2 +- mock_conditionStatusQueryor.go | 2 +- mock_eventStatusAcknowleger.go | 2 +- mock_livenessCheckin.go | 2 +- mock_publisher.go | 2 +- mock_taskHandler.go | 2 +- publisher.go | 2 +- status.go | 2 +- status_test.go | 2 +- task.go | 2 +- task_test.go | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config.go b/config.go index a184f53..d4e4ae2 100644 --- a/config.go +++ b/config.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "fmt" diff --git a/controller.go b/controller.go index 73733cf..9a5ad63 100644 --- a/controller.go +++ b/controller.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/controller_test.go b/controller_test.go index 76961b4..9e5751a 100644 --- a/controller_test.go +++ b/controller_test.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/errors.go b/errors.go index e98f48f..65efe6f 100644 --- a/errors.go +++ b/errors.go @@ -1,4 +1,4 @@ -package controller +package ctrl import "fmt" diff --git a/interface.go b/interface.go index 76be5df..333a02c 100644 --- a/interface.go +++ b/interface.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/liveness.go b/liveness.go index aa28000..3acbc4c 100644 --- a/liveness.go +++ b/liveness.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/liveness_test.go b/liveness_test.go index 639b058..5c52aeb 100644 --- a/liveness_test.go +++ b/liveness_test.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/metrics.go b/metrics.go index d7b507b..81ac143 100644 --- a/metrics.go +++ b/metrics.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "strconv" diff --git a/mock_conditionStatusQueryor.go b/mock_conditionStatusQueryor.go index c4996d0..5016c76 100644 --- a/mock_conditionStatusQueryor.go +++ b/mock_conditionStatusQueryor.go @@ -1,6 +1,6 @@ // Code generated by mockery v2.42.1. DO NOT EDIT. -package controller +package ctrl import mock "github.com/stretchr/testify/mock" diff --git a/mock_eventStatusAcknowleger.go b/mock_eventStatusAcknowleger.go index e884449..5e165fe 100644 --- a/mock_eventStatusAcknowleger.go +++ b/mock_eventStatusAcknowleger.go @@ -1,6 +1,6 @@ // Code generated by mockery v2.42.1. DO NOT EDIT. -package controller +package ctrl import mock "github.com/stretchr/testify/mock" diff --git a/mock_livenessCheckin.go b/mock_livenessCheckin.go index 42fa3da..168e7da 100644 --- a/mock_livenessCheckin.go +++ b/mock_livenessCheckin.go @@ -1,6 +1,6 @@ // Code generated by mockery v2.42.1. DO NOT EDIT. -package controller +package ctrl import ( context "context" diff --git a/mock_publisher.go b/mock_publisher.go index 3c7df34..077a4e3 100644 --- a/mock_publisher.go +++ b/mock_publisher.go @@ -1,6 +1,6 @@ // Code generated by mockery v2.42.1. DO NOT EDIT. -package controller +package ctrl import ( context "context" diff --git a/mock_taskHandler.go b/mock_taskHandler.go index c1bdb98..5bc721e 100644 --- a/mock_taskHandler.go +++ b/mock_taskHandler.go @@ -1,6 +1,6 @@ // Code generated by mockery v2.42.1. DO NOT EDIT. -package controller +package ctrl import ( context "context" diff --git a/publisher.go b/publisher.go index 61419aa..4c5b5f6 100644 --- a/publisher.go +++ b/publisher.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/status.go b/status.go index f24499c..6cc506d 100644 --- a/status.go +++ b/status.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/status_test.go b/status_test.go index 55c7ef8..17363c9 100644 --- a/status_test.go +++ b/status_test.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/task.go b/task.go index a5d31b6..316480e 100644 --- a/task.go +++ b/task.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" diff --git a/task_test.go b/task_test.go index 9b0047a..c35f226 100644 --- a/task_test.go +++ b/task_test.go @@ -1,4 +1,4 @@ -package controller +package ctrl import ( "context" From c2ba62146af4c93286878e82fb316d14e065e4ca Mon Sep 17 00:00:00 2001 From: Joel Rebello Date: Mon, 29 Jul 2024 14:46:45 +0200 Subject: [PATCH 2/2] go: bump rivets --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7236838..5893eac 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/google/uuid v1.6.0 github.com/metal-toolbox/conditionorc v1.0.9-0.20240716090543-6e7e9300b375 - github.com/metal-toolbox/rivets v1.0.10-0.20240704084152-59b13ed066ca + github.com/metal-toolbox/rivets v1.2.0 github.com/nats-io/nats-server/v2 v2.10.12 github.com/nats-io/nats.go v1.36.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index b061512..6c00510 100644 --- a/go.sum +++ b/go.sum @@ -522,6 +522,8 @@ github.com/metal-toolbox/fleetdb v1.18.6 h1:VxTs4T2zKh9KbjPNo18Z/D6OmPqArPK2PNQ8 github.com/metal-toolbox/fleetdb v1.18.6/go.mod h1:QoNpDNVXxt7YqrxRIWkWp1hR3LJ2YXMnYavXwefOUnQ= github.com/metal-toolbox/rivets v1.0.10-0.20240704084152-59b13ed066ca h1:XWJc4/HBuNA9R7TxekZbGT0fpEa3f5Nxxx2SLOgits0= github.com/metal-toolbox/rivets v1.0.10-0.20240704084152-59b13ed066ca/go.mod h1:FZ47HrHgezYyY/H7z4Emw9JaGxeFmBJCXGKqy5YW6ag= +github.com/metal-toolbox/rivets v1.2.0 h1:QhN3tWH7NqKDqwRDYylxukw0mNQ/FkyvBYkwS0CJULE= +github.com/metal-toolbox/rivets v1.2.0/go.mod h1:i78a1x0w2uNyMlvUgyO6ST552u9wV2Xa4+A73oA4WJY= github.com/microsoft/go-mssqldb v0.17.0/go.mod h1:OkoNGhGEs8EZqchVTtochlXruEhEOaO4S0d2sB5aeGQ= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=