htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructure project

Browse Source 
We previously didn't really had any structure in our project apart
from creating a new folder for each package in our project root.
Now that we have accumulated some packages, we use the well-known
Golang project layout in order to clearly communicate our intent
with packages. See https://github.com/golang-standards/project-layout
This commit is contained in:
sirkrypt0
2021-07-16 09:19:42 +02:00
parent 2f1383b743
commit 8b26ecbe5f
66 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
# Project binary # Project binary
poseidon /poseidon
# Configuration file # Configuration file
configuration.yaml configuration.yaml

18
.gitlab-ci.yml
View File

@ -77,7 +77,7 @@ dockerimage:
# Prevent pull rate limit but still have normal alpine image in Dockerfile # Prevent pull rate limit but still have normal alpine image in Dockerfile
- docker pull $DOCKER_REGISTRY/library/alpine:latest - docker pull $DOCKER_REGISTRY/library/alpine:latest
- docker tag $DOCKER_REGISTRY/library/alpine:latest alpine:latest - docker tag $DOCKER_REGISTRY/library/alpine:latest alpine:latest
- docker build -t $IMAGE_NAME_ENV . - docker build -t $IMAGE_NAME_ENV -f deploy/poseidon/Dockerfile .
# Run vulnerability scan before pushing the image # Run vulnerability scan before pushing the image
- make trivy-scan-docker DOCKER_TAG=$IMAGE_NAME_ENV - make trivy-scan-docker DOCKER_TAG=$IMAGE_NAME_ENV
- docker push $IMAGE_NAME_ENV - docker push $IMAGE_NAME_ENV
@ -98,7 +98,7 @@ nomadimage:
alias: docker alias: docker
needs: [] needs: []
script: script:
- cd ci - cd deploy/nomad-ci
- docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY - docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY
- docker pull $DOCKER_REGISTRY/library/golang:latest - docker pull $DOCKER_REGISTRY/library/golang:latest
- docker tag $DOCKER_REGISTRY/library/golang:latest golang:latest - docker tag $DOCKER_REGISTRY/library/golang:latest golang:latest
@ -131,7 +131,7 @@ test_e2e:
- nomad agent -dev -log-level=WARN & - nomad agent -dev -log-level=WARN &
- sleep 5 - sleep 5
- export NOMAD_NAMESPACE="default" - export NOMAD_NAMESPACE="default"
- ./ci/nomad-run-env-job.sh ci/demo-job.tpl.nomad ci/demo-job.nomad - ./deploy/nomad-run-env-job.sh deploy/demo-job.tpl.nomad deploy/demo-job.nomad
- sleep 5 - sleep 5
# Start Poseidon and wait for it # Start Poseidon and wait for it
- ./poseidon & - ./poseidon &
@ -151,15 +151,15 @@ test_e2e:
- nomad namespace apply $NOMAD_NAMESPACE - nomad namespace apply $NOMAD_NAMESPACE
script: script:
# Only replace set env vars # Only replace set env vars
- envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < ci/api.tpl.nomad > ci/api.nomad - envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < deploy/api.tpl.nomad > deploy/api.nomad
# Make sure to set NOMAD_ADDR, NOMAD_SKIP_VERIFY and NOMAD_TOKEN env vars in CI settings appropriately # Make sure to set NOMAD_ADDR, NOMAD_SKIP_VERIFY and NOMAD_TOKEN env vars in CI settings appropriately
- nomad validate ci/api.nomad - nomad validate deploy/api.nomad
# nomad plan returns 1 if allocation is created or destroyed which is what we want here # nomad plan returns 1 if allocation is created or destroyed which is what we want here
- nomad plan ci/api.nomad || [ $? == 1 ] - nomad plan deploy/api.nomad || [ $? == 1 ]
- nomad-run-and-wait ci/api.nomad - nomad-run-and-wait deploy/api.nomad
artifacts: artifacts:
paths: paths:
- ci/api.nomad - deploy/api.nomad
expire_in: 1 month expire_in: 1 month
expose_as: api-nomad expose_as: api-nomad
@ -174,7 +174,7 @@ deploy_review:
before_script: before_script:
- export NOMAD_NAMESPACE="$NOMAD_SLUG" - export NOMAD_NAMESPACE="$NOMAD_SLUG"
- nomad namespace apply $NOMAD_NAMESPACE - nomad namespace apply $NOMAD_NAMESPACE
- ./ci/nomad-run-env-job.sh ci/demo-job.tpl.nomad ci/demo-job.nomad - ./deploy/nomad-run-env-job.sh deploy/demo-job.tpl.nomad deploy/demo-job.nomad
only: only:
- branches - branches
- tags - tags

