From 02e0deec153722e871616b38748df46282e93623 Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Wed, 15 May 2019 09:38:27 +0200 Subject: [PATCH] service: move gateway/common to common Yes, I know that common and utils are bad package names... --- internal/services/{gateway => }/common/gitsource.go | 0 internal/services/{gateway => }/common/jwt.go | 0 internal/services/{gateway => }/common/run.go | 0 internal/services/{gateway => }/common/variables.go | 0 internal/services/{gateway => }/common/variables_test.go | 0 internal/services/gateway/action/action.go | 2 +- internal/services/gateway/action/auth.go | 2 +- internal/services/gateway/action/badge.go | 2 +- internal/services/gateway/action/run.go | 2 +- internal/services/gateway/action/user.go | 2 +- internal/services/gateway/action/variable.go | 2 +- internal/services/gateway/api/variable.go | 2 +- internal/services/gateway/gateway.go | 2 +- internal/services/gateway/handlers/auth.go | 2 +- internal/services/gateway/webhook.go | 2 +- internal/services/scheduler/scheduler.go | 2 +- 16 files changed, 11 insertions(+), 11 deletions(-) rename internal/services/{gateway => }/common/gitsource.go (100%) rename internal/services/{gateway => }/common/jwt.go (100%) rename internal/services/{gateway => }/common/run.go (100%) rename internal/services/{gateway => }/common/variables.go (100%) rename internal/services/{gateway => }/common/variables_test.go (100%) diff --git a/internal/services/gateway/common/gitsource.go b/internal/services/common/gitsource.go similarity index 100% rename from internal/services/gateway/common/gitsource.go rename to internal/services/common/gitsource.go diff --git a/internal/services/gateway/common/jwt.go b/internal/services/common/jwt.go similarity index 100% rename from internal/services/gateway/common/jwt.go rename to internal/services/common/jwt.go diff --git a/internal/services/gateway/common/run.go b/internal/services/common/run.go similarity index 100% rename from internal/services/gateway/common/run.go rename to internal/services/common/run.go diff --git a/internal/services/gateway/common/variables.go b/internal/services/common/variables.go similarity index 100% rename from internal/services/gateway/common/variables.go rename to internal/services/common/variables.go diff --git a/internal/services/gateway/common/variables_test.go b/internal/services/common/variables_test.go similarity index 100% rename from internal/services/gateway/common/variables_test.go rename to internal/services/common/variables_test.go diff --git a/internal/services/gateway/action/action.go b/internal/services/gateway/action/action.go index 9967cb9..2a9650b 100644 --- a/internal/services/gateway/action/action.go +++ b/internal/services/gateway/action/action.go @@ -18,8 +18,8 @@ import ( "net/http" "github.com/pkg/errors" + "github.com/sorintlab/agola/internal/services/common" csapi "github.com/sorintlab/agola/internal/services/configstore/api" - "github.com/sorintlab/agola/internal/services/gateway/common" rsapi "github.com/sorintlab/agola/internal/services/runservice/api" "github.com/sorintlab/agola/internal/util" diff --git a/internal/services/gateway/action/auth.go b/internal/services/gateway/action/auth.go index 12419a3..bba025e 100644 --- a/internal/services/gateway/action/auth.go +++ b/internal/services/gateway/action/auth.go @@ -17,7 +17,7 @@ package action import ( "context" - "github.com/sorintlab/agola/internal/services/gateway/common" + "github.com/sorintlab/agola/internal/services/common" "github.com/sorintlab/agola/internal/services/types" "github.com/pkg/errors" diff --git a/internal/services/gateway/action/badge.go b/internal/services/gateway/action/badge.go index 3386b47..c28dfcf 100644 --- a/internal/services/gateway/action/badge.go +++ b/internal/services/gateway/action/badge.go @@ -19,7 +19,7 @@ import ( "net/url" "path" - "github.com/sorintlab/agola/internal/services/gateway/common" + "github.com/sorintlab/agola/internal/services/common" rstypes "github.com/sorintlab/agola/internal/services/runservice/types" ) diff --git a/internal/services/gateway/action/run.go b/internal/services/gateway/action/run.go index 116975c..9df5227 100644 --- a/internal/services/gateway/action/run.go +++ b/internal/services/gateway/action/run.go @@ -19,7 +19,7 @@ import ( "encoding/json" "net/http" - "github.com/sorintlab/agola/internal/services/gateway/common" + "github.com/sorintlab/agola/internal/services/common" rsapi "github.com/sorintlab/agola/internal/services/runservice/api" "github.com/sorintlab/agola/internal/util" diff --git a/internal/services/gateway/action/user.go b/internal/services/gateway/action/user.go index 658ea86..6879c2f 100644 --- a/internal/services/gateway/action/user.go +++ b/internal/services/gateway/action/user.go @@ -20,8 +20,8 @@ import ( "time" gitsource "github.com/sorintlab/agola/internal/gitsources" + "github.com/sorintlab/agola/internal/services/common" csapi "github.com/sorintlab/agola/internal/services/configstore/api" - "github.com/sorintlab/agola/internal/services/gateway/common" "github.com/sorintlab/agola/internal/services/types" "github.com/sorintlab/agola/internal/util" diff --git a/internal/services/gateway/action/variable.go b/internal/services/gateway/action/variable.go index 029d57b..5f4487e 100644 --- a/internal/services/gateway/action/variable.go +++ b/internal/services/gateway/action/variable.go @@ -19,8 +19,8 @@ import ( "net/http" "github.com/pkg/errors" + "github.com/sorintlab/agola/internal/services/common" csapi "github.com/sorintlab/agola/internal/services/configstore/api" - "github.com/sorintlab/agola/internal/services/gateway/common" "github.com/sorintlab/agola/internal/services/types" "github.com/sorintlab/agola/internal/util" ) diff --git a/internal/services/gateway/api/variable.go b/internal/services/gateway/api/variable.go index 81b2041..846a4ed 100644 --- a/internal/services/gateway/api/variable.go +++ b/internal/services/gateway/api/variable.go @@ -18,9 +18,9 @@ import ( "encoding/json" "net/http" + "github.com/sorintlab/agola/internal/services/common" csapi "github.com/sorintlab/agola/internal/services/configstore/api" "github.com/sorintlab/agola/internal/services/gateway/action" - "github.com/sorintlab/agola/internal/services/gateway/common" "github.com/sorintlab/agola/internal/services/types" "github.com/sorintlab/agola/internal/util" "go.uber.org/zap" diff --git a/internal/services/gateway/gateway.go b/internal/services/gateway/gateway.go index 74b8635..ca4e7f8 100644 --- a/internal/services/gateway/gateway.go +++ b/internal/services/gateway/gateway.go @@ -23,11 +23,11 @@ import ( scommon "github.com/sorintlab/agola/internal/common" slog "github.com/sorintlab/agola/internal/log" "github.com/sorintlab/agola/internal/objectstorage" + "github.com/sorintlab/agola/internal/services/common" "github.com/sorintlab/agola/internal/services/config" csapi "github.com/sorintlab/agola/internal/services/configstore/api" "github.com/sorintlab/agola/internal/services/gateway/action" "github.com/sorintlab/agola/internal/services/gateway/api" - "github.com/sorintlab/agola/internal/services/gateway/common" "github.com/sorintlab/agola/internal/services/gateway/handlers" rsapi "github.com/sorintlab/agola/internal/services/runservice/api" "github.com/sorintlab/agola/internal/util" diff --git a/internal/services/gateway/handlers/auth.go b/internal/services/gateway/handlers/auth.go index d40cec2..417f6ce 100644 --- a/internal/services/gateway/handlers/auth.go +++ b/internal/services/gateway/handlers/auth.go @@ -19,8 +19,8 @@ import ( "net/http" "strings" + "github.com/sorintlab/agola/internal/services/common" csapi "github.com/sorintlab/agola/internal/services/configstore/api" - "github.com/sorintlab/agola/internal/services/gateway/common" jwt "github.com/dgrijalva/jwt-go" jwtrequest "github.com/dgrijalva/jwt-go/request" diff --git a/internal/services/gateway/webhook.go b/internal/services/gateway/webhook.go index 6e392e5..dc2f5f3 100644 --- a/internal/services/gateway/webhook.go +++ b/internal/services/gateway/webhook.go @@ -24,9 +24,9 @@ import ( gitsource "github.com/sorintlab/agola/internal/gitsources" "github.com/sorintlab/agola/internal/gitsources/agolagit" "github.com/sorintlab/agola/internal/runconfig" + "github.com/sorintlab/agola/internal/services/common" csapi "github.com/sorintlab/agola/internal/services/configstore/api" "github.com/sorintlab/agola/internal/services/gateway/action" - "github.com/sorintlab/agola/internal/services/gateway/common" rsapi "github.com/sorintlab/agola/internal/services/runservice/api" rstypes "github.com/sorintlab/agola/internal/services/runservice/types" "github.com/sorintlab/agola/internal/services/types" diff --git a/internal/services/scheduler/scheduler.go b/internal/services/scheduler/scheduler.go index 9e1d17c..9a984e4 100644 --- a/internal/services/scheduler/scheduler.go +++ b/internal/services/scheduler/scheduler.go @@ -21,8 +21,8 @@ import ( "time" slog "github.com/sorintlab/agola/internal/log" + "github.com/sorintlab/agola/internal/services/common" "github.com/sorintlab/agola/internal/services/config" - "github.com/sorintlab/agola/internal/services/gateway/common" rsapi "github.com/sorintlab/agola/internal/services/runservice/api" "github.com/sorintlab/agola/internal/util"