Skip to content

Commit

Permalink
build: update dependencies and go version
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomasevano committed Jun 20, 2024
1 parent f54b7b9 commit 046f8a4
Show file tree
Hide file tree
Showing 65 changed files with 196 additions and 572 deletions.
4 changes: 2 additions & 2 deletions api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# syntax=docker/dockerfile:1

FROM golang:1.20-alpine
FROM golang:1.22-alpine

WORKDIR /app

COPY go.mod go.sum /app/

RUN go mod download && go mod verify

RUN go install github.com/cosmtrek/air@latest
RUN go install github.com/air-verse/air@latest
RUN go install github.com/swaggo/swag/cmd/swag@latest
RUN go install github.com/golangci/golangci-lint/cmd/[email protected]

Expand Down
27 changes: 14 additions & 13 deletions api/go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
module github.com/RomainDreidemy/MT5-docker-extension
module github.com/Thomasevano/EasyDocker

go 1.20
go 1.22

require (
github.com/go-playground/validator/v10 v10.14.1
github.com/gofiber/fiber/v2 v2.47.0
github.com/gofiber/swagger v0.1.12
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/golang-migrate/migrate/v4 v4.16.2
github.com/google/uuid v1.3.0
github.com/google/uuid v1.4.0
github.com/ory/dockertest/v3 v3.10.0
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.8.3
github.com/stretchr/testify v1.8.4
github.com/swaggo/swag v1.16.1
golang.org/x/crypto v0.10.0
golang.org/x/crypto v0.16.0
gopkg.in/yaml.v3 v3.0.1
gorm.io/driver/postgres v1.5.2
gorm.io/gorm v1.25.1
Expand All @@ -27,12 +27,13 @@ require (
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/creack/pty v1.1.21 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.17+incompatible // indirect
github.com/docker/docker v20.10.24+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand All @@ -58,23 +59,23 @@ require (
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/philhofer/fwd v1.1.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
github.com/sirupsen/logrus v1.9.2 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
Expand All @@ -88,9 +89,9 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/net v0.11.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.10.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
449 changes: 37 additions & 412 deletions api/go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions api/src/controllers/auth_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package controllers

import (
"fmt"
"github.com/RomainDreidemy/MT5-docker-extension/src/helpers"
"github.com/RomainDreidemy/MT5-docker-extension/src/initializers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/Thomasevano/EasyDocker/src/helpers"
"github.com/Thomasevano/EasyDocker/src/initializers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/gofiber/fiber/v2"
"github.com/golang-jwt/jwt"
"golang.org/x/crypto/bcrypt"
Expand Down
8 changes: 4 additions & 4 deletions api/src/controllers/board_controller.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
8 changes: 4 additions & 4 deletions api/src/controllers/concerns/service_relations_concern.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package concerns

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/helpers"
"github.com/RomainDreidemy/MT5-docker-extension/src/initializers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/helpers"
"github.com/Thomasevano/EasyDocker/src/initializers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
"gorm.io/gorm"
)
Expand Down
8 changes: 4 additions & 4 deletions api/src/controllers/docker_compose_controller.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/docker_compose"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/docker_compose"
"github.com/gofiber/fiber/v2"
)

Expand Down
10 changes: 5 additions & 5 deletions api/src/controllers/managed_volume_controller.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/helpers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/helpers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
10 changes: 5 additions & 5 deletions api/src/controllers/network_controller.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/helpers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/helpers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
10 changes: 5 additions & 5 deletions api/src/controllers/service_controller.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/helpers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/helpers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
10 changes: 5 additions & 5 deletions api/src/controllers/service_env_variable_controller.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/controllers/concerns"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/controllers/concerns"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
12 changes: 6 additions & 6 deletions api/src/controllers/service_managed_volume_link_controller.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/helpers"
"github.com/RomainDreidemy/MT5-docker-extension/src/initializers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/helpers"
"github.com/Thomasevano/EasyDocker/src/initializers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
12 changes: 6 additions & 6 deletions api/src/controllers/service_network_link_controller.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/helpers"
"github.com/RomainDreidemy/MT5-docker-extension/src/initializers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/helpers"
"github.com/Thomasevano/EasyDocker/src/initializers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
10 changes: 5 additions & 5 deletions api/src/controllers/service_port_controller.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/controllers/concerns"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/controllers/concerns"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
10 changes: 5 additions & 5 deletions api/src/controllers/service_volume_controller.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/controllers/concerns"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/controllers/concerns"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
16 changes: 8 additions & 8 deletions api/src/controllers/stack_controller.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/helpers"
"github.com/RomainDreidemy/MT5-docker-extension/src/initializers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/policies"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/create_by_file"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/duplication"
"github.com/RomainDreidemy/MT5-docker-extension/src/services/factories"
"github.com/Thomasevano/EasyDocker/src/helpers"
"github.com/Thomasevano/EasyDocker/src/initializers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/policies"
"github.com/Thomasevano/EasyDocker/src/repositories"
"github.com/Thomasevano/EasyDocker/src/services/create_by_file"
"github.com/Thomasevano/EasyDocker/src/services/duplication"
"github.com/Thomasevano/EasyDocker/src/services/factories"
"github.com/gofiber/fiber/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions api/src/controllers/stack_controller_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package controllers_test

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/controllers"
middleware "github.com/RomainDreidemy/MT5-docker-extension/src/middlewares"
"github.com/RomainDreidemy/MT5-docker-extension/src/test_helpers"
"github.com/Thomasevano/EasyDocker/src/controllers"
middleware "github.com/Thomasevano/EasyDocker/src/middlewares"
"github.com/Thomasevano/EasyDocker/src/test_helpers"
"github.com/gofiber/fiber/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
Expand Down
2 changes: 1 addition & 1 deletion api/src/controllers/user_controller.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package controllers

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/gofiber/fiber/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion api/src/initializers/db_initializer.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package initializers

import (
"fmt"
. "github.com/RomainDreidemy/MT5-docker-extension/src/models"
. "github.com/Thomasevano/EasyDocker/src/models"
"gorm.io/driver/postgres"
"gorm.io/gorm"
"gorm.io/gorm/logger"
Expand Down
4 changes: 2 additions & 2 deletions api/src/middlewares/deserialize_user_middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package middleware

import (
"fmt"
"github.com/RomainDreidemy/MT5-docker-extension/src/initializers"
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/Thomasevano/EasyDocker/src/initializers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/gofiber/fiber/v2"
"github.com/golang-jwt/jwt"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions api/src/models/stack_model_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package models_test

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/test_helpers"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/test_helpers"
"testing"
)

Expand Down
4 changes: 2 additions & 2 deletions api/src/policies/managed_volume_policy.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package policies

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/repositories"
)

// CanAccessVolume checks if a user can access a network by
Expand Down
4 changes: 2 additions & 2 deletions api/src/policies/network_policy.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package policies

import (
"github.com/RomainDreidemy/MT5-docker-extension/src/models"
"github.com/RomainDreidemy/MT5-docker-extension/src/repositories"
"github.com/Thomasevano/EasyDocker/src/models"
"github.com/Thomasevano/EasyDocker/src/repositories"
)

// CanAccessNetwork checks if a user can access a network by
Expand Down
Loading

0 comments on commit 046f8a4

Please sign in to comment.