8
Makefile
View File

@ -1,5 +1,5 @@
PROJECT_NAME := "poseidon" PROJECT_NAME := "poseidon"
PKG := "gitlab.hpi.de/codeocean/codemoon/$(PROJECT_NAME)" PKG := "gitlab.hpi.de/codeocean/codemoon/$(PROJECT_NAME)/cmd/$(PROJECT_NAME)"
UNIT_TESTS = $(shell go list ./... | grep -v /e2e) UNIT_TESTS = $(shell go list ./... | grep -v /e2e)
DOCKER_E2E_CONTAINER_NAME := "$(PROJECT_NAME)-e2e-tests" DOCKER_E2E_CONTAINER_NAME := "$(PROJECT_NAME)-e2e-tests"
@ -28,16 +28,16 @@ git-hooks: .git/hooks/pre-commit ## Install the git-hooks
.PHONY: build .PHONY: build
build: deps ## Build the binary build: deps ## Build the binary
@go build -v $(PKG) @go build -o $(PROJECT_NAME) -v $(PKG)
.PHONY: clean .PHONY: clean
clean: ## Remove previous build clean: ## Remove previous build
@rm -f $(PROJECT_NAME) @rm -f poseidon
.PHONY: docker .PHONY: docker
docker: docker:
@CGO_ENABLED=0 make build @CGO_ENABLED=0 make build
@docker build -t $(DOCKER_TAG) . @docker build -t $(DOCKER_TAG) -f deploy/poseidon/Dockerfile .
.PHONY: lint-deps .PHONY: lint-deps
lint-deps: ## Install linter dependencies lint-deps: ## Install linter dependencies

4
README.md
View File

@ -11,7 +11,7 @@ To get your local setup going, run `make bootstrap`. It will install all require
The project can be compiled using `make build`. This should create a binary which can then be executed. The project can be compiled using `make build`. This should create a binary which can then be executed.
Alternatively, the `go run .` command can be used to automatically compile and run the project. Alternatively, the `go run ./cmd/poseidon` command can be used to automatically compile and run the project.
### Docker ### Docker
@ -55,7 +55,7 @@ If a value is not specified, the value of the subsequent possibility is used.
### Documentation ### Documentation
For the OpenAPI 3.0 definition of the API Poseidon provides, see [`swagger.yaml`](docs/swagger.yaml). For the OpenAPI 3.0 definition of the API Poseidon provides, see [`swagger.yaml`](api/swagger.yaml).
### Authentication ### Authentication

0
docs/swagger.yaml → api/swagger.yaml
View File

0
docs/websocket.schema.json → api/websocket.schema.json
View File

12
main.go → cmd/poseidon/main.go
View File

