refactor: move api, client, compose packages to pkg

This commit is contained in:
Pavel Sviderski
2025-03-22 18:43:00 +10:00
parent 3757813b20
commit b1abd07dde
42 changed files with 82 additions and 82 deletions
+2 -2
View File
@@ -8,14 +8,14 @@ import (
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/caddy/v2/modules/caddyhttp/reverseproxy"
"github.com/psviderski/uncloud/internal/machine/docker"
"github.com/psviderski/uncloud/pkg/api"
"log/slog"
"maps"
"net"
"net/http"
"slices"
"strconv"
"github.com/psviderski/uncloud/internal/api"
"github.com/psviderski/uncloud/internal/machine/docker"
)
func GenerateConfig(containers []api.Container, verifyResponse string) (*caddy.Config, error) {
+2 -2
View File
@@ -4,12 +4,12 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
"github.com/psviderski/uncloud/internal/machine/docker"
"github.com/psviderski/uncloud/pkg/api"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"strings"
"testing"
"github.com/psviderski/uncloud/internal/api"
"github.com/psviderski/uncloud/internal/machine/docker"
)
func TestGenerateConfig(t *testing.T) {
+3 -3
View File
@@ -4,12 +4,12 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/psviderski/uncloud/internal/fs"
"github.com/psviderski/uncloud/internal/machine/store"
"github.com/psviderski/uncloud/pkg/api"
"log/slog"
"os"
"path/filepath"
"github.com/psviderski/uncloud/internal/api"
"github.com/psviderski/uncloud/internal/fs"
"github.com/psviderski/uncloud/internal/machine/store"
)
const (
+2 -2
View File
@@ -8,10 +8,10 @@ import (
"github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client"
"github.com/psviderski/uncloud/internal/machine/store"
"github.com/psviderski/uncloud/pkg/api"
"log/slog"
"time"
"github.com/psviderski/uncloud/internal/api"
"github.com/psviderski/uncloud/internal/machine/store"
)
const (
+1 -1
View File
@@ -5,10 +5,10 @@ import (
"encoding/json"
"fmt"
sq "github.com/Masterminds/squirrel"
"github.com/psviderski/uncloud/pkg/api"
"log/slog"
"strings"
"time"
"github.com/psviderski/uncloud/internal/api"
)
const (