diff --git a/Makefile b/Makefile index c856061f..6f7f5396 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ fmt: @$(GO) fmt $$(go list ./...) fmtcheck: - @gofmt -l -s $$(go list ./... | sed 's|garm/||g') | grep ".*\.go"; if [ "$$?" -eq 0 ]; then echo "gofmt check failed; please tun gofmt -w -s"; exit 1;fi + @gofmt -l -s $$(go list ./... | sed 's|github.com/cloudbase/garm/||g') | grep ".*\.go"; if [ "$$?" -eq 0 ]; then echo "gofmt check failed; please tun gofmt -w -s"; exit 1;fi verify-vendor: ## verify if all the go.mod/go.sum files are up-to-date $(eval TMPDIR := $(shell mktemp -d)) diff --git a/apiserver/controllers/controllers.go b/apiserver/controllers/controllers.go index ad9e4ba0..51d497c2 100644 --- a/apiserver/controllers/controllers.go +++ b/apiserver/controllers/controllers.go @@ -21,14 +21,14 @@ import ( "net/http" "strings" - "garm/apiserver/params" - "garm/auth" - gErrors "garm/errors" - "garm/metrics" - runnerParams "garm/params" - "garm/runner" - "garm/util" - wsWriter "garm/websocket" + "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" "github.com/pkg/errors" diff --git a/apiserver/controllers/enterprises.go b/apiserver/controllers/enterprises.go index 704e1516..8614384d 100644 --- a/apiserver/controllers/enterprises.go +++ b/apiserver/controllers/enterprises.go @@ -19,9 +19,9 @@ import ( "log" "net/http" - "garm/apiserver/params" - gErrors "garm/errors" - runnerParams "garm/params" + "github.com/cloudbase/garm/apiserver/params" + gErrors "github.com/cloudbase/garm/errors" + runnerParams "github.com/cloudbase/garm/params" "github.com/gorilla/mux" ) diff --git a/apiserver/controllers/instances.go b/apiserver/controllers/instances.go index f62d0d59..e563c8eb 100644 --- a/apiserver/controllers/instances.go +++ b/apiserver/controllers/instances.go @@ -19,9 +19,9 @@ import ( "log" "net/http" - "garm/apiserver/params" - gErrors "garm/errors" - runnerParams "garm/params" + "github.com/cloudbase/garm/apiserver/params" + gErrors "github.com/cloudbase/garm/errors" + runnerParams "github.com/cloudbase/garm/params" "github.com/gorilla/mux" ) diff --git a/apiserver/controllers/organizations.go b/apiserver/controllers/organizations.go index 9bc7aa98..068549a0 100644 --- a/apiserver/controllers/organizations.go +++ b/apiserver/controllers/organizations.go @@ -19,9 +19,9 @@ import ( "log" "net/http" - "garm/apiserver/params" - gErrors "garm/errors" - runnerParams "garm/params" + "github.com/cloudbase/garm/apiserver/params" + gErrors "github.com/cloudbase/garm/errors" + runnerParams "github.com/cloudbase/garm/params" "github.com/gorilla/mux" ) diff --git a/apiserver/controllers/pools.go b/apiserver/controllers/pools.go index 4d6c3f88..b4e5ffa2 100644 --- a/apiserver/controllers/pools.go +++ b/apiserver/controllers/pools.go @@ -19,9 +19,9 @@ import ( "log" "net/http" - "garm/apiserver/params" - gErrors "garm/errors" - runnerParams "garm/params" + "github.com/cloudbase/garm/apiserver/params" + gErrors "github.com/cloudbase/garm/errors" + runnerParams "github.com/cloudbase/garm/params" "github.com/gorilla/mux" ) diff --git a/apiserver/controllers/repositories.go b/apiserver/controllers/repositories.go index 2357497a..da5200e3 100644 --- a/apiserver/controllers/repositories.go +++ b/apiserver/controllers/repositories.go @@ -19,9 +19,9 @@ import ( "log" "net/http" - "garm/apiserver/params" - gErrors "garm/errors" - runnerParams "garm/params" + "github.com/cloudbase/garm/apiserver/params" + gErrors "github.com/cloudbase/garm/errors" + runnerParams "github.com/cloudbase/garm/params" "github.com/gorilla/mux" ) diff --git a/apiserver/routers/routers.go b/apiserver/routers/routers.go index 6111028d..bac3f98d 100644 --- a/apiserver/routers/routers.go +++ b/apiserver/routers/routers.go @@ -21,9 +21,9 @@ import ( "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus/promhttp" - "garm/apiserver/controllers" - "garm/auth" - "garm/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 { diff --git a/auth/auth.go b/auth/auth.go index 1a84e5a7..a442da70 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -16,13 +16,14 @@ package auth import ( "context" - "garm/config" - "garm/database/common" - runnerErrors "garm/errors" - "garm/params" - "garm/util" "time" + "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" "github.com/pkg/errors" diff --git a/auth/context.go b/auth/context.go index fe4d2d65..694fe26e 100644 --- a/auth/context.go +++ b/auth/context.go @@ -17,8 +17,8 @@ package auth import ( "context" - "garm/params" - "garm/runner/providers/common" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/providers/common" ) type contextFlags string diff --git a/auth/init_required.go b/auth/init_required.go index b2e9b797..6265649e 100644 --- a/auth/init_required.go +++ b/auth/init_required.go @@ -19,8 +19,8 @@ import ( "log" "net/http" - "garm/apiserver/params" - "garm/database/common" + "github.com/cloudbase/garm/apiserver/params" + "github.com/cloudbase/garm/database/common" ) // NewjwtMiddleware returns a populated jwtMiddleware diff --git a/auth/instance_middleware.go b/auth/instance_middleware.go index b8afd22a..3af99d6f 100644 --- a/auth/instance_middleware.go +++ b/auth/instance_middleware.go @@ -21,12 +21,12 @@ import ( "strings" "time" - "garm/config" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" - providerCommon "garm/runner/providers/common" + "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" diff --git a/auth/jwt.go b/auth/jwt.go index 3d757896..14dd857d 100644 --- a/auth/jwt.go +++ b/auth/jwt.go @@ -22,10 +22,10 @@ import ( "net/http" "strings" - apiParams "garm/apiserver/params" - "garm/config" - dbCommon "garm/database/common" - runnerErrors "garm/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" ) diff --git a/auth/metrics.go b/auth/metrics.go index 9cf20bb9..11c25072 100644 --- a/auth/metrics.go +++ b/auth/metrics.go @@ -3,10 +3,11 @@ package auth import ( "context" "fmt" - "garm/config" "net/http" "strings" + "github.com/cloudbase/garm/config" + "github.com/golang-jwt/jwt" ) diff --git a/cloudconfig/cloudconfig.go b/cloudconfig/cloudconfig.go index bf0d3d58..6bb9cabc 100644 --- a/cloudconfig/cloudconfig.go +++ b/cloudconfig/cloudconfig.go @@ -18,10 +18,11 @@ import ( "crypto/x509" "encoding/base64" "fmt" - "garm/config" "strings" "sync" + "github.com/cloudbase/garm/config" + "github.com/pkg/errors" "gopkg.in/yaml.v3" ) diff --git a/cmd/garm-cli/client/client.go b/cmd/garm-cli/client/client.go index a78c8342..7058e277 100644 --- a/cmd/garm-cli/client/client.go +++ b/cmd/garm-cli/client/client.go @@ -18,9 +18,9 @@ import ( "encoding/json" "fmt" - apiParams "garm/apiserver/params" - "garm/cmd/garm-cli/config" - "garm/params" + apiParams "github.com/cloudbase/garm/apiserver/params" + "github.com/cloudbase/garm/cmd/garm-cli/config" + "github.com/cloudbase/garm/params" "github.com/go-resty/resty/v2" "github.com/pkg/errors" diff --git a/cmd/garm-cli/client/enterprises.go b/cmd/garm-cli/client/enterprises.go index 674333f8..c3700a2c 100644 --- a/cmd/garm-cli/client/enterprises.go +++ b/cmd/garm-cli/client/enterprises.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" - "garm/params" + "github.com/cloudbase/garm/params" ) func (c *Client) ListEnterprises() ([]params.Enterprise, error) { diff --git a/cmd/garm-cli/client/organizations.go b/cmd/garm-cli/client/organizations.go index 09e679fa..deff04c9 100644 --- a/cmd/garm-cli/client/organizations.go +++ b/cmd/garm-cli/client/organizations.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" - "garm/params" + "github.com/cloudbase/garm/params" ) func (c *Client) ListOrganizations() ([]params.Organization, error) { diff --git a/cmd/garm-cli/client/repositories.go b/cmd/garm-cli/client/repositories.go index 18571a8f..5759c218 100644 --- a/cmd/garm-cli/client/repositories.go +++ b/cmd/garm-cli/client/repositories.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" - "garm/params" + "github.com/cloudbase/garm/params" ) func (c *Client) ListRepositories() ([]params.Repository, error) { diff --git a/cmd/garm-cli/cmd/credentials.go b/cmd/garm-cli/cmd/credentials.go index 447d2957..6559eeb6 100644 --- a/cmd/garm-cli/cmd/credentials.go +++ b/cmd/garm-cli/cmd/credentials.go @@ -16,7 +16,8 @@ package cmd import ( "fmt" - "garm/params" + + "github.com/cloudbase/garm/params" "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" diff --git a/cmd/garm-cli/cmd/enterprise.go b/cmd/garm-cli/cmd/enterprise.go index 362885d5..85fb10f8 100644 --- a/cmd/garm-cli/cmd/enterprise.go +++ b/cmd/garm-cli/cmd/enterprise.go @@ -16,7 +16,8 @@ package cmd import ( "fmt" - "garm/params" + + "github.com/cloudbase/garm/params" "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" diff --git a/cmd/garm-cli/cmd/init.go b/cmd/garm-cli/cmd/init.go index b96b106a..3c879c3f 100644 --- a/cmd/garm-cli/cmd/init.go +++ b/cmd/garm-cli/cmd/init.go @@ -18,9 +18,9 @@ import ( "fmt" "strings" - "garm/cmd/garm-cli/common" - "garm/cmd/garm-cli/config" - "garm/params" + "github.com/cloudbase/garm/cmd/garm-cli/common" + "github.com/cloudbase/garm/cmd/garm-cli/config" + "github.com/cloudbase/garm/params" "github.com/jedib0t/go-pretty/v6/table" "github.com/pkg/errors" diff --git a/cmd/garm-cli/cmd/log.go b/cmd/garm-cli/cmd/log.go index 44b96428..4b7e031c 100644 --- a/cmd/garm-cli/cmd/log.go +++ b/cmd/garm-cli/cmd/log.go @@ -10,8 +10,8 @@ import ( "os/signal" "time" - apiParams "garm/apiserver/params" - "garm/util" + apiParams "github.com/cloudbase/garm/apiserver/params" + "github.com/cloudbase/garm/util" "github.com/gorilla/websocket" "github.com/spf13/cobra" diff --git a/cmd/garm-cli/cmd/organization.go b/cmd/garm-cli/cmd/organization.go index 7c7d0ba6..c9275b46 100644 --- a/cmd/garm-cli/cmd/organization.go +++ b/cmd/garm-cli/cmd/organization.go @@ -16,7 +16,8 @@ package cmd import ( "fmt" - "garm/params" + + "github.com/cloudbase/garm/params" "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" diff --git a/cmd/garm-cli/cmd/pool.go b/cmd/garm-cli/cmd/pool.go index d89d7df1..d6865dcf 100644 --- a/cmd/garm-cli/cmd/pool.go +++ b/cmd/garm-cli/cmd/pool.go @@ -17,11 +17,12 @@ package cmd import ( "encoding/json" "fmt" - "garm/config" - "garm/params" "os" "strings" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/params" + "github.com/jedib0t/go-pretty/v6/table" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/garm-cli/cmd/profile.go b/cmd/garm-cli/cmd/profile.go index 01cc113e..29c74323 100644 --- a/cmd/garm-cli/cmd/profile.go +++ b/cmd/garm-cli/cmd/profile.go @@ -16,11 +16,12 @@ package cmd import ( "fmt" - "garm/cmd/garm-cli/common" - "garm/cmd/garm-cli/config" - "garm/params" "strings" + "github.com/cloudbase/garm/cmd/garm-cli/common" + "github.com/cloudbase/garm/cmd/garm-cli/config" + "github.com/cloudbase/garm/params" + "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" ) diff --git a/cmd/garm-cli/cmd/provider.go b/cmd/garm-cli/cmd/provider.go index 95404364..40840abf 100644 --- a/cmd/garm-cli/cmd/provider.go +++ b/cmd/garm-cli/cmd/provider.go @@ -16,7 +16,8 @@ package cmd import ( "fmt" - "garm/params" + + "github.com/cloudbase/garm/params" "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" diff --git a/cmd/garm-cli/cmd/repository.go b/cmd/garm-cli/cmd/repository.go index bdb208ef..29ed8eb8 100644 --- a/cmd/garm-cli/cmd/repository.go +++ b/cmd/garm-cli/cmd/repository.go @@ -16,7 +16,8 @@ package cmd import ( "fmt" - "garm/params" + + "github.com/cloudbase/garm/params" "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" diff --git a/cmd/garm-cli/cmd/root.go b/cmd/garm-cli/cmd/root.go index a3fb0197..716b8038 100644 --- a/cmd/garm-cli/cmd/root.go +++ b/cmd/garm-cli/cmd/root.go @@ -16,10 +16,11 @@ package cmd import ( "fmt" - "garm/cmd/garm-cli/client" - "garm/cmd/garm-cli/config" "os" + "github.com/cloudbase/garm/cmd/garm-cli/client" + "github.com/cloudbase/garm/cmd/garm-cli/config" + "github.com/spf13/cobra" ) diff --git a/cmd/garm-cli/cmd/runner.go b/cmd/garm-cli/cmd/runner.go index 7b6265cd..7255526e 100644 --- a/cmd/garm-cli/cmd/runner.go +++ b/cmd/garm-cli/cmd/runner.go @@ -16,9 +16,10 @@ package cmd import ( "fmt" - "garm/params" "os" + "github.com/cloudbase/garm/params" + "github.com/jedib0t/go-pretty/v6/table" "github.com/spf13/cobra" ) diff --git a/cmd/garm-cli/config/config.go b/cmd/garm-cli/config/config.go index ba6b3be1..133b38da 100644 --- a/cmd/garm-cli/config/config.go +++ b/cmd/garm-cli/config/config.go @@ -23,7 +23,7 @@ import ( "github.com/BurntSushi/toml" "github.com/pkg/errors" - runnerErrors "garm/errors" + runnerErrors "github.com/cloudbase/garm/errors" ) const ( diff --git a/cmd/garm-cli/main.go b/cmd/garm-cli/main.go index 3a9683be..32f5ab90 100644 --- a/cmd/garm-cli/main.go +++ b/cmd/garm-cli/main.go @@ -14,7 +14,7 @@ package main -import "garm/cmd/garm-cli/cmd" +import "github.com/cloudbase/garm/cmd/garm-cli/cmd" func main() { cmd.Execute() diff --git a/cmd/garm/main.go b/cmd/garm/main.go index 37e1fb2f..998fc2db 100644 --- a/cmd/garm/main.go +++ b/cmd/garm/main.go @@ -26,16 +26,16 @@ import ( "os/signal" "time" - "garm/apiserver/controllers" - "garm/apiserver/routers" - "garm/auth" - "garm/config" - "garm/database" - "garm/database/common" - "garm/metrics" - "garm/runner" - "garm/util" - "garm/websocket" + "github.com/cloudbase/garm/apiserver/controllers" + "github.com/cloudbase/garm/apiserver/routers" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/database" + "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/websocket" "github.com/gorilla/handlers" "github.com/gorilla/mux" diff --git a/config/external.go b/config/external.go index fcfe4190..c6195dcb 100644 --- a/config/external.go +++ b/config/external.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "garm/util/exec" + "github.com/cloudbase/garm/util/exec" "github.com/pkg/errors" ) diff --git a/database/common/common.go b/database/common/common.go index 1b4153d4..897e9445 100644 --- a/database/common/common.go +++ b/database/common/common.go @@ -16,7 +16,8 @@ package common import ( "context" - "garm/params" + + "github.com/cloudbase/garm/params" ) type RepoStore interface { diff --git a/database/common/mocks/Store.go b/database/common/mocks/Store.go index 31ed2617..71a2d038 100644 --- a/database/common/mocks/Store.go +++ b/database/common/mocks/Store.go @@ -1,11 +1,11 @@ -// Code generated by mockery v2.15.0. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks import ( context "context" - params "garm/params" + params "github.com/cloudbase/garm/params" mock "github.com/stretchr/testify/mock" ) @@ -14,13 +14,13 @@ type Store struct { mock.Mock } -// AddInstanceEvent provides a mock function with given fields: ctx, instanceID, event, statusMessage -func (_m *Store) AddInstanceEvent(ctx context.Context, instanceID string, event params.EventType, statusMessage string) error { - ret := _m.Called(ctx, instanceID, event, statusMessage) +// AddInstanceEvent provides a mock function with given fields: ctx, instanceID, event, eventLevel, eventMessage +func (_m *Store) AddInstanceEvent(ctx context.Context, instanceID string, event params.EventType, eventLevel params.EventLevel, eventMessage string) error { + ret := _m.Called(ctx, instanceID, event, eventLevel, eventMessage) var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, params.EventType, string) error); ok { - r0 = rf(ctx, instanceID, event, statusMessage) + if rf, ok := ret.Get(0).(func(context.Context, string, params.EventType, params.EventLevel, string) error); ok { + r0 = rf(ctx, instanceID, event, eventLevel, eventMessage) } else { r0 = ret.Error(0) } @@ -33,13 +33,16 @@ func (_m *Store) ControllerInfo() (params.ControllerInfo, error) { ret := _m.Called() var r0 params.ControllerInfo + var r1 error + if rf, ok := ret.Get(0).(func() (params.ControllerInfo, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() params.ControllerInfo); ok { r0 = rf() } else { r0 = ret.Get(0).(params.ControllerInfo) } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -54,13 +57,16 @@ func (_m *Store) CreateEnterprise(ctx context.Context, name string, credentialsN ret := _m.Called(ctx, name, credentialsName, webhookSecret) var r0 params.Enterprise + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, string) (params.Enterprise, error)); ok { + return rf(ctx, name, credentialsName, webhookSecret) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, string) params.Enterprise); ok { r0 = rf(ctx, name, credentialsName, webhookSecret) } else { r0 = ret.Get(0).(params.Enterprise) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { r1 = rf(ctx, name, credentialsName, webhookSecret) } else { @@ -75,13 +81,16 @@ func (_m *Store) CreateEnterprisePool(ctx context.Context, enterpriseID string, ret := _m.Called(ctx, enterpriseID, param) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.CreatePoolParams) (params.Pool, error)); ok { + return rf(ctx, enterpriseID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.CreatePoolParams) params.Pool); ok { r0 = rf(ctx, enterpriseID, param) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.CreatePoolParams) error); ok { r1 = rf(ctx, enterpriseID, param) } else { @@ -96,13 +105,16 @@ func (_m *Store) CreateInstance(ctx context.Context, poolID string, param params ret := _m.Called(ctx, poolID, param) var r0 params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.CreateInstanceParams) (params.Instance, error)); ok { + return rf(ctx, poolID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.CreateInstanceParams) params.Instance); ok { r0 = rf(ctx, poolID, param) } else { r0 = ret.Get(0).(params.Instance) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.CreateInstanceParams) error); ok { r1 = rf(ctx, poolID, param) } else { @@ -117,13 +129,16 @@ func (_m *Store) CreateOrganization(ctx context.Context, name string, credential ret := _m.Called(ctx, name, credentialsName, webhookSecret) var r0 params.Organization + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, string) (params.Organization, error)); ok { + return rf(ctx, name, credentialsName, webhookSecret) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, string) params.Organization); ok { r0 = rf(ctx, name, credentialsName, webhookSecret) } else { r0 = ret.Get(0).(params.Organization) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { r1 = rf(ctx, name, credentialsName, webhookSecret) } else { @@ -138,13 +153,16 @@ func (_m *Store) CreateOrganizationPool(ctx context.Context, orgId string, param ret := _m.Called(ctx, orgId, param) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.CreatePoolParams) (params.Pool, error)); ok { + return rf(ctx, orgId, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.CreatePoolParams) params.Pool); ok { r0 = rf(ctx, orgId, param) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.CreatePoolParams) error); ok { r1 = rf(ctx, orgId, param) } else { @@ -159,13 +177,16 @@ func (_m *Store) CreateRepository(ctx context.Context, owner string, name string ret := _m.Called(ctx, owner, name, credentialsName, webhookSecret) var r0 params.Repository + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string) (params.Repository, error)); ok { + return rf(ctx, owner, name, credentialsName, webhookSecret) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string) params.Repository); ok { r0 = rf(ctx, owner, name, credentialsName, webhookSecret) } else { r0 = ret.Get(0).(params.Repository) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, string, string) error); ok { r1 = rf(ctx, owner, name, credentialsName, webhookSecret) } else { @@ -180,13 +201,16 @@ func (_m *Store) CreateRepositoryPool(ctx context.Context, repoId string, param ret := _m.Called(ctx, repoId, param) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.CreatePoolParams) (params.Pool, error)); ok { + return rf(ctx, repoId, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.CreatePoolParams) params.Pool); ok { r0 = rf(ctx, repoId, param) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.CreatePoolParams) error); ok { r1 = rf(ctx, repoId, param) } else { @@ -201,13 +225,16 @@ func (_m *Store) CreateUser(ctx context.Context, user params.NewUserParams) (par ret := _m.Called(ctx, user) var r0 params.User + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, params.NewUserParams) (params.User, error)); ok { + return rf(ctx, user) + } if rf, ok := ret.Get(0).(func(context.Context, params.NewUserParams) params.User); ok { r0 = rf(ctx, user) } else { r0 = ret.Get(0).(params.User) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, params.NewUserParams) error); ok { r1 = rf(ctx, user) } else { @@ -334,13 +361,16 @@ func (_m *Store) FindEnterprisePoolByTags(ctx context.Context, enterpriseID stri ret := _m.Called(ctx, enterpriseID, tags) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, []string) (params.Pool, error)); ok { + return rf(ctx, enterpriseID, tags) + } if rf, ok := ret.Get(0).(func(context.Context, string, []string) params.Pool); ok { r0 = rf(ctx, enterpriseID, tags) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, []string) error); ok { r1 = rf(ctx, enterpriseID, tags) } else { @@ -355,13 +385,16 @@ func (_m *Store) FindOrganizationPoolByTags(ctx context.Context, orgID string, t ret := _m.Called(ctx, orgID, tags) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, []string) (params.Pool, error)); ok { + return rf(ctx, orgID, tags) + } if rf, ok := ret.Get(0).(func(context.Context, string, []string) params.Pool); ok { r0 = rf(ctx, orgID, tags) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, []string) error); ok { r1 = rf(ctx, orgID, tags) } else { @@ -376,13 +409,16 @@ func (_m *Store) FindRepositoryPoolByTags(ctx context.Context, repoID string, ta ret := _m.Called(ctx, repoID, tags) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, []string) (params.Pool, error)); ok { + return rf(ctx, repoID, tags) + } if rf, ok := ret.Get(0).(func(context.Context, string, []string) params.Pool); ok { r0 = rf(ctx, repoID, tags) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, []string) error); ok { r1 = rf(ctx, repoID, tags) } else { @@ -397,13 +433,16 @@ func (_m *Store) GetEnterprise(ctx context.Context, name string) (params.Enterpr ret := _m.Called(ctx, name) var r0 params.Enterprise + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.Enterprise, error)); ok { + return rf(ctx, name) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.Enterprise); ok { r0 = rf(ctx, name) } else { r0 = ret.Get(0).(params.Enterprise) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, name) } else { @@ -418,13 +457,16 @@ func (_m *Store) GetEnterpriseByID(ctx context.Context, enterpriseID string) (pa ret := _m.Called(ctx, enterpriseID) var r0 params.Enterprise + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.Enterprise, error)); ok { + return rf(ctx, enterpriseID) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.Enterprise); ok { r0 = rf(ctx, enterpriseID) } else { r0 = ret.Get(0).(params.Enterprise) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, enterpriseID) } else { @@ -439,13 +481,16 @@ func (_m *Store) GetEnterprisePool(ctx context.Context, enterpriseID string, poo ret := _m.Called(ctx, enterpriseID, poolID) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (params.Pool, error)); ok { + return rf(ctx, enterpriseID, poolID) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) params.Pool); ok { r0 = rf(ctx, enterpriseID, poolID) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, enterpriseID, poolID) } else { @@ -460,13 +505,16 @@ func (_m *Store) GetInstanceByName(ctx context.Context, instanceName string) (pa ret := _m.Called(ctx, instanceName) var r0 params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.Instance, error)); ok { + return rf(ctx, instanceName) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.Instance); ok { r0 = rf(ctx, instanceName) } else { r0 = ret.Get(0).(params.Instance) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, instanceName) } else { @@ -481,13 +529,16 @@ func (_m *Store) GetOrganization(ctx context.Context, name string) (params.Organ ret := _m.Called(ctx, name) var r0 params.Organization + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.Organization, error)); ok { + return rf(ctx, name) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.Organization); ok { r0 = rf(ctx, name) } else { r0 = ret.Get(0).(params.Organization) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, name) } else { @@ -502,13 +553,16 @@ func (_m *Store) GetOrganizationByID(ctx context.Context, orgID string) (params. ret := _m.Called(ctx, orgID) var r0 params.Organization + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.Organization, error)); ok { + return rf(ctx, orgID) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.Organization); ok { r0 = rf(ctx, orgID) } else { r0 = ret.Get(0).(params.Organization) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, orgID) } else { @@ -523,13 +577,16 @@ func (_m *Store) GetOrganizationPool(ctx context.Context, orgID string, poolID s ret := _m.Called(ctx, orgID, poolID) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (params.Pool, error)); ok { + return rf(ctx, orgID, poolID) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) params.Pool); ok { r0 = rf(ctx, orgID, poolID) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, orgID, poolID) } else { @@ -544,13 +601,16 @@ func (_m *Store) GetPoolByID(ctx context.Context, poolID string) (params.Pool, e ret := _m.Called(ctx, poolID) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.Pool, error)); ok { + return rf(ctx, poolID) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.Pool); ok { r0 = rf(ctx, poolID) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, poolID) } else { @@ -565,13 +625,16 @@ func (_m *Store) GetPoolInstanceByName(ctx context.Context, poolID string, insta ret := _m.Called(ctx, poolID, instanceName) var r0 params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (params.Instance, error)); ok { + return rf(ctx, poolID, instanceName) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) params.Instance); ok { r0 = rf(ctx, poolID, instanceName) } else { r0 = ret.Get(0).(params.Instance) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, poolID, instanceName) } else { @@ -586,13 +649,16 @@ func (_m *Store) GetRepository(ctx context.Context, owner string, name string) ( ret := _m.Called(ctx, owner, name) var r0 params.Repository + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (params.Repository, error)); ok { + return rf(ctx, owner, name) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) params.Repository); ok { r0 = rf(ctx, owner, name) } else { r0 = ret.Get(0).(params.Repository) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, owner, name) } else { @@ -607,13 +673,16 @@ func (_m *Store) GetRepositoryByID(ctx context.Context, repoID string) (params.R ret := _m.Called(ctx, repoID) var r0 params.Repository + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.Repository, error)); ok { + return rf(ctx, repoID) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.Repository); ok { r0 = rf(ctx, repoID) } else { r0 = ret.Get(0).(params.Repository) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, repoID) } else { @@ -628,13 +697,16 @@ func (_m *Store) GetRepositoryPool(ctx context.Context, repoID string, poolID st ret := _m.Called(ctx, repoID, poolID) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (params.Pool, error)); ok { + return rf(ctx, repoID, poolID) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) params.Pool); ok { r0 = rf(ctx, repoID, poolID) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { r1 = rf(ctx, repoID, poolID) } else { @@ -649,13 +721,16 @@ func (_m *Store) GetUser(ctx context.Context, user string) (params.User, error) ret := _m.Called(ctx, user) var r0 params.User + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.User, error)); ok { + return rf(ctx, user) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.User); ok { r0 = rf(ctx, user) } else { r0 = ret.Get(0).(params.User) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, user) } else { @@ -670,13 +745,16 @@ func (_m *Store) GetUserByID(ctx context.Context, userID string) (params.User, e ret := _m.Called(ctx, userID) var r0 params.User + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.User, error)); ok { + return rf(ctx, userID) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.User); ok { r0 = rf(ctx, userID) } else { r0 = ret.Get(0).(params.User) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, userID) } else { @@ -705,13 +783,16 @@ func (_m *Store) InitController() (params.ControllerInfo, error) { ret := _m.Called() var r0 params.ControllerInfo + var r1 error + if rf, ok := ret.Get(0).(func() (params.ControllerInfo, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() params.ControllerInfo); ok { r0 = rf() } else { r0 = ret.Get(0).(params.ControllerInfo) } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -726,6 +807,10 @@ func (_m *Store) ListAllInstances(ctx context.Context) ([]params.Instance, error ret := _m.Called(ctx) var r0 []params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]params.Instance, error)); ok { + return rf(ctx) + } if rf, ok := ret.Get(0).(func(context.Context) []params.Instance); ok { r0 = rf(ctx) } else { @@ -734,7 +819,6 @@ func (_m *Store) ListAllInstances(ctx context.Context) ([]params.Instance, error } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(ctx) } else { @@ -749,6 +833,10 @@ func (_m *Store) ListAllPools(ctx context.Context) ([]params.Pool, error) { ret := _m.Called(ctx) var r0 []params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]params.Pool, error)); ok { + return rf(ctx) + } if rf, ok := ret.Get(0).(func(context.Context) []params.Pool); ok { r0 = rf(ctx) } else { @@ -757,7 +845,6 @@ func (_m *Store) ListAllPools(ctx context.Context) ([]params.Pool, error) { } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(ctx) } else { @@ -772,6 +859,10 @@ func (_m *Store) ListEnterpriseInstances(ctx context.Context, enterpriseID strin ret := _m.Called(ctx, enterpriseID) var r0 []params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]params.Instance, error)); ok { + return rf(ctx, enterpriseID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []params.Instance); ok { r0 = rf(ctx, enterpriseID) } else { @@ -780,7 +871,6 @@ func (_m *Store) ListEnterpriseInstances(ctx context.Context, enterpriseID strin } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, enterpriseID) } else { @@ -795,6 +885,10 @@ func (_m *Store) ListEnterprisePools(ctx context.Context, enterpriseID string) ( ret := _m.Called(ctx, enterpriseID) var r0 []params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]params.Pool, error)); ok { + return rf(ctx, enterpriseID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []params.Pool); ok { r0 = rf(ctx, enterpriseID) } else { @@ -803,7 +897,6 @@ func (_m *Store) ListEnterprisePools(ctx context.Context, enterpriseID string) ( } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, enterpriseID) } else { @@ -818,6 +911,10 @@ func (_m *Store) ListEnterprises(ctx context.Context) ([]params.Enterprise, erro ret := _m.Called(ctx) var r0 []params.Enterprise + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]params.Enterprise, error)); ok { + return rf(ctx) + } if rf, ok := ret.Get(0).(func(context.Context) []params.Enterprise); ok { r0 = rf(ctx) } else { @@ -826,7 +923,6 @@ func (_m *Store) ListEnterprises(ctx context.Context) ([]params.Enterprise, erro } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(ctx) } else { @@ -836,11 +932,41 @@ func (_m *Store) ListEnterprises(ctx context.Context) ([]params.Enterprise, erro return r0, r1 } +// ListInstanceEvents provides a mock function with given fields: ctx, instanceID, eventType, eventLevel +func (_m *Store) ListInstanceEvents(ctx context.Context, instanceID string, eventType params.EventType, eventLevel params.EventLevel) ([]params.StatusMessage, error) { + ret := _m.Called(ctx, instanceID, eventType, eventLevel) + + var r0 []params.StatusMessage + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.EventType, params.EventLevel) ([]params.StatusMessage, error)); ok { + return rf(ctx, instanceID, eventType, eventLevel) + } + if rf, ok := ret.Get(0).(func(context.Context, string, params.EventType, params.EventLevel) []params.StatusMessage); ok { + r0 = rf(ctx, instanceID, eventType, eventLevel) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]params.StatusMessage) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, string, params.EventType, params.EventLevel) error); ok { + r1 = rf(ctx, instanceID, eventType, eventLevel) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // ListOrgInstances provides a mock function with given fields: ctx, orgID func (_m *Store) ListOrgInstances(ctx context.Context, orgID string) ([]params.Instance, error) { ret := _m.Called(ctx, orgID) var r0 []params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]params.Instance, error)); ok { + return rf(ctx, orgID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []params.Instance); ok { r0 = rf(ctx, orgID) } else { @@ -849,7 +975,6 @@ func (_m *Store) ListOrgInstances(ctx context.Context, orgID string) ([]params.I } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, orgID) } else { @@ -864,6 +989,10 @@ func (_m *Store) ListOrgPools(ctx context.Context, orgID string) ([]params.Pool, ret := _m.Called(ctx, orgID) var r0 []params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]params.Pool, error)); ok { + return rf(ctx, orgID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []params.Pool); ok { r0 = rf(ctx, orgID) } else { @@ -872,7 +1001,6 @@ func (_m *Store) ListOrgPools(ctx context.Context, orgID string) ([]params.Pool, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, orgID) } else { @@ -887,6 +1015,10 @@ func (_m *Store) ListOrganizations(ctx context.Context) ([]params.Organization, ret := _m.Called(ctx) var r0 []params.Organization + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]params.Organization, error)); ok { + return rf(ctx) + } if rf, ok := ret.Get(0).(func(context.Context) []params.Organization); ok { r0 = rf(ctx) } else { @@ -895,7 +1027,6 @@ func (_m *Store) ListOrganizations(ctx context.Context) ([]params.Organization, } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(ctx) } else { @@ -910,6 +1041,10 @@ func (_m *Store) ListPoolInstances(ctx context.Context, poolID string) ([]params ret := _m.Called(ctx, poolID) var r0 []params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]params.Instance, error)); ok { + return rf(ctx, poolID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []params.Instance); ok { r0 = rf(ctx, poolID) } else { @@ -918,7 +1053,6 @@ func (_m *Store) ListPoolInstances(ctx context.Context, poolID string) ([]params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, poolID) } else { @@ -933,6 +1067,10 @@ func (_m *Store) ListRepoInstances(ctx context.Context, repoID string) ([]params ret := _m.Called(ctx, repoID) var r0 []params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]params.Instance, error)); ok { + return rf(ctx, repoID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []params.Instance); ok { r0 = rf(ctx, repoID) } else { @@ -941,7 +1079,6 @@ func (_m *Store) ListRepoInstances(ctx context.Context, repoID string) ([]params } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, repoID) } else { @@ -956,6 +1093,10 @@ func (_m *Store) ListRepoPools(ctx context.Context, repoID string) ([]params.Poo ret := _m.Called(ctx, repoID) var r0 []params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]params.Pool, error)); ok { + return rf(ctx, repoID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []params.Pool); ok { r0 = rf(ctx, repoID) } else { @@ -964,7 +1105,6 @@ func (_m *Store) ListRepoPools(ctx context.Context, repoID string) ([]params.Poo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, repoID) } else { @@ -979,6 +1119,10 @@ func (_m *Store) ListRepositories(ctx context.Context) ([]params.Repository, err ret := _m.Called(ctx) var r0 []params.Repository + var r1 error + if rf, ok := ret.Get(0).(func(context.Context) ([]params.Repository, error)); ok { + return rf(ctx) + } if rf, ok := ret.Get(0).(func(context.Context) []params.Repository); ok { r0 = rf(ctx) } else { @@ -987,7 +1131,6 @@ func (_m *Store) ListRepositories(ctx context.Context) ([]params.Repository, err } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context) error); ok { r1 = rf(ctx) } else { @@ -1002,13 +1145,16 @@ func (_m *Store) PoolInstanceCount(ctx context.Context, poolID string) (int64, e ret := _m.Called(ctx, poolID) var r0 int64 + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (int64, error)); ok { + return rf(ctx, poolID) + } if rf, ok := ret.Get(0).(func(context.Context, string) int64); ok { r0 = rf(ctx, poolID) } else { r0 = ret.Get(0).(int64) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, poolID) } else { @@ -1023,13 +1169,16 @@ func (_m *Store) UpdateEnterprise(ctx context.Context, enterpriseID string, para ret := _m.Called(ctx, enterpriseID, param) var r0 params.Enterprise + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateRepositoryParams) (params.Enterprise, error)); ok { + return rf(ctx, enterpriseID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateRepositoryParams) params.Enterprise); ok { r0 = rf(ctx, enterpriseID, param) } else { r0 = ret.Get(0).(params.Enterprise) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.UpdateRepositoryParams) error); ok { r1 = rf(ctx, enterpriseID, param) } else { @@ -1044,13 +1193,16 @@ func (_m *Store) UpdateEnterprisePool(ctx context.Context, enterpriseID string, ret := _m.Called(ctx, enterpriseID, poolID, param) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, params.UpdatePoolParams) (params.Pool, error)); ok { + return rf(ctx, enterpriseID, poolID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, params.UpdatePoolParams) params.Pool); ok { r0 = rf(ctx, enterpriseID, poolID, param) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, params.UpdatePoolParams) error); ok { r1 = rf(ctx, enterpriseID, poolID, param) } else { @@ -1065,13 +1217,16 @@ func (_m *Store) UpdateInstance(ctx context.Context, instanceID string, param pa ret := _m.Called(ctx, instanceID, param) var r0 params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateInstanceParams) (params.Instance, error)); ok { + return rf(ctx, instanceID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateInstanceParams) params.Instance); ok { r0 = rf(ctx, instanceID, param) } else { r0 = ret.Get(0).(params.Instance) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.UpdateInstanceParams) error); ok { r1 = rf(ctx, instanceID, param) } else { @@ -1086,13 +1241,16 @@ func (_m *Store) UpdateOrganization(ctx context.Context, orgID string, param par ret := _m.Called(ctx, orgID, param) var r0 params.Organization + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateRepositoryParams) (params.Organization, error)); ok { + return rf(ctx, orgID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateRepositoryParams) params.Organization); ok { r0 = rf(ctx, orgID, param) } else { r0 = ret.Get(0).(params.Organization) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.UpdateRepositoryParams) error); ok { r1 = rf(ctx, orgID, param) } else { @@ -1107,13 +1265,16 @@ func (_m *Store) UpdateOrganizationPool(ctx context.Context, orgID string, poolI ret := _m.Called(ctx, orgID, poolID, param) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, params.UpdatePoolParams) (params.Pool, error)); ok { + return rf(ctx, orgID, poolID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, params.UpdatePoolParams) params.Pool); ok { r0 = rf(ctx, orgID, poolID, param) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, params.UpdatePoolParams) error); ok { r1 = rf(ctx, orgID, poolID, param) } else { @@ -1128,13 +1289,16 @@ func (_m *Store) UpdateRepository(ctx context.Context, repoID string, param para ret := _m.Called(ctx, repoID, param) var r0 params.Repository + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateRepositoryParams) (params.Repository, error)); ok { + return rf(ctx, repoID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateRepositoryParams) params.Repository); ok { r0 = rf(ctx, repoID, param) } else { r0 = ret.Get(0).(params.Repository) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.UpdateRepositoryParams) error); ok { r1 = rf(ctx, repoID, param) } else { @@ -1149,13 +1313,16 @@ func (_m *Store) UpdateRepositoryPool(ctx context.Context, repoID string, poolID ret := _m.Called(ctx, repoID, poolID, param) var r0 params.Pool + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, params.UpdatePoolParams) (params.Pool, error)); ok { + return rf(ctx, repoID, poolID, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, params.UpdatePoolParams) params.Pool); ok { r0 = rf(ctx, repoID, poolID, param) } else { r0 = ret.Get(0).(params.Pool) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, params.UpdatePoolParams) error); ok { r1 = rf(ctx, repoID, poolID, param) } else { @@ -1170,13 +1337,16 @@ func (_m *Store) UpdateUser(ctx context.Context, user string, param params.Updat ret := _m.Called(ctx, user, param) var r0 params.User + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateUserParams) (params.User, error)); ok { + return rf(ctx, user, param) + } if rf, ok := ret.Get(0).(func(context.Context, string, params.UpdateUserParams) params.User); ok { r0 = rf(ctx, user, param) } else { r0 = ret.Get(0).(params.User) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, params.UpdateUserParams) error); ok { r1 = rf(ctx, user, param) } else { diff --git a/database/database.go b/database/database.go index e74364e2..b21b8221 100644 --- a/database/database.go +++ b/database/database.go @@ -17,9 +17,10 @@ package database import ( "context" "fmt" - "garm/config" - "garm/database/common" - "garm/database/sql" + + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/database/common" + "github.com/cloudbase/garm/database/sql" ) func NewDatabase(ctx context.Context, cfg config.Database) (common.Store, error) { diff --git a/database/sql/controller.go b/database/sql/controller.go index c71d1d7a..283d913c 100644 --- a/database/sql/controller.go +++ b/database/sql/controller.go @@ -15,8 +15,8 @@ package sql import ( - runnerErrors "garm/errors" - "garm/params" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" diff --git a/database/sql/controller_test.go b/database/sql/controller_test.go index 0803da1f..2cf9cf48 100644 --- a/database/sql/controller_test.go +++ b/database/sql/controller_test.go @@ -17,11 +17,12 @@ package sql import ( "context" "fmt" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - garmTesting "garm/internal/testing" "testing" + 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" ) diff --git a/database/sql/enterprise.go b/database/sql/enterprise.go index 9215f561..a26ace71 100644 --- a/database/sql/enterprise.go +++ b/database/sql/enterprise.go @@ -3,9 +3,9 @@ package sql import ( "context" - runnerErrors "garm/errors" - "garm/params" - "garm/util" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/util" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" diff --git a/database/sql/enterprise_test.go b/database/sql/enterprise_test.go index 010febad..6842e22b 100644 --- a/database/sql/enterprise_test.go +++ b/database/sql/enterprise_test.go @@ -22,10 +22,11 @@ import ( "sort" "testing" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - garmTesting "garm/internal/testing" - "garm/params" + "github.com/cloudbase/garm/params" + + 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" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/database/sql/instances.go b/database/sql/instances.go index e813b11a..30587809 100644 --- a/database/sql/instances.go +++ b/database/sql/instances.go @@ -16,8 +16,9 @@ package sql import ( "context" - runnerErrors "garm/errors" - "garm/params" + + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" diff --git a/database/sql/instances_test.go b/database/sql/instances_test.go index d1831b31..0c18e5be 100644 --- a/database/sql/instances_test.go +++ b/database/sql/instances_test.go @@ -18,14 +18,15 @@ import ( "context" "flag" "fmt" - dbCommon "garm/database/common" - garmTesting "garm/internal/testing" - "garm/params" - "garm/runner/providers/common" "regexp" "sort" "testing" + dbCommon "github.com/cloudbase/garm/database/common" + garmTesting "github.com/cloudbase/garm/internal/testing" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/providers/common" + "gopkg.in/DATA-DOG/go-sqlmock.v1" "github.com/stretchr/testify/suite" diff --git a/database/sql/models.go b/database/sql/models.go index d75b6c58..adcbd83a 100644 --- a/database/sql/models.go +++ b/database/sql/models.go @@ -15,11 +15,12 @@ package sql import ( - "garm/config" - "garm/params" - "garm/runner/providers/common" "time" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/providers/common" + "github.com/pkg/errors" uuid "github.com/satori/go.uuid" "gorm.io/datatypes" diff --git a/database/sql/organizations.go b/database/sql/organizations.go index c89d4f8f..f6bc2ed5 100644 --- a/database/sql/organizations.go +++ b/database/sql/organizations.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - runnerErrors "garm/errors" - "garm/params" - "garm/util" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/util" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" diff --git a/database/sql/organizations_test.go b/database/sql/organizations_test.go index 81dc9367..fb4c9b02 100644 --- a/database/sql/organizations_test.go +++ b/database/sql/organizations_test.go @@ -22,10 +22,10 @@ import ( "sort" "testing" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - garmTesting "garm/internal/testing" - "garm/params" + dbCommon "github.com/cloudbase/garm/database/common" + runnerErrors "github.com/cloudbase/garm/errors" + garmTesting "github.com/cloudbase/garm/internal/testing" + "github.com/cloudbase/garm/params" "github.com/stretchr/testify/suite" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/database/sql/pools.go b/database/sql/pools.go index b25af195..35e704a1 100644 --- a/database/sql/pools.go +++ b/database/sql/pools.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - runnerErrors "garm/errors" - "garm/params" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" diff --git a/database/sql/pools_test.go b/database/sql/pools_test.go index bf0a7ea8..de06e126 100644 --- a/database/sql/pools_test.go +++ b/database/sql/pools_test.go @@ -18,12 +18,13 @@ import ( "context" "flag" "fmt" - dbCommon "garm/database/common" - garmTesting "garm/internal/testing" - "garm/params" "regexp" "testing" + dbCommon "github.com/cloudbase/garm/database/common" + garmTesting "github.com/cloudbase/garm/internal/testing" + "github.com/cloudbase/garm/params" + "github.com/stretchr/testify/suite" "gopkg.in/DATA-DOG/go-sqlmock.v1" "gorm.io/driver/mysql" diff --git a/database/sql/repositories.go b/database/sql/repositories.go index 6bef798f..c57b7548 100644 --- a/database/sql/repositories.go +++ b/database/sql/repositories.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - runnerErrors "garm/errors" - "garm/params" - "garm/util" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/util" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" diff --git a/database/sql/repositories_test.go b/database/sql/repositories_test.go index 7f2ea6ed..33342bc0 100644 --- a/database/sql/repositories_test.go +++ b/database/sql/repositories_test.go @@ -22,9 +22,9 @@ import ( "sort" "testing" - dbCommon "garm/database/common" - garmTesting "garm/internal/testing" - "garm/params" + dbCommon "github.com/cloudbase/garm/database/common" + garmTesting "github.com/cloudbase/garm/internal/testing" + "github.com/cloudbase/garm/params" "github.com/stretchr/testify/suite" "gopkg.in/DATA-DOG/go-sqlmock.v1" diff --git a/database/sql/sql.go b/database/sql/sql.go index 440d5e7c..6a003be1 100644 --- a/database/sql/sql.go +++ b/database/sql/sql.go @@ -24,8 +24,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "garm/config" - "garm/database/common" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/database/common" ) // newDBConn returns a new gorm db connection, given the config diff --git a/database/sql/users.go b/database/sql/users.go index 4c84a1f3..5e40c5cb 100644 --- a/database/sql/users.go +++ b/database/sql/users.go @@ -17,9 +17,10 @@ package sql import ( "context" "fmt" - runnerErrors "garm/errors" - "garm/params" - "garm/util" + + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/util" "github.com/pkg/errors" "gorm.io/gorm" diff --git a/database/sql/util.go b/database/sql/util.go index f5615761..d9efc5ad 100644 --- a/database/sql/util.go +++ b/database/sql/util.go @@ -18,8 +18,8 @@ import ( "encoding/json" "fmt" - "garm/params" - "garm/util" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/util" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" diff --git a/go.mod b/go.mod index c000d748..938fe9ec 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module garm +module github.com/cloudbase/garm go 1.18 diff --git a/internal/testing/testing.go b/internal/testing/testing.go index 3fd0e458..754a799a 100644 --- a/internal/testing/testing.go +++ b/internal/testing/testing.go @@ -18,12 +18,13 @@ package testing import ( - "garm/config" "os" "path/filepath" "sort" "testing" + "github.com/cloudbase/garm/config" + "github.com/stretchr/testify/require" ) diff --git a/metrics/metrics.go b/metrics/metrics.go index 3879d440..04e218a6 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -3,9 +3,9 @@ package metrics import ( "log" - "garm/auth" - "garm/params" - "garm/runner" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/params/params.go b/params/params.go index ea5ba7f9..f822e7a8 100644 --- a/params/params.go +++ b/params/params.go @@ -16,10 +16,11 @@ package params import ( "encoding/json" - "garm/config" - "garm/runner/providers/common" "time" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/runner/providers/common" + "github.com/google/go-github/v48/github" uuid "github.com/satori/go.uuid" ) diff --git a/params/requests.go b/params/requests.go index 34229ac1..ea334d36 100644 --- a/params/requests.go +++ b/params/requests.go @@ -18,9 +18,9 @@ import ( "encoding/json" "fmt" - "garm/config" - "garm/errors" - "garm/runner/providers/common" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/runner/providers/common" ) const DefaultRunnerPrefix = "garm" diff --git a/runner/common/mocks/GithubClient.go b/runner/common/mocks/GithubClient.go index a5b08140..219b1ba0 100644 --- a/runner/common/mocks/GithubClient.go +++ b/runner/common/mocks/GithubClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.15.0. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,11 @@ func (_m *GithubClient) CreateOrganizationRegistrationToken(ctx context.Context, ret := _m.Called(ctx, owner) var r0 *github.RegistrationToken + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*github.RegistrationToken, *github.Response, error)); ok { + return rf(ctx, owner) + } if rf, ok := ret.Get(0).(func(context.Context, string) *github.RegistrationToken); ok { r0 = rf(ctx, owner) } else { @@ -27,7 +32,6 @@ func (_m *GithubClient) CreateOrganizationRegistrationToken(ctx context.Context, } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string) *github.Response); ok { r1 = rf(ctx, owner) } else { @@ -36,7 +40,6 @@ func (_m *GithubClient) CreateOrganizationRegistrationToken(ctx context.Context, } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string) error); ok { r2 = rf(ctx, owner) } else { @@ -51,6 +54,11 @@ func (_m *GithubClient) CreateRegistrationToken(ctx context.Context, owner strin ret := _m.Called(ctx, owner, repo) var r0 *github.RegistrationToken + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) (*github.RegistrationToken, *github.Response, error)); ok { + return rf(ctx, owner, repo) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) *github.RegistrationToken); ok { r0 = rf(ctx, owner, repo) } else { @@ -59,7 +67,6 @@ func (_m *GithubClient) CreateRegistrationToken(ctx context.Context, owner strin } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string, string) *github.Response); ok { r1 = rf(ctx, owner, repo) } else { @@ -68,7 +75,6 @@ func (_m *GithubClient) CreateRegistrationToken(ctx context.Context, owner strin } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string, string) error); ok { r2 = rf(ctx, owner, repo) } else { @@ -83,6 +89,11 @@ func (_m *GithubClient) GetWorkflowJobByID(ctx context.Context, owner string, re ret := _m.Called(ctx, owner, repo, jobID) var r0 *github.WorkflowJob + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, int64) (*github.WorkflowJob, *github.Response, error)); ok { + return rf(ctx, owner, repo, jobID) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, int64) *github.WorkflowJob); ok { r0 = rf(ctx, owner, repo, jobID) } else { @@ -91,7 +102,6 @@ func (_m *GithubClient) GetWorkflowJobByID(ctx context.Context, owner string, re } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string, string, int64) *github.Response); ok { r1 = rf(ctx, owner, repo, jobID) } else { @@ -100,7 +110,6 @@ func (_m *GithubClient) GetWorkflowJobByID(ctx context.Context, owner string, re } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string, string, int64) error); ok { r2 = rf(ctx, owner, repo, jobID) } else { @@ -115,6 +124,11 @@ func (_m *GithubClient) ListOrganizationRunnerApplicationDownloads(ctx context.C ret := _m.Called(ctx, owner) var r0 []*github.RunnerApplicationDownload + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]*github.RunnerApplicationDownload, *github.Response, error)); ok { + return rf(ctx, owner) + } if rf, ok := ret.Get(0).(func(context.Context, string) []*github.RunnerApplicationDownload); ok { r0 = rf(ctx, owner) } else { @@ -123,7 +137,6 @@ func (_m *GithubClient) ListOrganizationRunnerApplicationDownloads(ctx context.C } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string) *github.Response); ok { r1 = rf(ctx, owner) } else { @@ -132,7 +145,6 @@ func (_m *GithubClient) ListOrganizationRunnerApplicationDownloads(ctx context.C } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string) error); ok { r2 = rf(ctx, owner) } else { @@ -147,6 +159,11 @@ func (_m *GithubClient) ListOrganizationRunners(ctx context.Context, owner strin ret := _m.Called(ctx, owner, opts) var r0 *github.Runners + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string, *github.ListOptions) (*github.Runners, *github.Response, error)); ok { + return rf(ctx, owner, opts) + } if rf, ok := ret.Get(0).(func(context.Context, string, *github.ListOptions) *github.Runners); ok { r0 = rf(ctx, owner, opts) } else { @@ -155,7 +172,6 @@ func (_m *GithubClient) ListOrganizationRunners(ctx context.Context, owner strin } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string, *github.ListOptions) *github.Response); ok { r1 = rf(ctx, owner, opts) } else { @@ -164,7 +180,6 @@ func (_m *GithubClient) ListOrganizationRunners(ctx context.Context, owner strin } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string, *github.ListOptions) error); ok { r2 = rf(ctx, owner, opts) } else { @@ -179,6 +194,11 @@ func (_m *GithubClient) ListRunnerApplicationDownloads(ctx context.Context, owne ret := _m.Called(ctx, owner, repo) var r0 []*github.RunnerApplicationDownload + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string, string) ([]*github.RunnerApplicationDownload, *github.Response, error)); ok { + return rf(ctx, owner, repo) + } if rf, ok := ret.Get(0).(func(context.Context, string, string) []*github.RunnerApplicationDownload); ok { r0 = rf(ctx, owner, repo) } else { @@ -187,7 +207,6 @@ func (_m *GithubClient) ListRunnerApplicationDownloads(ctx context.Context, owne } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string, string) *github.Response); ok { r1 = rf(ctx, owner, repo) } else { @@ -196,7 +215,6 @@ func (_m *GithubClient) ListRunnerApplicationDownloads(ctx context.Context, owne } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string, string) error); ok { r2 = rf(ctx, owner, repo) } else { @@ -211,6 +229,11 @@ func (_m *GithubClient) ListRunners(ctx context.Context, owner string, repo stri ret := _m.Called(ctx, owner, repo, opts) var r0 *github.Runners + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, *github.ListOptions) (*github.Runners, *github.Response, error)); ok { + return rf(ctx, owner, repo, opts) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, *github.ListOptions) *github.Runners); ok { r0 = rf(ctx, owner, repo, opts) } else { @@ -219,7 +242,6 @@ func (_m *GithubClient) ListRunners(ctx context.Context, owner string, repo stri } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string, string, *github.ListOptions) *github.Response); ok { r1 = rf(ctx, owner, repo, opts) } else { @@ -228,7 +250,6 @@ func (_m *GithubClient) ListRunners(ctx context.Context, owner string, repo stri } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string, string, *github.ListOptions) error); ok { r2 = rf(ctx, owner, repo, opts) } else { @@ -243,6 +264,10 @@ func (_m *GithubClient) RemoveOrganizationRunner(ctx context.Context, owner stri ret := _m.Called(ctx, owner, runnerID) var r0 *github.Response + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, int64) (*github.Response, error)); ok { + return rf(ctx, owner, runnerID) + } if rf, ok := ret.Get(0).(func(context.Context, string, int64) *github.Response); ok { r0 = rf(ctx, owner, runnerID) } else { @@ -251,7 +276,6 @@ func (_m *GithubClient) RemoveOrganizationRunner(ctx context.Context, owner stri } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, int64) error); ok { r1 = rf(ctx, owner, runnerID) } else { @@ -266,6 +290,10 @@ func (_m *GithubClient) RemoveRunner(ctx context.Context, owner string, repo str ret := _m.Called(ctx, owner, repo, runnerID) var r0 *github.Response + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, string, int64) (*github.Response, error)); ok { + return rf(ctx, owner, repo, runnerID) + } if rf, ok := ret.Get(0).(func(context.Context, string, string, int64) *github.Response); ok { r0 = rf(ctx, owner, repo, runnerID) } else { @@ -274,7 +302,6 @@ func (_m *GithubClient) RemoveRunner(ctx context.Context, owner string, repo str } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, string, int64) error); ok { r1 = rf(ctx, owner, repo, runnerID) } else { diff --git a/runner/common/mocks/GithubEnterpriseClient.go b/runner/common/mocks/GithubEnterpriseClient.go index e9c3acc9..00a8dc50 100644 --- a/runner/common/mocks/GithubEnterpriseClient.go +++ b/runner/common/mocks/GithubEnterpriseClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.15.0. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks @@ -19,6 +19,11 @@ func (_m *GithubEnterpriseClient) CreateRegistrationToken(ctx context.Context, e ret := _m.Called(ctx, enterprise) var r0 *github.RegistrationToken + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string) (*github.RegistrationToken, *github.Response, error)); ok { + return rf(ctx, enterprise) + } if rf, ok := ret.Get(0).(func(context.Context, string) *github.RegistrationToken); ok { r0 = rf(ctx, enterprise) } else { @@ -27,7 +32,6 @@ func (_m *GithubEnterpriseClient) CreateRegistrationToken(ctx context.Context, e } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string) *github.Response); ok { r1 = rf(ctx, enterprise) } else { @@ -36,7 +40,6 @@ func (_m *GithubEnterpriseClient) CreateRegistrationToken(ctx context.Context, e } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string) error); ok { r2 = rf(ctx, enterprise) } else { @@ -51,6 +54,11 @@ func (_m *GithubEnterpriseClient) ListRunnerApplicationDownloads(ctx context.Con ret := _m.Called(ctx, enterprise) var r0 []*github.RunnerApplicationDownload + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]*github.RunnerApplicationDownload, *github.Response, error)); ok { + return rf(ctx, enterprise) + } if rf, ok := ret.Get(0).(func(context.Context, string) []*github.RunnerApplicationDownload); ok { r0 = rf(ctx, enterprise) } else { @@ -59,7 +67,6 @@ func (_m *GithubEnterpriseClient) ListRunnerApplicationDownloads(ctx context.Con } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string) *github.Response); ok { r1 = rf(ctx, enterprise) } else { @@ -68,7 +75,6 @@ func (_m *GithubEnterpriseClient) ListRunnerApplicationDownloads(ctx context.Con } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string) error); ok { r2 = rf(ctx, enterprise) } else { @@ -83,6 +89,11 @@ func (_m *GithubEnterpriseClient) ListRunners(ctx context.Context, enterprise st ret := _m.Called(ctx, enterprise, opts) var r0 *github.Runners + var r1 *github.Response + var r2 error + if rf, ok := ret.Get(0).(func(context.Context, string, *github.ListOptions) (*github.Runners, *github.Response, error)); ok { + return rf(ctx, enterprise, opts) + } if rf, ok := ret.Get(0).(func(context.Context, string, *github.ListOptions) *github.Runners); ok { r0 = rf(ctx, enterprise, opts) } else { @@ -91,7 +102,6 @@ func (_m *GithubEnterpriseClient) ListRunners(ctx context.Context, enterprise st } } - var r1 *github.Response if rf, ok := ret.Get(1).(func(context.Context, string, *github.ListOptions) *github.Response); ok { r1 = rf(ctx, enterprise, opts) } else { @@ -100,7 +110,6 @@ func (_m *GithubEnterpriseClient) ListRunners(ctx context.Context, enterprise st } } - var r2 error if rf, ok := ret.Get(2).(func(context.Context, string, *github.ListOptions) error); ok { r2 = rf(ctx, enterprise, opts) } else { @@ -115,6 +124,10 @@ func (_m *GithubEnterpriseClient) RemoveRunner(ctx context.Context, enterprise s ret := _m.Called(ctx, enterprise, runnerID) var r0 *github.Response + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string, int64) (*github.Response, error)); ok { + return rf(ctx, enterprise, runnerID) + } if rf, ok := ret.Get(0).(func(context.Context, string, int64) *github.Response); ok { r0 = rf(ctx, enterprise, runnerID) } else { @@ -123,7 +136,6 @@ func (_m *GithubEnterpriseClient) RemoveRunner(ctx context.Context, enterprise s } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string, int64) error); ok { r1 = rf(ctx, enterprise, runnerID) } else { diff --git a/runner/common/mocks/PoolManager.go b/runner/common/mocks/PoolManager.go index 9f327279..3f6a0594 100644 --- a/runner/common/mocks/PoolManager.go +++ b/runner/common/mocks/PoolManager.go @@ -1,10 +1,9 @@ -// Code generated by mockery v2.15.0. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks import ( - params "garm/params" - + params "github.com/cloudbase/garm/params" mock "github.com/stretchr/testify/mock" ) @@ -32,13 +31,16 @@ func (_m *PoolManager) GithubRunnerRegistrationToken() (string, error) { ret := _m.Called() var r0 string + var r1 error + if rf, ok := ret.Get(0).(func() (string, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() } else { r0 = ret.Get(0).(string) } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { diff --git a/runner/common/mocks/Provider.go b/runner/common/mocks/Provider.go index 35206df6..fb69eb4e 100644 --- a/runner/common/mocks/Provider.go +++ b/runner/common/mocks/Provider.go @@ -1,11 +1,11 @@ -// Code generated by mockery v2.15.0. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks import ( context "context" - params "garm/params" + params "github.com/cloudbase/garm/params" mock "github.com/stretchr/testify/mock" ) @@ -33,13 +33,16 @@ func (_m *Provider) CreateInstance(ctx context.Context, bootstrapParams params.B ret := _m.Called(ctx, bootstrapParams) var r0 params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, params.BootstrapInstance) (params.Instance, error)); ok { + return rf(ctx, bootstrapParams) + } if rf, ok := ret.Get(0).(func(context.Context, params.BootstrapInstance) params.Instance); ok { r0 = rf(ctx, bootstrapParams) } else { r0 = ret.Get(0).(params.Instance) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, params.BootstrapInstance) error); ok { r1 = rf(ctx, bootstrapParams) } else { @@ -68,13 +71,16 @@ func (_m *Provider) GetInstance(ctx context.Context, instance string) (params.In ret := _m.Called(ctx, instance) var r0 params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) (params.Instance, error)); ok { + return rf(ctx, instance) + } if rf, ok := ret.Get(0).(func(context.Context, string) params.Instance); ok { r0 = rf(ctx, instance) } else { r0 = ret.Get(0).(params.Instance) } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, instance) } else { @@ -89,6 +95,10 @@ func (_m *Provider) ListInstances(ctx context.Context, poolID string) ([]params. ret := _m.Called(ctx, poolID) var r0 []params.Instance + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, string) ([]params.Instance, error)); ok { + return rf(ctx, poolID) + } if rf, ok := ret.Get(0).(func(context.Context, string) []params.Instance); ok { r0 = rf(ctx, poolID) } else { @@ -97,7 +107,6 @@ func (_m *Provider) ListInstances(ctx context.Context, poolID string) ([]params. } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { r1 = rf(ctx, poolID) } else { diff --git a/runner/common/pool.go b/runner/common/pool.go index 630a6b54..e4c79c06 100644 --- a/runner/common/pool.go +++ b/runner/common/pool.go @@ -15,8 +15,9 @@ package common import ( - "garm/params" "time" + + "github.com/cloudbase/garm/params" ) const ( diff --git a/runner/common/provider.go b/runner/common/provider.go index 6575dd4f..2def7385 100644 --- a/runner/common/provider.go +++ b/runner/common/provider.go @@ -16,7 +16,8 @@ package common import ( "context" - "garm/params" + + "github.com/cloudbase/garm/params" ) //go:generate mockery --all diff --git a/runner/enterprises.go b/runner/enterprises.go index 424ae542..25df5f5e 100644 --- a/runner/enterprises.go +++ b/runner/enterprises.go @@ -3,14 +3,15 @@ package runner import ( "context" "fmt" - "garm/auth" - "garm/config" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" "log" "strings" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/config" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + "github.com/pkg/errors" ) diff --git a/runner/enterprises_test.go b/runner/enterprises_test.go index a86899b7..40f79f9f 100644 --- a/runner/enterprises_test.go +++ b/runner/enterprises_test.go @@ -19,16 +19,16 @@ import ( "fmt" "testing" - "garm/auth" - "garm/config" - "garm/database" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - garmTesting "garm/internal/testing" - "garm/params" - "garm/runner/common" - runnerCommonMocks "garm/runner/common/mocks" - runnerMocks "garm/runner/mocks" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/database" + dbCommon "github.com/cloudbase/garm/database/common" + runnerErrors "github.com/cloudbase/garm/errors" + garmTesting "github.com/cloudbase/garm/internal/testing" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + runnerCommonMocks "github.com/cloudbase/garm/runner/common/mocks" + runnerMocks "github.com/cloudbase/garm/runner/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/runner/interfaces.go b/runner/interfaces.go index d7ccc0a8..ff8129ed 100644 --- a/runner/interfaces.go +++ b/runner/interfaces.go @@ -16,9 +16,10 @@ package runner import ( "context" - dbCommon "garm/database/common" - "garm/params" - "garm/runner/common" + + dbCommon "github.com/cloudbase/garm/database/common" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" ) type RepoPoolManager interface { diff --git a/runner/mocks/PoolManagerController.go b/runner/mocks/PoolManagerController.go index ce708fcd..0727b1a2 100644 --- a/runner/mocks/PoolManagerController.go +++ b/runner/mocks/PoolManagerController.go @@ -1,16 +1,17 @@ -// Code generated by mockery v2.15.0. DO NOT EDIT. +// Code generated by mockery v2.22.1. DO NOT EDIT. package mocks import ( context "context" - common "garm/runner/common" - databasecommon "garm/database/common" + common "github.com/cloudbase/garm/runner/common" + + databasecommon "github.com/cloudbase/garm/database/common" mock "github.com/stretchr/testify/mock" - params "garm/params" + params "github.com/cloudbase/garm/params" ) // PoolManagerController is an autogenerated mock type for the PoolManagerController type @@ -23,6 +24,10 @@ func (_m *PoolManagerController) CreateEnterprisePoolManager(ctx context.Context ret := _m.Called(ctx, enterprise, providers, store) var r0 common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, params.Enterprise, map[string]common.Provider, databasecommon.Store) (common.PoolManager, error)); ok { + return rf(ctx, enterprise, providers, store) + } if rf, ok := ret.Get(0).(func(context.Context, params.Enterprise, map[string]common.Provider, databasecommon.Store) common.PoolManager); ok { r0 = rf(ctx, enterprise, providers, store) } else { @@ -31,7 +36,6 @@ func (_m *PoolManagerController) CreateEnterprisePoolManager(ctx context.Context } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, params.Enterprise, map[string]common.Provider, databasecommon.Store) error); ok { r1 = rf(ctx, enterprise, providers, store) } else { @@ -46,6 +50,10 @@ func (_m *PoolManagerController) CreateOrgPoolManager(ctx context.Context, org p ret := _m.Called(ctx, org, providers, store) var r0 common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, params.Organization, map[string]common.Provider, databasecommon.Store) (common.PoolManager, error)); ok { + return rf(ctx, org, providers, store) + } if rf, ok := ret.Get(0).(func(context.Context, params.Organization, map[string]common.Provider, databasecommon.Store) common.PoolManager); ok { r0 = rf(ctx, org, providers, store) } else { @@ -54,7 +62,6 @@ func (_m *PoolManagerController) CreateOrgPoolManager(ctx context.Context, org p } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, params.Organization, map[string]common.Provider, databasecommon.Store) error); ok { r1 = rf(ctx, org, providers, store) } else { @@ -69,6 +76,10 @@ func (_m *PoolManagerController) CreateRepoPoolManager(ctx context.Context, repo ret := _m.Called(ctx, repo, providers, store) var r0 common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, params.Repository, map[string]common.Provider, databasecommon.Store) (common.PoolManager, error)); ok { + return rf(ctx, repo, providers, store) + } if rf, ok := ret.Get(0).(func(context.Context, params.Repository, map[string]common.Provider, databasecommon.Store) common.PoolManager); ok { r0 = rf(ctx, repo, providers, store) } else { @@ -77,7 +88,6 @@ func (_m *PoolManagerController) CreateRepoPoolManager(ctx context.Context, repo } } - var r1 error if rf, ok := ret.Get(1).(func(context.Context, params.Repository, map[string]common.Provider, databasecommon.Store) error); ok { r1 = rf(ctx, repo, providers, store) } else { @@ -134,6 +144,10 @@ func (_m *PoolManagerController) GetEnterprisePoolManager(enterprise params.Ente ret := _m.Called(enterprise) var r0 common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func(params.Enterprise) (common.PoolManager, error)); ok { + return rf(enterprise) + } if rf, ok := ret.Get(0).(func(params.Enterprise) common.PoolManager); ok { r0 = rf(enterprise) } else { @@ -142,7 +156,6 @@ func (_m *PoolManagerController) GetEnterprisePoolManager(enterprise params.Ente } } - var r1 error if rf, ok := ret.Get(1).(func(params.Enterprise) error); ok { r1 = rf(enterprise) } else { @@ -157,6 +170,10 @@ func (_m *PoolManagerController) GetEnterprisePoolManagers() (map[string]common. ret := _m.Called() var r0 map[string]common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func() (map[string]common.PoolManager, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() map[string]common.PoolManager); ok { r0 = rf() } else { @@ -165,7 +182,6 @@ func (_m *PoolManagerController) GetEnterprisePoolManagers() (map[string]common. } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -180,6 +196,10 @@ func (_m *PoolManagerController) GetOrgPoolManager(org params.Organization) (com ret := _m.Called(org) var r0 common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func(params.Organization) (common.PoolManager, error)); ok { + return rf(org) + } if rf, ok := ret.Get(0).(func(params.Organization) common.PoolManager); ok { r0 = rf(org) } else { @@ -188,7 +208,6 @@ func (_m *PoolManagerController) GetOrgPoolManager(org params.Organization) (com } } - var r1 error if rf, ok := ret.Get(1).(func(params.Organization) error); ok { r1 = rf(org) } else { @@ -203,6 +222,10 @@ func (_m *PoolManagerController) GetOrgPoolManagers() (map[string]common.PoolMan ret := _m.Called() var r0 map[string]common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func() (map[string]common.PoolManager, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() map[string]common.PoolManager); ok { r0 = rf() } else { @@ -211,7 +234,6 @@ func (_m *PoolManagerController) GetOrgPoolManagers() (map[string]common.PoolMan } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { @@ -226,6 +248,10 @@ func (_m *PoolManagerController) GetRepoPoolManager(repo params.Repository) (com ret := _m.Called(repo) var r0 common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func(params.Repository) (common.PoolManager, error)); ok { + return rf(repo) + } if rf, ok := ret.Get(0).(func(params.Repository) common.PoolManager); ok { r0 = rf(repo) } else { @@ -234,7 +260,6 @@ func (_m *PoolManagerController) GetRepoPoolManager(repo params.Repository) (com } } - var r1 error if rf, ok := ret.Get(1).(func(params.Repository) error); ok { r1 = rf(repo) } else { @@ -249,6 +274,10 @@ func (_m *PoolManagerController) GetRepoPoolManagers() (map[string]common.PoolMa ret := _m.Called() var r0 map[string]common.PoolManager + var r1 error + if rf, ok := ret.Get(0).(func() (map[string]common.PoolManager, error)); ok { + return rf() + } if rf, ok := ret.Get(0).(func() map[string]common.PoolManager); ok { r0 = rf() } else { @@ -257,7 +286,6 @@ func (_m *PoolManagerController) GetRepoPoolManagers() (map[string]common.PoolMa } } - var r1 error if rf, ok := ret.Get(1).(func() error); ok { r1 = rf() } else { diff --git a/runner/organizations.go b/runner/organizations.go index 8806baf5..5c821fce 100644 --- a/runner/organizations.go +++ b/runner/organizations.go @@ -20,11 +20,11 @@ import ( "log" "strings" - "garm/auth" - "garm/config" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/config" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" "github.com/pkg/errors" ) diff --git a/runner/organizations_test.go b/runner/organizations_test.go index a0c7b36e..0ce67a97 100644 --- a/runner/organizations_test.go +++ b/runner/organizations_test.go @@ -19,16 +19,16 @@ import ( "fmt" "testing" - "garm/auth" - "garm/config" - "garm/database" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - garmTesting "garm/internal/testing" - "garm/params" - "garm/runner/common" - runnerCommonMocks "garm/runner/common/mocks" - runnerMocks "garm/runner/mocks" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/database" + dbCommon "github.com/cloudbase/garm/database/common" + runnerErrors "github.com/cloudbase/garm/errors" + garmTesting "github.com/cloudbase/garm/internal/testing" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + runnerCommonMocks "github.com/cloudbase/garm/runner/common/mocks" + runnerMocks "github.com/cloudbase/garm/runner/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/runner/pool/enterprise.go b/runner/pool/enterprise.go index 7ff82125..9e2a258c 100644 --- a/runner/pool/enterprise.go +++ b/runner/pool/enterprise.go @@ -7,11 +7,11 @@ import ( "strings" "sync" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" - "garm/util" + dbCommon "github.com/cloudbase/garm/database/common" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + "github.com/cloudbase/garm/util" "github.com/google/go-github/v48/github" "github.com/pkg/errors" diff --git a/runner/pool/interfaces.go b/runner/pool/interfaces.go index 9e69dec3..e96d5d88 100644 --- a/runner/pool/interfaces.go +++ b/runner/pool/interfaces.go @@ -15,7 +15,7 @@ package pool import ( - "garm/params" + "github.com/cloudbase/garm/params" "github.com/google/go-github/v48/github" ) diff --git a/runner/pool/organization.go b/runner/pool/organization.go index 68d69255..36845cd8 100644 --- a/runner/pool/organization.go +++ b/runner/pool/organization.go @@ -21,11 +21,11 @@ import ( "strings" "sync" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" - "garm/util" + dbCommon "github.com/cloudbase/garm/database/common" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + "github.com/cloudbase/garm/util" "github.com/google/go-github/v48/github" "github.com/pkg/errors" diff --git a/runner/pool/pool.go b/runner/pool/pool.go index 75e20867..3cc90ff0 100644 --- a/runner/pool/pool.go +++ b/runner/pool/pool.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "garm/auth" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" - providerCommon "garm/runner/providers/common" - "garm/util" + "github.com/cloudbase/garm/auth" + 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/cloudbase/garm/util" "github.com/google/go-github/v48/github" "github.com/pkg/errors" diff --git a/runner/pool/repository.go b/runner/pool/repository.go index 34e7b07c..882206a7 100644 --- a/runner/pool/repository.go +++ b/runner/pool/repository.go @@ -21,11 +21,11 @@ import ( "strings" "sync" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" - "garm/util" + dbCommon "github.com/cloudbase/garm/database/common" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + "github.com/cloudbase/garm/util" "github.com/google/go-github/v48/github" "github.com/pkg/errors" diff --git a/runner/pools.go b/runner/pools.go index dd032a7c..593c9364 100644 --- a/runner/pools.go +++ b/runner/pools.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - "garm/auth" - runnerErrors "garm/errors" - "garm/params" + "github.com/cloudbase/garm/auth" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" "github.com/pkg/errors" ) diff --git a/runner/providers/external/external.go b/runner/providers/external/external.go index 63127cd5..62dc7a19 100644 --- a/runner/providers/external/external.go +++ b/runner/providers/external/external.go @@ -6,12 +6,12 @@ import ( "fmt" "log" - "garm/config" - garmErrors "garm/errors" - "garm/params" - "garm/runner/common" - providerCommon "garm/runner/providers/common" - "garm/util/exec" + "github.com/cloudbase/garm/config" + garmErrors "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/cloudbase/garm/util/exec" "github.com/pkg/errors" ) diff --git a/runner/providers/external/util.go b/runner/providers/external/util.go index 33375122..36bb4ca9 100644 --- a/runner/providers/external/util.go +++ b/runner/providers/external/util.go @@ -2,8 +2,9 @@ package external import ( "fmt" - "garm/params" "strings" + + "github.com/cloudbase/garm/params" ) const ( diff --git a/runner/providers/lxd/images.go b/runner/providers/lxd/images.go index 3a66e163..ae90434d 100644 --- a/runner/providers/lxd/images.go +++ b/runner/providers/lxd/images.go @@ -19,8 +19,8 @@ import ( "log" "strings" - "garm/config" - runnerErrors "garm/errors" + "github.com/cloudbase/garm/config" + runnerErrors "github.com/cloudbase/garm/errors" lxd "github.com/lxc/lxd/client" "github.com/lxc/lxd/shared/api" diff --git a/runner/providers/lxd/lxd.go b/runner/providers/lxd/lxd.go index 32bf794a..f3410601 100644 --- a/runner/providers/lxd/lxd.go +++ b/runner/providers/lxd/lxd.go @@ -19,11 +19,11 @@ import ( "fmt" "sync" - "garm/config" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" - "garm/util" + "github.com/cloudbase/garm/config" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + "github.com/cloudbase/garm/util" "github.com/google/go-github/v48/github" lxd "github.com/lxc/lxd/client" diff --git a/runner/providers/lxd/util.go b/runner/providers/lxd/util.go index 59bac2b8..98f4b1be 100644 --- a/runner/providers/lxd/util.go +++ b/runner/providers/lxd/util.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "garm/config" - "garm/params" - "garm/runner/providers/common" - "garm/util" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/providers/common" + "github.com/cloudbase/garm/util" "github.com/juju/clock" "github.com/juju/retry" diff --git a/runner/providers/providers.go b/runner/providers/providers.go index 2b494faa..59327ab8 100644 --- a/runner/providers/providers.go +++ b/runner/providers/providers.go @@ -18,10 +18,10 @@ import ( "context" "log" - "garm/config" - "garm/runner/common" - "garm/runner/providers/external" - "garm/runner/providers/lxd" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/runner/common" + "github.com/cloudbase/garm/runner/providers/external" + "github.com/cloudbase/garm/runner/providers/lxd" "github.com/pkg/errors" ) diff --git a/runner/repositories.go b/runner/repositories.go index c511f3ab..98f21820 100644 --- a/runner/repositories.go +++ b/runner/repositories.go @@ -20,11 +20,11 @@ import ( "log" "strings" - "garm/auth" - "garm/config" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/config" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" "github.com/pkg/errors" ) diff --git a/runner/repositories_test.go b/runner/repositories_test.go index 1481fbaf..ba84868b 100644 --- a/runner/repositories_test.go +++ b/runner/repositories_test.go @@ -19,16 +19,16 @@ import ( "fmt" "testing" - "garm/auth" - "garm/config" - "garm/database" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - garmTesting "garm/internal/testing" - "garm/params" - "garm/runner/common" - runnerCommonMocks "garm/runner/common/mocks" - runnerMocks "garm/runner/mocks" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/database" + dbCommon "github.com/cloudbase/garm/database/common" + runnerErrors "github.com/cloudbase/garm/errors" + garmTesting "github.com/cloudbase/garm/internal/testing" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + runnerCommonMocks "github.com/cloudbase/garm/runner/common/mocks" + runnerMocks "github.com/cloudbase/garm/runner/mocks" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/runner/runner.go b/runner/runner.go index e2d8f157..9b382b75 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -29,17 +29,17 @@ import ( "sync" "time" - "garm/auth" - "garm/config" - "garm/database" - dbCommon "garm/database/common" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" - "garm/runner/pool" - "garm/runner/providers" - providerCommon "garm/runner/providers/common" - "garm/util" + "github.com/cloudbase/garm/auth" + "github.com/cloudbase/garm/config" + "github.com/cloudbase/garm/database" + dbCommon "github.com/cloudbase/garm/database/common" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" + "github.com/cloudbase/garm/runner/pool" + "github.com/cloudbase/garm/runner/providers" + providerCommon "github.com/cloudbase/garm/runner/providers/common" + "github.com/cloudbase/garm/util" "github.com/juju/clock" "github.com/juju/retry" diff --git a/runner/types.go b/runner/types.go index a03b9d53..4f5fb264 100644 --- a/runner/types.go +++ b/runner/types.go @@ -14,7 +14,7 @@ package runner -import "garm/config" +import "github.com/cloudbase/garm/config" type HookTargetType string diff --git a/util/util.go b/util/util.go index e9916266..1e8d0ed5 100644 --- a/util/util.go +++ b/util/util.go @@ -32,11 +32,11 @@ import ( "strings" "unicode" - "garm/cloudconfig" - "garm/config" - runnerErrors "garm/errors" - "garm/params" - "garm/runner/common" + "github.com/cloudbase/garm/cloudconfig" + "github.com/cloudbase/garm/config" + runnerErrors "github.com/cloudbase/garm/errors" + "github.com/cloudbase/garm/params" + "github.com/cloudbase/garm/runner/common" "github.com/google/go-github/v48/github" "github.com/google/uuid"