@ -3,12 +3,12 @@ package main
import ( import (
"context" "context"
"errors" "errors"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"gitlab.hpi.de/codeocean/codemoon/poseidon/environment" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/environment"
"gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"

0
ci/api.tpl.nomad → deploy/api.tpl.nomad
View File

0
ci/demo-job.tpl.nomad → deploy/demo-job.tpl.nomad
View File

0
ci/docker-make/Dockerfile → deploy/docker-make/Dockerfile
View File

0
ci/Dockerfile → deploy/nomad-ci/Dockerfile
View File

0
ci/nomad-run-and-wait → deploy/nomad-ci/nomad-run-and-wait
View File

0
ci/nomad-run-env-job.sh → deploy/nomad-run-env-job.sh
View File

0
Dockerfile → deploy/poseidon/Dockerfile
View File

8
api/api.go → internal/api/api.go
View File

@ -2,10 +2,10 @@ package api
import ( import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/auth" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api/auth"
"gitlab.hpi.de/codeocean/codemoon/poseidon/environment" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/environment"
"gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
"net/http" "net/http"
) )

2
api/api_test.go → internal/api/api_test.go
View File

@ -3,7 +3,7 @@ package api
import ( import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"testing" "testing"

4
api/auth/auth.go → internal/api/auth/auth.go
View File

@ -2,8 +2,8 @@ package auth
import ( import (
"crypto/subtle" "crypto/subtle"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
"net/http" "net/http"
) )

2
api/auth/auth_test.go → internal/api/auth/auth_test.go
View File

@ -5,7 +5,7 @@ import (
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"testing" "testing"

6
api/environments.go → internal/api/environments.go
View File

@ -5,9 +5,9 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/environment"
"gitlab.hpi.de/codeocean/codemoon/poseidon/environment" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"net/http" "net/http"
) )

6
api/environments_test.go → internal/api/environments_test.go
View File

@ -6,9 +6,9 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/environment"
"gitlab.hpi.de/codeocean/codemoon/poseidon/environment" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"math" "math"
"net/http" "net/http"

0
api/health.go → internal/api/health.go
View File

0
api/health_test.go → internal/api/health_test.go
View File

2
api/helpers.go → internal/api/helpers.go
View File

@ -3,7 +3,7 @@ package api
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"net/http" "net/http"
) )

6
api/runners.go → internal/api/runners.go
View File

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"net/http" "net/http"
"net/url" "net/url"
) )

4
api/runners_test.go → internal/api/runners_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"

4
api/websocket.go → internal/api/websocket.go
View File

@ -6,8 +6,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"io" "io"
"net/http" "net/http"
) )

0
api/websocket_connection_mock.go → internal/api/websocket_connection_mock.go
View File

6
api/websocket_test.go → internal/api/websocket_test.go
View File

@ -12,9 +12,9 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
"io" "io"

2
config/config.go → internal/config/config.go
View File

@ -6,7 +6,7 @@ import (
"flag" "flag"
"fmt" "fmt"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"net/url" "net/url"
"os" "os"

0
config/config_test.go → internal/config/config_test.go
View File

8
environment/manager.go → internal/environment/manager.go
View File

@ -6,10 +6,10 @@ import (
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/jobspec2" "github.com/hashicorp/nomad/jobspec2"
"github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
"strconv" "strconv"
) )

4
environment/manager_mock.go → internal/environment/manager_mock.go
View File

@ -4,9 +4,9 @@ package environment
import ( import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
dto "gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" dto "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
runner "gitlab.hpi.de/codeocean/codemoon/poseidon/runner" runner "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
) )
// ManagerMock is an autogenerated mock type for the Manager type // ManagerMock is an autogenerated mock type for the Manager type

6
environment/manager_test.go → internal/environment/manager_test.go
View File

@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"testing" "testing"
) )

0
environment/template-environment-job.hcl → internal/environment/template-environment-job.hcl
View File

0
nomad/api_querier.go → internal/nomad/api_querier.go
View File

0
nomad/api_querier_mock.go → internal/nomad/api_querier_mock.go
View File

0
nomad/executor_api_mock.go → internal/nomad/executor_api_mock.go
View File

0
nomad/job.go → internal/nomad/job.go
View File

0
nomad/job_test.go → internal/nomad/job_test.go
View File

8
nomad/nomad.go → internal/nomad/nomad.go
View File

