Merge pull request #143 from gabriel-samfira/move-code-to-external-pa…

…ckage

Move code to external package

apiserver/controllers/controllers.go

@@ -21,13 +21,13 @@ import (
 	"net/http"
 	"strings"
 
+	gErrors "github.com/cloudbase/garm-provider-common/errors"
+	"github.com/cloudbase/garm-provider-common/util"
 	"github.com/cloudbase/garm/apiserver/params"
 	"github.com/cloudbase/garm/auth"
-	gErrors "github.com/cloudbase/garm/errors"
 	"github.com/cloudbase/garm/metrics"
 	runnerParams "github.com/cloudbase/garm/params"
 	"github.com/cloudbase/garm/runner"
-	"github.com/cloudbase/garm/util"
 	wsWriter "github.com/cloudbase/garm/websocket"
 
 	"github.com/gorilla/websocket"

apiserver/controllers/enterprises.go

@@ -19,8 +19,8 @@ import (
 	"log"
 	"net/http"
 
+	gErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/apiserver/params"
-	gErrors "github.com/cloudbase/garm/errors"
 	runnerParams "github.com/cloudbase/garm/params"
 
 	"github.com/gorilla/mux"

apiserver/controllers/instances.go

@@ -19,8 +19,8 @@ import (
 	"log"
 	"net/http"
 
+	gErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/apiserver/params"
-	gErrors "github.com/cloudbase/garm/errors"
 	runnerParams "github.com/cloudbase/garm/params"
 
 	"github.com/gorilla/mux"

apiserver/controllers/organizations.go

@@ -19,8 +19,8 @@ import (
 	"log"
 	"net/http"
 
+	gErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/apiserver/params"
-	gErrors "github.com/cloudbase/garm/errors"
 	runnerParams "github.com/cloudbase/garm/params"
 
 	"github.com/gorilla/mux"

apiserver/controllers/pools.go

@@ -19,8 +19,8 @@ import (
 	"log"
 	"net/http"
 
+	gErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/apiserver/params"
-	gErrors "github.com/cloudbase/garm/errors"
 	runnerParams "github.com/cloudbase/garm/params"
 
 	"github.com/gorilla/mux"

apiserver/controllers/repositories.go

@@ -19,8 +19,8 @@ import (
 	"log"
 	"net/http"
 
+	gErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/apiserver/params"
-	gErrors "github.com/cloudbase/garm/errors"
 	runnerParams "github.com/cloudbase/garm/params"
 
 	"github.com/gorilla/mux"

apiserver/routers/routers.go

@@ -54,9 +54,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
+	"github.com/cloudbase/garm-provider-common/util"
 	"github.com/cloudbase/garm/apiserver/controllers"
 	"github.com/cloudbase/garm/auth"
-	"github.com/cloudbase/garm/util"
 )
 
 func WithMetricsRouter(parentRouter *mux.Router, disableAuth bool, metricsMiddlerware auth.Middleware) *mux.Router {

apiserver/swagger.yaml

@@ -337,13 +337,13 @@ paths:
                   name: enterpriseID
                   required: true
                   type: string
-                - description: Parameters used to update the enterprise.
+                - description: Parameters used when updating the enterprise.
                   in: body
                   name: Body
                   required: true
                   schema:
                     $ref: '#/definitions/UpdateEntityParams'
-                    description: Parameters used to update the enterprise.
+                    description: Parameters used when updating the enterprise.
                     type: object
             responses:
                 "200":
@@ -354,7 +354,7 @@ paths:
                     description: APIErrorResponse
                     schema:
                         $ref: '#/definitions/APIErrorResponse'
-            summary: Update an enterprise with the given parameters.
+            summary: Update enterprise with the given parameters.
             tags:
                 - enterprises
     /enterprises/{enterpriseID}/instances:

auth/auth.go

@@ -18,11 +18,11 @@ import (
 	"context"
 	"time"
 
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
+	"github.com/cloudbase/garm-provider-common/util"
 	"github.com/cloudbase/garm/config"
 	"github.com/cloudbase/garm/database/common"
-	runnerErrors "github.com/cloudbase/garm/errors"
 	"github.com/cloudbase/garm/params"
-	"github.com/cloudbase/garm/util"
 
 	"github.com/golang-jwt/jwt"
 	"github.com/nbutton23/zxcvbn-go"

auth/context.go

@@ -18,7 +18,6 @@ import (
 	"context"
 
 	"github.com/cloudbase/garm/params"
-	"github.com/cloudbase/garm/runner/providers/common"
 )
 
 type contextFlags string
@@ -65,16 +64,16 @@ func InstanceTokenFetched(ctx context.Context) bool {
 	return elem.(bool)
 }
 
-func SetInstanceRunnerStatus(ctx context.Context, val common.RunnerStatus) context.Context {
+func SetInstanceRunnerStatus(ctx context.Context, val params.RunnerStatus) context.Context {
 	return context.WithValue(ctx, instanceRunnerStatus, val)
 }
 
-func InstanceRunnerStatus(ctx context.Context) common.RunnerStatus {
+func InstanceRunnerStatus(ctx context.Context) params.RunnerStatus {
 	elem := ctx.Value(instanceRunnerStatus)
 	if elem == nil {
-		return common.RunnerPending
+		return params.RunnerPending
 	}
-	return elem.(common.RunnerStatus)
+	return elem.(params.RunnerStatus)
 }
 
 func SetInstanceName(ctx context.Context, val string) context.Context {

auth/instance_middleware.go

@@ -21,12 +21,11 @@ import (
 	"strings"
 	"time"
 
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/config"
 	dbCommon "github.com/cloudbase/garm/database/common"
-	runnerErrors "github.com/cloudbase/garm/errors"
 	"github.com/cloudbase/garm/params"
 	"github.com/cloudbase/garm/runner/common"
-	providerCommon "github.com/cloudbase/garm/runner/providers/common"
 
 	"github.com/golang-jwt/jwt"
 	"github.com/pkg/errors"
@@ -149,7 +148,7 @@ func (amw *instanceMiddleware) Middleware(next http.Handler) http.Handler {
 		}
 
 		runnerStatus := InstanceRunnerStatus(ctx)
-		if runnerStatus != providerCommon.RunnerInstalling && runnerStatus != providerCommon.RunnerPending {
+		if runnerStatus != params.RunnerInstalling && runnerStatus != params.RunnerPending {
 			// Instances that have finished installing can no longer authenticate to the API
 			invalidAuthResponse(w)
 			return

auth/jwt.go

@@ -22,10 +22,10 @@ import (
 	"net/http"
 	"strings"
 
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
 	apiParams "github.com/cloudbase/garm/apiserver/params"
 	"github.com/cloudbase/garm/config"
 	dbCommon "github.com/cloudbase/garm/database/common"
-	runnerErrors "github.com/cloudbase/garm/errors"
 
 	"github.com/golang-jwt/jwt"
 )

cmd/garm-cli/cmd/log.go

@@ -10,8 +10,8 @@ import (
 	"os/signal"
 	"time"
 
+	"github.com/cloudbase/garm-provider-common/util"
 	apiParams "github.com/cloudbase/garm/apiserver/params"
-	"github.com/cloudbase/garm/util"
 
 	"github.com/gorilla/websocket"
 	"github.com/spf13/cobra"

cmd/garm-cli/cmd/pool.go

@@ -25,6 +25,8 @@ import (
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+
+	commonParams "github.com/cloudbase/garm-provider-common/params"
 )
 
 var (
@@ -192,8 +194,8 @@ var poolAddCmd = &cobra.Command{
 			MinIdleRunners:         poolMinIdleRunners,
 			Image:                  poolImage,
 			Flavor:                 poolFlavor,
-			OSType:                 params.OSType(poolOSType),
-			OSArch:                 params.OSArch(poolOSArch),
+			OSType:                 commonParams.OSType(poolOSType),
+			OSArch:                 commonParams.OSArch(poolOSArch),
 			Tags:                   tags,
 			Enabled:                poolEnabled,
 			RunnerBootstrapTimeout: poolRunnerBootstrapTimeout,
@@ -280,11 +282,11 @@ explicitly remove them using the runner delete command.
 		}
 
 		if cmd.Flags().Changed("os-type") {
-			poolUpdateParams.OSType = params.OSType(poolOSType)
+			poolUpdateParams.OSType = commonParams.OSType(poolOSType)
 		}
 
 		if cmd.Flags().Changed("os-arch") {
-			poolUpdateParams.OSArch = params.OSArch(poolOSArch)
+			poolUpdateParams.OSArch = commonParams.OSArch(poolOSArch)
 		}
 
 		if cmd.Flags().Changed("max-runners") {

cmd/garm-cli/config/config.go

@@ -23,7 +23,7 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
 
-	runnerErrors "github.com/cloudbase/garm/errors"
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
 )
 
 const (

cmd/garm/main.go

@@ -27,6 +27,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/cloudbase/garm-provider-common/util"
 	"github.com/cloudbase/garm/apiserver/controllers"
 	"github.com/cloudbase/garm/apiserver/routers"
 	"github.com/cloudbase/garm/auth"
@@ -35,7 +36,6 @@ import (
 	"github.com/cloudbase/garm/database/common"
 	"github.com/cloudbase/garm/metrics"
 	"github.com/cloudbase/garm/runner"
-	"github.com/cloudbase/garm/util"
 	"github.com/cloudbase/garm/util/appdefaults"
 	"github.com/cloudbase/garm/websocket"
 	lumberjack "gopkg.in/natefinch/lumberjack.v2"
@@ -52,6 +52,11 @@ var (
 
 var Version string
 
+var signals = []os.Signal{
+	os.Interrupt,
+	syscall.SIGTERM,
+}
+
 func maybeInitController(db common.Store) error {
 	if _, err := db.ControllerInfo(); err == nil {
 		return nil
@@ -79,7 +84,7 @@ func main() {
 		log.Fatalf("Fetching config: %+v", err)
 	}
 
-	logWriter, err := util.GetLoggingWriter(cfg)
+	logWriter, err := util.GetLoggingWriter(cfg.Default.LogFile)
 	if err != nil {
 		log.Fatalf("fetching log writer: %+v", err)
 	}

config/external.go

@@ -19,7 +19,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/cloudbase/garm/util/exec"
+	"github.com/cloudbase/garm-provider-common/util/exec"
 
 	"github.com/pkg/errors"
 )

database/sql/controller.go

@@ -15,7 +15,7 @@
 package sql
 
 import (
-	runnerErrors "github.com/cloudbase/garm/errors"
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/params"
 
 	"github.com/google/uuid"

database/sql/controller_test.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"testing"
 
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
 	dbCommon "github.com/cloudbase/garm/database/common"
-	runnerErrors "github.com/cloudbase/garm/errors"
 	garmTesting "github.com/cloudbase/garm/internal/testing"
 
 	"github.com/stretchr/testify/suite"

database/sql/enterprise.go

@@ -3,9 +3,9 @@ package sql
 import (
 	"context"
 
-	runnerErrors "github.com/cloudbase/garm/errors"
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
+	"github.com/cloudbase/garm-provider-common/util"
 	"github.com/cloudbase/garm/params"
-	"github.com/cloudbase/garm/util"
 
 	"github.com/google/uuid"
 	"github.com/pkg/errors"

database/sql/enterprise_test.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/cloudbase/garm/params"
 
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
 	dbCommon "github.com/cloudbase/garm/database/common"
-	runnerErrors "github.com/cloudbase/garm/errors"
 	garmTesting "github.com/cloudbase/garm/internal/testing"
 
 	"github.com/stretchr/testify/suite"

database/sql/instances.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"encoding/json"
 
-	runnerErrors "github.com/cloudbase/garm/errors"
+	runnerErrors "github.com/cloudbase/garm-provider-common/errors"
 	"github.com/cloudbase/garm/params"
 
 	"github.com/google/uuid"