diff --git a/.drone.yml b/.drone.yml index 98ef6b8..e581aac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,6 +10,7 @@ steps: - name: dockersock path: /var/run/docker.sock commands: + - make generate - go test -race -coverprofile=coverage.txt -covermode=atomic ./... volumes: @@ -33,6 +34,7 @@ steps: - name: check go.mod image: golang:1.19 commands: + - make generate - go mod tidy - git diff --exit-code go.mod @@ -52,6 +54,7 @@ steps: - name: run golangci-lint image: golangci/golangci-lint:v1.48 commands: + - make generate - golangci-lint run trigger: diff --git a/Makefile b/Makefile index 7f6c675..04e996a 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,24 @@ -.PHONY: install -install: - # install required tools +.PHONY: install-git-hooks +install-git-hooks: + @echo "Installing git hooks..." + pre-commit install --hook-type pre-commit + pre-commit install --hook-type commit-msg + +.PHONY: install-tools +install-tools: + @echo "Installing required tools..." cd ./internal/tools && go install \ github.com/golangci/golangci-lint/cmd/golangci-lint \ github.com/maxbrunsfeld/counterfeiter/v6 - # install git hooks - pre-commit install --hook-type pre-commit - pre-commit install --hook-type commit-msg + +.PHONY: install +install: install-tools install-git-hooks + +.PHONY: generate +generate: install-tools + @echo "Running go generate..." + go generate ./... + +.PHONY: create-job-update-data create-job-update-data: kubectl create job --from=cronjob/twhelp-job-update-data-dev twhelp-job-update-data diff --git a/internal/msg/internal/mock/.gitignore b/internal/msg/internal/mock/.gitignore new file mode 100644 index 0000000..bc7b52c --- /dev/null +++ b/internal/msg/internal/mock/.gitignore @@ -0,0 +1 @@ +*.gen.go diff --git a/internal/msg/internal/mock/server_service.gen.go b/internal/msg/internal/mock/server_service.gen.go deleted file mode 100644 index 1961439..0000000 --- a/internal/msg/internal/mock/server_service.gen.go +++ /dev/null @@ -1,122 +0,0 @@ -// Code generated by counterfeiter. DO NOT EDIT. -package mock - -import ( - "context" - "sync" - - "gitea.dwysokinski.me/twhelp/core/internal/domain" - "gitea.dwysokinski.me/twhelp/core/internal/msg" -) - -type FakeServerService struct { - RefreshStub func(context.Context, string, string) ([]domain.Server, error) - refreshMutex sync.RWMutex - refreshArgsForCall []struct { - arg1 context.Context - arg2 string - arg3 string - } - refreshReturns struct { - result1 []domain.Server - result2 error - } - refreshReturnsOnCall map[int]struct { - result1 []domain.Server - result2 error - } - invocations map[string][][]interface{} - invocationsMutex sync.RWMutex -} - -func (fake *FakeServerService) Refresh(arg1 context.Context, arg2 string, arg3 string) ([]domain.Server, error) { - fake.refreshMutex.Lock() - ret, specificReturn := fake.refreshReturnsOnCall[len(fake.refreshArgsForCall)] - fake.refreshArgsForCall = append(fake.refreshArgsForCall, struct { - arg1 context.Context - arg2 string - arg3 string - }{arg1, arg2, arg3}) - stub := fake.RefreshStub - fakeReturns := fake.refreshReturns - fake.recordInvocation("Refresh", []interface{}{arg1, arg2, arg3}) - fake.refreshMutex.Unlock() - if stub != nil { - return stub(arg1, arg2, arg3) - } - if specificReturn { - return ret.result1, ret.result2 - } - return fakeReturns.result1, fakeReturns.result2 -} - -func (fake *FakeServerService) RefreshCallCount() int { - fake.refreshMutex.RLock() - defer fake.refreshMutex.RUnlock() - return len(fake.refreshArgsForCall) -} - -func (fake *FakeServerService) RefreshCalls(stub func(context.Context, string, string) ([]domain.Server, error)) { - fake.refreshMutex.Lock() - defer fake.refreshMutex.Unlock() - fake.RefreshStub = stub -} - -func (fake *FakeServerService) RefreshArgsForCall(i int) (context.Context, string, string) { - fake.refreshMutex.RLock() - defer fake.refreshMutex.RUnlock() - argsForCall := fake.refreshArgsForCall[i] - return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3 -} - -func (fake *FakeServerService) RefreshReturns(result1 []domain.Server, result2 error) { - fake.refreshMutex.Lock() - defer fake.refreshMutex.Unlock() - fake.RefreshStub = nil - fake.refreshReturns = struct { - result1 []domain.Server - result2 error - }{result1, result2} -} - -func (fake *FakeServerService) RefreshReturnsOnCall(i int, result1 []domain.Server, result2 error) { - fake.refreshMutex.Lock() - defer fake.refreshMutex.Unlock() - fake.RefreshStub = nil - if fake.refreshReturnsOnCall == nil { - fake.refreshReturnsOnCall = make(map[int]struct { - result1 []domain.Server - result2 error - }) - } - fake.refreshReturnsOnCall[i] = struct { - result1 []domain.Server - result2 error - }{result1, result2} -} - -func (fake *FakeServerService) Invocations() map[string][][]interface{} { - fake.invocationsMutex.RLock() - defer fake.invocationsMutex.RUnlock() - fake.refreshMutex.RLock() - defer fake.refreshMutex.RUnlock() - copiedInvocations := map[string][][]interface{}{} - for key, value := range fake.invocations { - copiedInvocations[key] = value - } - return copiedInvocations -} - -func (fake *FakeServerService) recordInvocation(key string, args []interface{}) { - fake.invocationsMutex.Lock() - defer fake.invocationsMutex.Unlock() - if fake.invocations == nil { - fake.invocations = map[string][][]interface{}{} - } - if fake.invocations[key] == nil { - fake.invocations[key] = [][]interface{}{} - } - fake.invocations[key] = append(fake.invocations[key], args) -} - -var _ msg.ServerService = new(FakeServerService) diff --git a/internal/rest/internal/mock/.gitignore b/internal/rest/internal/mock/.gitignore new file mode 100644 index 0000000..bc7b52c --- /dev/null +++ b/internal/rest/internal/mock/.gitignore @@ -0,0 +1 @@ +*.gen.go diff --git a/internal/rest/internal/mock/version_service.gen.go b/internal/rest/internal/mock/version_service.gen.go deleted file mode 100644 index 3cb1fa5..0000000 --- a/internal/rest/internal/mock/version_service.gen.go +++ /dev/null @@ -1,125 +0,0 @@ -// Code generated by counterfeiter. DO NOT EDIT. -package mock - -import ( - "context" - "sync" - - "gitea.dwysokinski.me/twhelp/core/internal/domain" - "gitea.dwysokinski.me/twhelp/core/internal/rest" -) - -type FakeVersionService struct { - ListStub func(context.Context, domain.ListVersionsParams) ([]domain.Version, int64, error) - listMutex sync.RWMutex - listArgsForCall []struct { - arg1 context.Context - arg2 domain.ListVersionsParams - } - listReturns struct { - result1 []domain.Version - result2 int64 - result3 error - } - listReturnsOnCall map[int]struct { - result1 []domain.Version - result2 int64 - result3 error - } - invocations map[string][][]interface{} - invocationsMutex sync.RWMutex -} - -func (fake *FakeVersionService) List(arg1 context.Context, arg2 domain.ListVersionsParams) ([]domain.Version, int64, error) { - fake.listMutex.Lock() - ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] - fake.listArgsForCall = append(fake.listArgsForCall, struct { - arg1 context.Context - arg2 domain.ListVersionsParams - }{arg1, arg2}) - stub := fake.ListStub - fakeReturns := fake.listReturns - fake.recordInvocation("List", []interface{}{arg1, arg2}) - fake.listMutex.Unlock() - if stub != nil { - return stub(arg1, arg2) - } - if specificReturn { - return ret.result1, ret.result2, ret.result3 - } - return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 -} - -func (fake *FakeVersionService) ListCallCount() int { - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - return len(fake.listArgsForCall) -} - -func (fake *FakeVersionService) ListCalls(stub func(context.Context, domain.ListVersionsParams) ([]domain.Version, int64, error)) { - fake.listMutex.Lock() - defer fake.listMutex.Unlock() - fake.ListStub = stub -} - -func (fake *FakeVersionService) ListArgsForCall(i int) (context.Context, domain.ListVersionsParams) { - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - argsForCall := fake.listArgsForCall[i] - return argsForCall.arg1, argsForCall.arg2 -} - -func (fake *FakeVersionService) ListReturns(result1 []domain.Version, result2 int64, result3 error) { - fake.listMutex.Lock() - defer fake.listMutex.Unlock() - fake.ListStub = nil - fake.listReturns = struct { - result1 []domain.Version - result2 int64 - result3 error - }{result1, result2, result3} -} - -func (fake *FakeVersionService) ListReturnsOnCall(i int, result1 []domain.Version, result2 int64, result3 error) { - fake.listMutex.Lock() - defer fake.listMutex.Unlock() - fake.ListStub = nil - if fake.listReturnsOnCall == nil { - fake.listReturnsOnCall = make(map[int]struct { - result1 []domain.Version - result2 int64 - result3 error - }) - } - fake.listReturnsOnCall[i] = struct { - result1 []domain.Version - result2 int64 - result3 error - }{result1, result2, result3} -} - -func (fake *FakeVersionService) Invocations() map[string][][]interface{} { - fake.invocationsMutex.RLock() - defer fake.invocationsMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - copiedInvocations := map[string][][]interface{}{} - for key, value := range fake.invocations { - copiedInvocations[key] = value - } - return copiedInvocations -} - -func (fake *FakeVersionService) recordInvocation(key string, args []interface{}) { - fake.invocationsMutex.Lock() - defer fake.invocationsMutex.Unlock() - if fake.invocations == nil { - fake.invocations = map[string][][]interface{}{} - } - if fake.invocations[key] == nil { - fake.invocations[key] = [][]interface{}{} - } - fake.invocations[key] = append(fake.invocations[key], args) -} - -var _ rest.VersionService = new(FakeVersionService) diff --git a/internal/service/internal/mock/.gitignore b/internal/service/internal/mock/.gitignore new file mode 100644 index 0000000..bc7b52c --- /dev/null +++ b/internal/service/internal/mock/.gitignore @@ -0,0 +1 @@ +*.gen.go diff --git a/internal/service/internal/mock/open_servers_getter.gen.go b/internal/service/internal/mock/open_servers_getter.gen.go deleted file mode 100644 index 4872113..0000000 --- a/internal/service/internal/mock/open_servers_getter.gen.go +++ /dev/null @@ -1,120 +0,0 @@ -// Code generated by counterfeiter. DO NOT EDIT. -package mock - -import ( - "context" - "sync" - - "gitea.dwysokinski.me/twhelp/core/internal/domain" - "gitea.dwysokinski.me/twhelp/core/internal/service" -) - -type FakeOpenServersGetter struct { - GetOpenServersStub func(context.Context, string) ([]domain.OpenServer, error) - getOpenServersMutex sync.RWMutex - getOpenServersArgsForCall []struct { - arg1 context.Context - arg2 string - } - getOpenServersReturns struct { - result1 []domain.OpenServer - result2 error - } - getOpenServersReturnsOnCall map[int]struct { - result1 []domain.OpenServer - result2 error - } - invocations map[string][][]interface{} - invocationsMutex sync.RWMutex -} - -func (fake *FakeOpenServersGetter) GetOpenServers(arg1 context.Context, arg2 string) ([]domain.OpenServer, error) { - fake.getOpenServersMutex.Lock() - ret, specificReturn := fake.getOpenServersReturnsOnCall[len(fake.getOpenServersArgsForCall)] - fake.getOpenServersArgsForCall = append(fake.getOpenServersArgsForCall, struct { - arg1 context.Context - arg2 string - }{arg1, arg2}) - stub := fake.GetOpenServersStub - fakeReturns := fake.getOpenServersReturns - fake.recordInvocation("GetOpenServers", []interface{}{arg1, arg2}) - fake.getOpenServersMutex.Unlock() - if stub != nil { - return stub(arg1, arg2) - } - if specificReturn { - return ret.result1, ret.result2 - } - return fakeReturns.result1, fakeReturns.result2 -} - -func (fake *FakeOpenServersGetter) GetOpenServersCallCount() int { - fake.getOpenServersMutex.RLock() - defer fake.getOpenServersMutex.RUnlock() - return len(fake.getOpenServersArgsForCall) -} - -func (fake *FakeOpenServersGetter) GetOpenServersCalls(stub func(context.Context, string) ([]domain.OpenServer, error)) { - fake.getOpenServersMutex.Lock() - defer fake.getOpenServersMutex.Unlock() - fake.GetOpenServersStub = stub -} - -func (fake *FakeOpenServersGetter) GetOpenServersArgsForCall(i int) (context.Context, string) { - fake.getOpenServersMutex.RLock() - defer fake.getOpenServersMutex.RUnlock() - argsForCall := fake.getOpenServersArgsForCall[i] - return argsForCall.arg1, argsForCall.arg2 -} - -func (fake *FakeOpenServersGetter) GetOpenServersReturns(result1 []domain.OpenServer, result2 error) { - fake.getOpenServersMutex.Lock() - defer fake.getOpenServersMutex.Unlock() - fake.GetOpenServersStub = nil - fake.getOpenServersReturns = struct { - result1 []domain.OpenServer - result2 error - }{result1, result2} -} - -func (fake *FakeOpenServersGetter) GetOpenServersReturnsOnCall(i int, result1 []domain.OpenServer, result2 error) { - fake.getOpenServersMutex.Lock() - defer fake.getOpenServersMutex.Unlock() - fake.GetOpenServersStub = nil - if fake.getOpenServersReturnsOnCall == nil { - fake.getOpenServersReturnsOnCall = make(map[int]struct { - result1 []domain.OpenServer - result2 error - }) - } - fake.getOpenServersReturnsOnCall[i] = struct { - result1 []domain.OpenServer - result2 error - }{result1, result2} -} - -func (fake *FakeOpenServersGetter) Invocations() map[string][][]interface{} { - fake.invocationsMutex.RLock() - defer fake.invocationsMutex.RUnlock() - fake.getOpenServersMutex.RLock() - defer fake.getOpenServersMutex.RUnlock() - copiedInvocations := map[string][][]interface{}{} - for key, value := range fake.invocations { - copiedInvocations[key] = value - } - return copiedInvocations -} - -func (fake *FakeOpenServersGetter) recordInvocation(key string, args []interface{}) { - fake.invocationsMutex.Lock() - defer fake.invocationsMutex.Unlock() - if fake.invocations == nil { - fake.invocations = map[string][][]interface{}{} - } - if fake.invocations[key] == nil { - fake.invocations[key] = [][]interface{}{} - } - fake.invocations[key] = append(fake.invocations[key], args) -} - -var _ service.OpenServersGetter = new(FakeOpenServersGetter) diff --git a/internal/service/internal/mock/server_repository.gen.go b/internal/service/internal/mock/server_repository.gen.go deleted file mode 100644 index e0015d7..0000000 --- a/internal/service/internal/mock/server_repository.gen.go +++ /dev/null @@ -1,206 +0,0 @@ -// Code generated by counterfeiter. DO NOT EDIT. -package mock - -import ( - "context" - "sync" - - "gitea.dwysokinski.me/twhelp/core/internal/domain" - "gitea.dwysokinski.me/twhelp/core/internal/service" -) - -type FakeServerRepository struct { - CreateOrUpdateStub func(context.Context, ...domain.CreateServerParams) ([]domain.Server, error) - createOrUpdateMutex sync.RWMutex - createOrUpdateArgsForCall []struct { - arg1 context.Context - arg2 []domain.CreateServerParams - } - createOrUpdateReturns struct { - result1 []domain.Server - result2 error - } - createOrUpdateReturnsOnCall map[int]struct { - result1 []domain.Server - result2 error - } - ListStub func(context.Context, domain.ListServersParams) ([]domain.Server, int64, error) - listMutex sync.RWMutex - listArgsForCall []struct { - arg1 context.Context - arg2 domain.ListServersParams - } - listReturns struct { - result1 []domain.Server - result2 int64 - result3 error - } - listReturnsOnCall map[int]struct { - result1 []domain.Server - result2 int64 - result3 error - } - invocations map[string][][]interface{} - invocationsMutex sync.RWMutex -} - -func (fake *FakeServerRepository) CreateOrUpdate(arg1 context.Context, arg2 ...domain.CreateServerParams) ([]domain.Server, error) { - fake.createOrUpdateMutex.Lock() - ret, specificReturn := fake.createOrUpdateReturnsOnCall[len(fake.createOrUpdateArgsForCall)] - fake.createOrUpdateArgsForCall = append(fake.createOrUpdateArgsForCall, struct { - arg1 context.Context - arg2 []domain.CreateServerParams - }{arg1, arg2}) - stub := fake.CreateOrUpdateStub - fakeReturns := fake.createOrUpdateReturns - fake.recordInvocation("CreateOrUpdate", []interface{}{arg1, arg2}) - fake.createOrUpdateMutex.Unlock() - if stub != nil { - return stub(arg1, arg2...) - } - if specificReturn { - return ret.result1, ret.result2 - } - return fakeReturns.result1, fakeReturns.result2 -} - -func (fake *FakeServerRepository) CreateOrUpdateCallCount() int { - fake.createOrUpdateMutex.RLock() - defer fake.createOrUpdateMutex.RUnlock() - return len(fake.createOrUpdateArgsForCall) -} - -func (fake *FakeServerRepository) CreateOrUpdateCalls(stub func(context.Context, ...domain.CreateServerParams) ([]domain.Server, error)) { - fake.createOrUpdateMutex.Lock() - defer fake.createOrUpdateMutex.Unlock() - fake.CreateOrUpdateStub = stub -} - -func (fake *FakeServerRepository) CreateOrUpdateArgsForCall(i int) (context.Context, []domain.CreateServerParams) { - fake.createOrUpdateMutex.RLock() - defer fake.createOrUpdateMutex.RUnlock() - argsForCall := fake.createOrUpdateArgsForCall[i] - return argsForCall.arg1, argsForCall.arg2 -} - -func (fake *FakeServerRepository) CreateOrUpdateReturns(result1 []domain.Server, result2 error) { - fake.createOrUpdateMutex.Lock() - defer fake.createOrUpdateMutex.Unlock() - fake.CreateOrUpdateStub = nil - fake.createOrUpdateReturns = struct { - result1 []domain.Server - result2 error - }{result1, result2} -} - -func (fake *FakeServerRepository) CreateOrUpdateReturnsOnCall(i int, result1 []domain.Server, result2 error) { - fake.createOrUpdateMutex.Lock() - defer fake.createOrUpdateMutex.Unlock() - fake.CreateOrUpdateStub = nil - if fake.createOrUpdateReturnsOnCall == nil { - fake.createOrUpdateReturnsOnCall = make(map[int]struct { - result1 []domain.Server - result2 error - }) - } - fake.createOrUpdateReturnsOnCall[i] = struct { - result1 []domain.Server - result2 error - }{result1, result2} -} - -func (fake *FakeServerRepository) List(arg1 context.Context, arg2 domain.ListServersParams) ([]domain.Server, int64, error) { - fake.listMutex.Lock() - ret, specificReturn := fake.listReturnsOnCall[len(fake.listArgsForCall)] - fake.listArgsForCall = append(fake.listArgsForCall, struct { - arg1 context.Context - arg2 domain.ListServersParams - }{arg1, arg2}) - stub := fake.ListStub - fakeReturns := fake.listReturns - fake.recordInvocation("List", []interface{}{arg1, arg2}) - fake.listMutex.Unlock() - if stub != nil { - return stub(arg1, arg2) - } - if specificReturn { - return ret.result1, ret.result2, ret.result3 - } - return fakeReturns.result1, fakeReturns.result2, fakeReturns.result3 -} - -func (fake *FakeServerRepository) ListCallCount() int { - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - return len(fake.listArgsForCall) -} - -func (fake *FakeServerRepository) ListCalls(stub func(context.Context, domain.ListServersParams) ([]domain.Server, int64, error)) { - fake.listMutex.Lock() - defer fake.listMutex.Unlock() - fake.ListStub = stub -} - -func (fake *FakeServerRepository) ListArgsForCall(i int) (context.Context, domain.ListServersParams) { - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - argsForCall := fake.listArgsForCall[i] - return argsForCall.arg1, argsForCall.arg2 -} - -func (fake *FakeServerRepository) ListReturns(result1 []domain.Server, result2 int64, result3 error) { - fake.listMutex.Lock() - defer fake.listMutex.Unlock() - fake.ListStub = nil - fake.listReturns = struct { - result1 []domain.Server - result2 int64 - result3 error - }{result1, result2, result3} -} - -func (fake *FakeServerRepository) ListReturnsOnCall(i int, result1 []domain.Server, result2 int64, result3 error) { - fake.listMutex.Lock() - defer fake.listMutex.Unlock() - fake.ListStub = nil - if fake.listReturnsOnCall == nil { - fake.listReturnsOnCall = make(map[int]struct { - result1 []domain.Server - result2 int64 - result3 error - }) - } - fake.listReturnsOnCall[i] = struct { - result1 []domain.Server - result2 int64 - result3 error - }{result1, result2, result3} -} - -func (fake *FakeServerRepository) Invocations() map[string][][]interface{} { - fake.invocationsMutex.RLock() - defer fake.invocationsMutex.RUnlock() - fake.createOrUpdateMutex.RLock() - defer fake.createOrUpdateMutex.RUnlock() - fake.listMutex.RLock() - defer fake.listMutex.RUnlock() - copiedInvocations := map[string][][]interface{}{} - for key, value := range fake.invocations { - copiedInvocations[key] = value - } - return copiedInvocations -} - -func (fake *FakeServerRepository) recordInvocation(key string, args []interface{}) { - fake.invocationsMutex.Lock() - defer fake.invocationsMutex.Unlock() - if fake.invocations == nil { - fake.invocations = map[string][][]interface{}{} - } - if fake.invocations[key] == nil { - fake.invocations[key] = [][]interface{}{} - } - fake.invocations[key] = append(fake.invocations[key], args) -} - -var _ service.ServerRepository = new(FakeServerRepository)