@ -6,9 +6,9 @@ import (
"fmt" "fmt"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
"gitlab.hpi.de/codeocean/codemoon/poseidon/util" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/nullreader"
"io" "io"
"net/url" "net/url"
"strconv" "strconv"
@ -348,7 +348,7 @@ func (a *APIClient) executeCommandInteractivelyWithStderr(allocationID string, c
go func() { go func() {
// Catch stderr in separate execution. // Catch stderr in separate execution.
exit, err := a.Execute(allocationID, ctx, stderrFifoCommand(currentNanoTime), true, exit, err := a.Execute(allocationID, ctx, stderrFifoCommand(currentNanoTime), true,
util.NullReader{}, stderr, io.Discard) nullreader.NullReader{}, stderr, io.Discard)
if err != nil { if err != nil {
log.WithError(err).WithField("runner", allocationID).Warn("Stderr task finished with error") log.WithError(err).WithField("runner", allocationID).Warn("Stderr task finished with error")
} }

12
nomad/nomad_test.go → internal/nomad/nomad_test.go
View File

@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/nullreader"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"gitlab.hpi.de/codeocean/codemoon/poseidon/util"
"io" "io"
"net/url" "net/url"
"regexp" "regexp"
@ -678,7 +678,7 @@ func (s *ExecuteCommandTestSuite) TestWithSeparateStderr() {
}) })
exitCode, err := s.nomadAPIClient. exitCode, err := s.nomadAPIClient.
ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, util.NullReader{}, &stdout, &stderr) ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, nullreader.NullReader{}, &stdout, &stderr)
s.Require().NoError(err) s.Require().NoError(err)
s.apiMock.AssertNumberOfCalls(s.T(), "Execute", 2) s.apiMock.AssertNumberOfCalls(s.T(), "Execute", 2)
@ -709,7 +709,7 @@ func (s *ExecuteCommandTestSuite) TestWithSeparateStderrReturnsCommandError() {
s.mockExecute(s.testCommandArray, 1, tests.ErrDefault, func(args mock.Arguments) {}) s.mockExecute(s.testCommandArray, 1, tests.ErrDefault, func(args mock.Arguments) {})
s.mockExecute(mock.AnythingOfType("[]string"), 1, nil, func(args mock.Arguments) {}) s.mockExecute(mock.AnythingOfType("[]string"), 1, nil, func(args mock.Arguments) {})
_, err := s.nomadAPIClient. _, err := s.nomadAPIClient.
ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, util.NullReader{}, io.Discard, io.Discard) ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, nullreader.NullReader{}, io.Discard, io.Discard)
s.Equal(tests.ErrDefault, err) s.Equal(tests.ErrDefault, err)
} }
@ -731,7 +731,7 @@ func (s *ExecuteCommandTestSuite) TestWithoutSeparateStderr() {
}) })
exitCode, err := s.nomadAPIClient. exitCode, err := s.nomadAPIClient.
ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, util.NullReader{}, &stdout, &stderr) ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, nullreader.NullReader{}, &stdout, &stderr)
s.Require().NoError(err) s.Require().NoError(err)
s.apiMock.AssertNumberOfCalls(s.T(), "Execute", 1) s.apiMock.AssertNumberOfCalls(s.T(), "Execute", 1)
@ -744,7 +744,7 @@ func (s *ExecuteCommandTestSuite) TestWithoutSeparateStderrReturnsCommandError()
config.Config.Server.InteractiveStderr = false config.Config.Server.InteractiveStderr = false
s.mockExecute(s.testCommandArray, 1, tests.ErrDefault, func(args mock.Arguments) {}) s.mockExecute(s.testCommandArray, 1, tests.ErrDefault, func(args mock.Arguments) {})
_, err := s.nomadAPIClient. _, err := s.nomadAPIClient.
ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, util.NullReader{}, io.Discard, io.Discard) ExecuteCommand(s.allocationID, s.ctx, s.testCommandArray, withTTY, nullreader.NullReader{}, io.Discard, io.Discard)
s.ErrorIs(err, tests.ErrDefault) s.ErrorIs(err, tests.ErrDefault)
} }

0
runner/constants_test.go → internal/runner/constants_test.go
View File

2
runner/execution_storage.go → internal/runner/execution_storage.go
View File

@ -1,7 +1,7 @@
package runner package runner
import ( import (
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"sync" "sync"
) )

0
runner/inactivity_timer_mock.go → internal/runner/inactivity_timer_mock.go
View File

4
runner/manager.go → internal/runner/manager.go
View File

@ -7,8 +7,8 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
"strconv" "strconv"
"strings" "strings"
"time" "time"

0
runner/manager_mock.go → internal/runner/manager_mock.go
View File

2
runner/manager_test.go → internal/runner/manager_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/sirupsen/logrus/hooks/test" "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
"strconv" "strconv"

0
runner/nomad_environment_storage.go → internal/runner/nomad_environment_storage.go
View File

0
runner/nomad_environment_storage_test.go → internal/runner/nomad_environment_storage_test.go
View File

4
runner/runner.go → internal/runner/runner.go
View File

@ -8,8 +8,8 @@ import (
"errors" "errors"
"fmt" "fmt"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"io" "io"
"strings" "strings"
"sync" "sync"

2
runner/runner_mock.go → internal/runner/runner_mock.go
View File

@ -6,7 +6,7 @@ import (
context "context" context "context"
io "io" io "io"
dto "gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" dto "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"

4
runner/runner_test.go → internal/runner/runner_test.go
View File

@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"io" "io"
"regexp" "regexp"

0
runner/storage.go → internal/runner/storage.go
View File

2
runner/storage_test.go → internal/runner/storage_test.go
View File

@ -2,7 +2,7 @@ package runner
import ( import (
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"testing" "testing"
) )

0
api/dto/dto.go → pkg/dto/dto.go
View File

0
logging/logging.go → pkg/logging/logging.go
View File

0
logging/logging_test.go → pkg/logging/logging_test.go
View File

2
util/util.go → pkg/nullreader/nullreader.go
View File

@ -1,4 +1,4 @@
package util package nullreader
// NullReader is a struct that implements the io.Reader interface and returns nothing when reading // NullReader is a struct that implements the io.Reader interface and returns nothing when reading
// from it. // from it.

2
util/util_test.go → pkg/nullreader/nullreader_test.go
View File

@ -1,4 +1,4 @@
package util package nullreader
import ( import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
tests/constants.go
View File

@ -3,7 +3,7 @@ package tests
import ( import (
"errors" "errors"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"time" "time"
) )

8
tests/e2e/e2e_test.go
View File

@ -4,10 +4,10 @@ import (
"flag" "flag"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/logging" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/logging"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
"net/http" "net/http"

6
tests/e2e/environments_test.go
View File

@ -4,9 +4,9 @@ import (
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/runner"
"gitlab.hpi.de/codeocean/codemoon/poseidon/runner" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
"io" "io"

2
tests/e2e/health_test.go
View File

@ -2,7 +2,7 @@ package e2e
import ( import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
"net/http" "net/http"
"testing" "testing"

4
tests/e2e/runners_test.go
View File

@ -5,8 +5,8 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
"io" "io"

6
tests/e2e/websocket_test.go
View File

@ -7,9 +7,9 @@ import (
"fmt" "fmt"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/nomad"
"gitlab.hpi.de/codeocean/codemoon/poseidon/nomad" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests/helpers"
"net/http" "net/http"

4
tests/helpers/test_helpers.go
View File

@ -10,8 +10,8 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
nomadApi "github.com/hashicorp/nomad/api" nomadApi "github.com/hashicorp/nomad/api"
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto" "gitlab.hpi.de/codeocean/codemoon/poseidon/internal/config"
"gitlab.hpi.de/codeocean/codemoon/poseidon/config" "gitlab.hpi.de/codeocean/codemoon/poseidon/pkg/dto"
"gitlab.hpi.de/codeocean/codemoon/poseidon/tests" "gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
"io" "io"
"net/http" "net/http"