diff --git a/cmd/ucind/cluster/create.go b/cmd/ucind/cluster/create.go index f91de85a..2e23c648 100644 --- a/cmd/ucind/cluster/create.go +++ b/cmd/ucind/cluster/create.go @@ -3,7 +3,7 @@ package cluster import ( "fmt" "github.com/spf13/cobra" - "uncloud/internal/ucind" + "github.com/psviderski/uncloud/internal/ucind" ) func NewCreateCommand() *cobra.Command { diff --git a/cmd/ucind/cluster/remove.go b/cmd/ucind/cluster/remove.go index 4a791733..ce82721f 100644 --- a/cmd/ucind/cluster/remove.go +++ b/cmd/ucind/cluster/remove.go @@ -3,7 +3,7 @@ package cluster import ( "fmt" "github.com/spf13/cobra" - "uncloud/internal/ucind" + "github.com/psviderski/uncloud/internal/ucind" ) func NewRemoveCommand() *cobra.Command { diff --git a/cmd/ucind/main.go b/cmd/ucind/main.go index 12905126..9c988947 100644 --- a/cmd/ucind/main.go +++ b/cmd/ucind/main.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" "os" "strings" - "uncloud/cmd/ucind/cluster" - "uncloud/internal/ucind" + "github.com/psviderski/uncloud/cmd/ucind/cluster" + "github.com/psviderski/uncloud/internal/ucind" ) func main() { diff --git a/cmd/uncloud/caddy/deploy.go b/cmd/uncloud/caddy/deploy.go index ed713cfd..07c703ef 100644 --- a/cmd/uncloud/caddy/deploy.go +++ b/cmd/uncloud/caddy/deploy.go @@ -10,9 +10,9 @@ import ( "maps" "slices" "strings" - "uncloud/internal/cli" - "uncloud/internal/cli/client" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) type deployOptions struct { diff --git a/cmd/uncloud/deploy.go b/cmd/uncloud/deploy.go index 58d72e07..c4be821f 100644 --- a/cmd/uncloud/deploy.go +++ b/cmd/uncloud/deploy.go @@ -8,9 +8,9 @@ import ( "github.com/docker/compose/v2/pkg/progress" "github.com/spf13/cobra" "strings" - "uncloud/internal/cli" - "uncloud/internal/cli/client" - "uncloud/internal/compose" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/compose" ) type deployOptions struct { diff --git a/cmd/uncloud/dns/release.go b/cmd/uncloud/dns/release.go index 52d625c1..768af68b 100644 --- a/cmd/uncloud/dns/release.go +++ b/cmd/uncloud/dns/release.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - "uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli" ) type releaseOptions struct { diff --git a/cmd/uncloud/dns/reserve.go b/cmd/uncloud/dns/reserve.go index 28bdfcd0..9d6e10af 100644 --- a/cmd/uncloud/dns/reserve.go +++ b/cmd/uncloud/dns/reserve.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "uncloud/cmd/uncloud/caddy" - "uncloud/internal/cli" - "uncloud/internal/cli/client" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/cmd/uncloud/caddy" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) const DefaultUncloudDNSAPIEndpoint = "https://dns.uncloud.run/v1" diff --git a/cmd/uncloud/dns/show.go b/cmd/uncloud/dns/show.go index 31198546..44fe4d48 100644 --- a/cmd/uncloud/dns/show.go +++ b/cmd/uncloud/dns/show.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" "github.com/spf13/cobra" - "uncloud/internal/cli" - "uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/client" ) type showOptions struct { diff --git a/cmd/uncloud/machine/add.go b/cmd/uncloud/machine/add.go index ce428a90..09f4cd9d 100644 --- a/cmd/uncloud/machine/add.go +++ b/cmd/uncloud/machine/add.go @@ -12,11 +12,11 @@ import ( "google.golang.org/protobuf/types/known/emptypb" "net/netip" "time" - "uncloud/cmd/uncloud/caddy" - "uncloud/internal/cli" - "uncloud/internal/cli/client" - "uncloud/internal/cli/config" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/cmd/uncloud/caddy" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/cli/config" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) type addOptions struct { diff --git a/cmd/uncloud/machine/init.go b/cmd/uncloud/machine/init.go index a9555562..5a0cc355 100644 --- a/cmd/uncloud/machine/init.go +++ b/cmd/uncloud/machine/init.go @@ -6,12 +6,12 @@ import ( "github.com/docker/compose/v2/pkg/progress" "github.com/spf13/cobra" "net/netip" - "uncloud/cmd/uncloud/caddy" - "uncloud/cmd/uncloud/dns" - "uncloud/internal/cli" - "uncloud/internal/cli/config" - "uncloud/internal/machine/api/pb" - "uncloud/internal/machine/cluster" + "github.com/psviderski/uncloud/cmd/uncloud/caddy" + "github.com/psviderski/uncloud/cmd/uncloud/dns" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/config" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/cluster" ) type initOptions struct { diff --git a/cmd/uncloud/machine/list.go b/cmd/uncloud/machine/list.go index 44596270..80d47b16 100644 --- a/cmd/uncloud/machine/list.go +++ b/cmd/uncloud/machine/list.go @@ -8,8 +8,8 @@ import ( "os" "strings" "text/tabwriter" - "uncloud/internal/cli" - "uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/machine/network" ) func NewListCommand() *cobra.Command { diff --git a/cmd/uncloud/machine/token.go b/cmd/uncloud/machine/token.go index af274817..5538d334 100644 --- a/cmd/uncloud/machine/token.go +++ b/cmd/uncloud/machine/token.go @@ -3,8 +3,8 @@ package machine import ( "fmt" "github.com/spf13/cobra" - "uncloud/internal/daemon" - "uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/daemon" + "github.com/psviderski/uncloud/internal/machine" ) type tokenOptions struct { diff --git a/cmd/uncloud/main.go b/cmd/uncloud/main.go index 8e3ccdb6..0e904a81 100644 --- a/cmd/uncloud/main.go +++ b/cmd/uncloud/main.go @@ -3,16 +3,16 @@ package main import ( "context" "fmt" + "github.com/psviderski/uncloud/cmd/uncloud/caddy" + "github.com/psviderski/uncloud/cmd/uncloud/dns" + "github.com/psviderski/uncloud/cmd/uncloud/machine" + "github.com/psviderski/uncloud/cmd/uncloud/service" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/config" + "github.com/psviderski/uncloud/internal/fs" "github.com/spf13/cobra" "net/netip" "strings" - "uncloud/cmd/uncloud/caddy" - "uncloud/cmd/uncloud/dns" - "uncloud/cmd/uncloud/machine" - "uncloud/cmd/uncloud/service" - "uncloud/internal/cli" - "uncloud/internal/cli/config" - "uncloud/internal/fs" ) type globalOptions struct { diff --git a/cmd/uncloud/service/inspect.go b/cmd/uncloud/service/inspect.go index ee311861..5668e119 100644 --- a/cmd/uncloud/service/inspect.go +++ b/cmd/uncloud/service/inspect.go @@ -10,7 +10,7 @@ import ( "time" "github.com/spf13/cobra" - "uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli" ) type inspectOptions struct { diff --git a/cmd/uncloud/service/list.go b/cmd/uncloud/service/list.go index 09f348a2..73a34577 100644 --- a/cmd/uncloud/service/list.go +++ b/cmd/uncloud/service/list.go @@ -3,11 +3,11 @@ package service import ( "context" "fmt" + "github.com/psviderski/uncloud/internal/cli" "github.com/spf13/cobra" "os" "strings" "text/tabwriter" - "uncloud/internal/cli" ) func NewListCommand() *cobra.Command { diff --git a/cmd/uncloud/service/rm.go b/cmd/uncloud/service/rm.go index 4aa36d9d..572365e8 100644 --- a/cmd/uncloud/service/rm.go +++ b/cmd/uncloud/service/rm.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/docker/cli/cli/streams" "github.com/docker/compose/v2/pkg/progress" + "github.com/psviderski/uncloud/internal/cli" "github.com/spf13/cobra" "os" - "uncloud/internal/cli" ) type rmOptions struct { diff --git a/cmd/uncloud/service/run.go b/cmd/uncloud/service/run.go index 82515456..661ecb5a 100644 --- a/cmd/uncloud/service/run.go +++ b/cmd/uncloud/service/run.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" "slices" "strings" - "uncloud/internal/api" - "uncloud/internal/cli" - "uncloud/internal/cli/client" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) type runOptions struct { diff --git a/cmd/uncloud/service/scale.go b/cmd/uncloud/service/scale.go index f0d1a25f..976b15de 100644 --- a/cmd/uncloud/service/scale.go +++ b/cmd/uncloud/service/scale.go @@ -7,8 +7,8 @@ import ( "github.com/docker/compose/v2/pkg/progress" "github.com/spf13/cobra" "strconv" - "uncloud/internal/api" - "uncloud/internal/cli" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/cli" ) type scaleOptions struct { diff --git a/cmd/uncloudd/main.go b/cmd/uncloudd/main.go index cae48500..6bcf5b12 100644 --- a/cmd/uncloudd/main.go +++ b/cmd/uncloudd/main.go @@ -7,9 +7,9 @@ import ( "os" "os/signal" "syscall" - "uncloud/internal/daemon" - "uncloud/internal/log" - "uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/daemon" + "github.com/psviderski/uncloud/internal/log" + "github.com/psviderski/uncloud/internal/machine" ) func main() { diff --git a/experiment/talos_discovery.go b/experiment/talos_discovery.go index 1a8546df..96420cc9 100644 --- a/experiment/talos_discovery.go +++ b/experiment/talos_discovery.go @@ -11,7 +11,7 @@ import ( "go.uber.org/zap" "net/netip" "time" - "uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/machine/network" ) const ( diff --git a/go.mod b/go.mod index 315f1231..66ceed68 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module uncloud +module github.com/psviderski/uncloud go 1.23.0 diff --git a/internal/api/service.go b/internal/api/service.go index 21941fbc..0a13ae8e 100644 --- a/internal/api/service.go +++ b/internal/api/service.go @@ -10,7 +10,7 @@ import ( "reflect" "regexp" "slices" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) const ( diff --git a/internal/cli/cli.go b/internal/cli/cli.go index d4af0a07..6d851816 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -7,13 +7,13 @@ import ( "github.com/docker/cli/cli/streams" "net/netip" "os" - "uncloud/internal/cli/client" - "uncloud/internal/cli/client/connector" - "uncloud/internal/cli/config" - "uncloud/internal/fs" - "uncloud/internal/machine" - "uncloud/internal/machine/api/pb" - "uncloud/internal/sshexec" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/cli/client/connector" + "github.com/psviderski/uncloud/internal/cli/config" + "github.com/psviderski/uncloud/internal/fs" + "github.com/psviderski/uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/sshexec" "github.com/charmbracelet/huh" "google.golang.org/protobuf/types/known/emptypb" diff --git a/internal/cli/client/caddy.go b/internal/cli/client/caddy.go index 7c7fca3f..4e724ef6 100644 --- a/internal/cli/client/caddy.go +++ b/internal/cli/client/caddy.go @@ -6,8 +6,8 @@ import ( "github.com/distribution/reference" "github.com/google/go-containerregistry/pkg/name" "github.com/google/go-containerregistry/pkg/v1/remote" + "github.com/psviderski/uncloud/internal/api" "regexp" - "uncloud/internal/api" ) const ( diff --git a/internal/cli/client/caddy_test.go b/internal/cli/client/caddy_test.go index 910999ec..7f2ead53 100644 --- a/internal/cli/client/caddy_test.go +++ b/internal/cli/client/caddy_test.go @@ -4,7 +4,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" - "uncloud/internal/api" + "github.com/psviderski/uncloud/internal/api" ) func TestClient_NewCaddyDeployment(t *testing.T) { diff --git a/internal/cli/client/client.go b/internal/cli/client/client.go index dba89f9e..31c2f0a2 100644 --- a/internal/cli/client/client.go +++ b/internal/cli/client/client.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" "github.com/docker/cli/cli/streams" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/docker" "google.golang.org/grpc" "google.golang.org/grpc/metadata" "os" - "uncloud/internal/machine/api/pb" - "uncloud/internal/machine/docker" ) var ErrNotFound = errors.New("not found") diff --git a/internal/cli/client/cluster.go b/internal/cli/client/cluster.go index e76d6855..a2f4c70c 100644 --- a/internal/cli/client/cluster.go +++ b/internal/cli/client/cluster.go @@ -3,7 +3,7 @@ package client import ( "context" "google.golang.org/protobuf/types/known/emptypb" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) func (cli *Client) InspectMachine(ctx context.Context, id string) (*pb.MachineMember, error) { diff --git a/internal/cli/client/compose.go b/internal/cli/client/compose.go index 11319263..b59c1293 100644 --- a/internal/cli/client/compose.go +++ b/internal/cli/client/compose.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/compose-spec/compose-go/v2/graph" "github.com/compose-spec/compose-go/v2/types" - "uncloud/internal/api" - "uncloud/internal/compose" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/compose" ) func (cli *Client) NewComposeDeployment(ctx context.Context, project *types.Project) (*ComposeDeployment, error) { @@ -87,12 +87,16 @@ func (d *ComposeDeployment) ServiceSpec(name string) (api.ServiceSpec, error) { } // TODO: resolve the image to a digest and supported platforms using an image resolver that broadcasts requests - // to all machines in the cluster. + // to all machines in the cluster. If service.PullPolicy is "missing": + // - Broadcast request if any machine contains a particular image and resolve it to image@digest. + // - If not found, broadcast request to resolve an image using a registry, and resolve it to image@digest. // TODO: configure placement filter based on the supported platforms of the image. if err = d.SpecResolver.Resolve(&spec); err != nil { return spec, fmt.Errorf("resolve service spec '%s': %w", name, err) } + // TODO: maybe instantiate ImageResolver here based on PullPolicy of each service? + return spec, nil } diff --git a/internal/cli/client/connector/ssh.go b/internal/cli/client/connector/ssh.go index 9755a642..4ea2accf 100644 --- a/internal/cli/client/connector/ssh.go +++ b/internal/cli/client/connector/ssh.go @@ -3,13 +3,13 @@ package connector import ( "context" "fmt" + "github.com/psviderski/uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/sshexec" "golang.org/x/crypto/ssh" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "net" "strings" - "uncloud/internal/machine" - "uncloud/internal/sshexec" ) type SSHConnectorConfig struct { diff --git a/internal/cli/client/connector/wireguard.go b/internal/cli/client/connector/wireguard.go index 0b27af91..1bae7e9c 100644 --- a/internal/cli/client/connector/wireguard.go +++ b/internal/cli/client/connector/wireguard.go @@ -8,11 +8,11 @@ import ( "net" "net/netip" "strconv" - "uncloud/internal/cli/client" - "uncloud/internal/cli/config" - machine2 "uncloud/internal/machine" - "uncloud/internal/machine/network" - "uncloud/internal/machine/network/tunnel" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/cli/config" + machine2 "github.com/psviderski/uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/machine/network/tunnel" ) // WireGuardConnector establishes a connection to the cluster API through a WireGuard tunnel diff --git a/internal/cli/client/container.go b/internal/cli/client/container.go index ea21c56c..9b502be2 100644 --- a/internal/cli/client/container.go +++ b/internal/cli/client/container.go @@ -13,9 +13,9 @@ import ( "google.golang.org/grpc/status" "strconv" "strings" - "uncloud/internal/api" - machinedocker "uncloud/internal/machine/docker" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/api" + machinedocker "github.com/psviderski/uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/internal/secret" ) // CreateContainer creates a new container for the given service on the specified machine. diff --git a/internal/cli/client/deploy.go b/internal/cli/client/deploy.go index b7e53d5c..ab5ea1dc 100644 --- a/internal/cli/client/deploy.go +++ b/internal/cli/client/deploy.go @@ -4,8 +4,8 @@ import ( "context" "errors" "fmt" - "uncloud/internal/api" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) // Deployment manages the process of creating or updating a service to match a desired state. diff --git a/internal/cli/client/dns.go b/internal/cli/client/dns.go index 1b1fac16..78d1c581 100644 --- a/internal/cli/client/dns.go +++ b/internal/cli/client/dns.go @@ -12,8 +12,8 @@ import ( "net/http" "sync" "time" - "uncloud/internal/machine/api/pb" - "uncloud/internal/machine/caddyfile" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/caddyfile" ) // GetDomain returns the cluster domain name or ErrNotFound if it hasn't been reserved yet. diff --git a/internal/cli/client/operation.go b/internal/cli/client/operation.go index 5dc3023f..29cbb84a 100644 --- a/internal/cli/client/operation.go +++ b/internal/cli/client/operation.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/docker/docker/api/types/container" "strings" - "uncloud/internal/api" + "github.com/psviderski/uncloud/internal/api" ) // Operation represents a single atomic operation in a deployment process. diff --git a/internal/cli/client/resolver.go b/internal/cli/client/resolver.go index eb1cec46..41e9280f 100644 --- a/internal/cli/client/resolver.go +++ b/internal/cli/client/resolver.go @@ -3,9 +3,9 @@ package client import ( "fmt" "github.com/distribution/reference" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/secret" "strings" - "uncloud/internal/api" - "uncloud/internal/secret" ) type ImageDigestResolver interface { diff --git a/internal/cli/client/service.go b/internal/cli/client/service.go index 422cdb96..14021ccb 100644 --- a/internal/cli/client/service.go +++ b/internal/cli/client/service.go @@ -12,8 +12,8 @@ import ( "google.golang.org/grpc/status" "slices" "sync" - "uncloud/internal/api" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) func (cli *Client) PrepareDeploymentSpec(ctx context.Context, spec api.ServiceSpec) (api.ServiceSpec, error) { diff --git a/internal/cli/client/strategy.go b/internal/cli/client/strategy.go index 4b30f574..5cea2c10 100644 --- a/internal/cli/client/strategy.go +++ b/internal/cli/client/strategy.go @@ -5,9 +5,9 @@ import ( "fmt" "math/rand/v2" "slices" - "uncloud/internal/api" - "uncloud/internal/machine/api/pb" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/secret" ) // Strategy defines how a service should be deployed or updated. Different implementations can provide various diff --git a/internal/cli/client/user.go b/internal/cli/client/user.go index b267d464..81583ebe 100644 --- a/internal/cli/client/user.go +++ b/internal/cli/client/user.go @@ -4,8 +4,8 @@ import ( "fmt" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "net/netip" - "uncloud/internal/machine/network" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/secret" ) type User struct { diff --git a/internal/cli/config/connection.go b/internal/cli/config/connection.go index 28415a9e..b84ef10f 100644 --- a/internal/cli/config/connection.go +++ b/internal/cli/config/connection.go @@ -5,7 +5,7 @@ import ( "net/netip" "strconv" "strings" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/secret" ) const ( diff --git a/internal/cli/machine.go b/internal/cli/machine.go index 2dbb6450..9e8d763d 100644 --- a/internal/cli/machine.go +++ b/internal/cli/machine.go @@ -4,7 +4,7 @@ import ( "context" "fmt" "os" - "uncloud/internal/sshexec" + "github.com/psviderski/uncloud/internal/sshexec" ) // TODO: support pinning the script version to the CLI version. diff --git a/internal/compose/port.go b/internal/compose/port.go index 9d998c16..5045ccac 100644 --- a/internal/compose/port.go +++ b/internal/compose/port.go @@ -3,7 +3,7 @@ package compose import ( "fmt" "github.com/compose-spec/compose-go/v2/types" - "uncloud/internal/api" + "github.com/psviderski/uncloud/internal/api" ) const PortsExtensionKey = "x-ports" diff --git a/internal/compose/service.go b/internal/compose/service.go index 0c18541f..3fdf3c89 100644 --- a/internal/compose/service.go +++ b/internal/compose/service.go @@ -3,7 +3,7 @@ package compose import ( "fmt" "github.com/compose-spec/compose-go/v2/types" - "uncloud/internal/api" + "github.com/psviderski/uncloud/internal/api" ) func ServiceSpecFromCompose(name string, service types.ServiceConfig) (api.ServiceSpec, error) { diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go index 28cba756..d1f4e25e 100644 --- a/internal/daemon/daemon.go +++ b/internal/daemon/daemon.go @@ -5,7 +5,7 @@ import ( "fmt" systemd "github.com/coreos/go-systemd/daemon" "log/slog" - "uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/machine" ) type Daemon struct { diff --git a/internal/daemon/token.go b/internal/daemon/token.go index aa99e984..41299cd9 100644 --- a/internal/daemon/token.go +++ b/internal/daemon/token.go @@ -3,10 +3,10 @@ package daemon import ( "errors" "fmt" + "github.com/psviderski/uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/machine/network" "net/netip" "os" - "uncloud/internal/machine" - "uncloud/internal/machine/network" ) // MachineToken returns the local machine's token that can be used for adding the machine to a cluster. diff --git a/internal/machine/api/proxy/backend.go b/internal/machine/api/proxy/backend.go index 1fc017c1..977b01d1 100644 --- a/internal/machine/api/proxy/backend.go +++ b/internal/machine/api/proxy/backend.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/encoding/protowire" "google.golang.org/protobuf/proto" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) // One2ManyResponder converts upstream responses into messages from upstreams, so that multiple diff --git a/internal/machine/caddyfile/config.go b/internal/machine/caddyfile/config.go index ec7143a9..2273892d 100644 --- a/internal/machine/caddyfile/config.go +++ b/internal/machine/caddyfile/config.go @@ -14,8 +14,8 @@ import ( "net/http" "slices" "strconv" - "uncloud/internal/api" - "uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/machine/docker" ) func GenerateConfig(containers []api.Container, verifyResponse string) (*caddy.Config, error) { diff --git a/internal/machine/caddyfile/config_test.go b/internal/machine/caddyfile/config_test.go index 1d352d0c..57eccd2d 100644 --- a/internal/machine/caddyfile/config_test.go +++ b/internal/machine/caddyfile/config_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "strings" "testing" - "uncloud/internal/api" - "uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/machine/docker" ) func TestGenerateConfig(t *testing.T) { diff --git a/internal/machine/caddyfile/controller.go b/internal/machine/caddyfile/controller.go index ec23cd5d..6a0868d9 100644 --- a/internal/machine/caddyfile/controller.go +++ b/internal/machine/caddyfile/controller.go @@ -7,9 +7,9 @@ import ( "log/slog" "os" "path/filepath" - "uncloud/internal/api" - "uncloud/internal/fs" - "uncloud/internal/machine/store" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/fs" + "github.com/psviderski/uncloud/internal/machine/store" ) const ( diff --git a/internal/machine/cluster/cluster.go b/internal/machine/cluster/cluster.go index ba96de52..8fe6a72a 100644 --- a/internal/machine/cluster/cluster.go +++ b/internal/machine/cluster/cluster.go @@ -11,11 +11,11 @@ import ( "log/slog" "net/netip" "time" - "uncloud/internal/corrosion" - "uncloud/internal/machine/api/pb" - "uncloud/internal/machine/network" - "uncloud/internal/machine/store" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/corrosion" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/machine/store" + "github.com/psviderski/uncloud/internal/secret" ) type Cluster struct { diff --git a/internal/machine/cluster/dns.go b/internal/machine/cluster/dns.go index 659ced7a..0de7e86b 100644 --- a/internal/machine/cluster/dns.go +++ b/internal/machine/cluster/dns.go @@ -4,12 +4,12 @@ import ( "context" "encoding/json" "errors" + "github.com/psviderski/uncloud/internal/dns" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/store" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - "uncloud/internal/dns" - "uncloud/internal/machine/api/pb" - "uncloud/internal/machine/store" ) // uncloudDNSKey is the key used to store the details of the reserved domain in the store. diff --git a/internal/machine/cluster/machine.go b/internal/machine/cluster/machine.go index 9b0c33cd..3ab9ca20 100644 --- a/internal/machine/cluster/machine.go +++ b/internal/machine/cluster/machine.go @@ -2,7 +2,7 @@ package cluster import ( "fmt" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/secret" ) // NewMachineID generates a new unique machine ID. diff --git a/internal/machine/corroservice/config.go b/internal/machine/corroservice/config.go index 704c79e0..af7cd07d 100644 --- a/internal/machine/corroservice/config.go +++ b/internal/machine/corroservice/config.go @@ -7,7 +7,7 @@ import ( "net/netip" "os" "path/filepath" - "uncloud/internal/fs" + "github.com/psviderski/uncloud/internal/fs" ) const ( diff --git a/internal/machine/docker/client.go b/internal/machine/docker/client.go index 66b1b31d..2d4af557 100644 --- a/internal/machine/docker/client.go +++ b/internal/machine/docker/client.go @@ -10,11 +10,11 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/pkg/jsonmessage" ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/psviderski/uncloud/internal/machine/api/pb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "io" - "uncloud/internal/machine/api/pb" ) // Client is a gRPC client for the Docker service that provides a similar interface to the Docker HTTP client. diff --git a/internal/machine/docker/manager.go b/internal/machine/docker/manager.go index c77e7851..4e9ec55c 100644 --- a/internal/machine/docker/manager.go +++ b/internal/machine/docker/manager.go @@ -10,8 +10,8 @@ import ( "github.com/docker/docker/client" "log/slog" "time" - "uncloud/internal/api" - "uncloud/internal/machine/store" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/machine/store" ) const ( diff --git a/internal/machine/docker/manager_linux.go b/internal/machine/docker/manager_linux.go index d6744250..3696143a 100644 --- a/internal/machine/docker/manager_linux.go +++ b/internal/machine/docker/manager_linux.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/libnetwork/iptables" "log/slog" "net/netip" - "uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/machine/network" ) // EnsureUncloudNetwork creates the Docker bridge network NetworkName with the provided machine subnet diff --git a/internal/machine/docker/server.go b/internal/machine/docker/server.go index 277d8073..0373ec03 100644 --- a/internal/machine/docker/server.go +++ b/internal/machine/docker/server.go @@ -16,7 +16,7 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" "io" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) // Server implements the gRPC Docker service that proxies requests to the Docker daemon. diff --git a/internal/machine/machine.go b/internal/machine/machine.go index 426962ef..71a9ad72 100644 --- a/internal/machine/machine.go +++ b/internal/machine/machine.go @@ -21,17 +21,17 @@ import ( "path/filepath" "slices" "strconv" - "uncloud/internal/corrosion" - "uncloud/internal/docker" - "uncloud/internal/fs" - "uncloud/internal/machine/api/pb" - apiproxy "uncloud/internal/machine/api/proxy" - "uncloud/internal/machine/caddyfile" - "uncloud/internal/machine/cluster" - "uncloud/internal/machine/corroservice" - machinedocker "uncloud/internal/machine/docker" - "uncloud/internal/machine/network" - "uncloud/internal/machine/store" + "github.com/psviderski/uncloud/internal/corrosion" + "github.com/psviderski/uncloud/internal/docker" + "github.com/psviderski/uncloud/internal/fs" + "github.com/psviderski/uncloud/internal/machine/api/pb" + apiproxy "github.com/psviderski/uncloud/internal/machine/api/proxy" + "github.com/psviderski/uncloud/internal/machine/caddyfile" + "github.com/psviderski/uncloud/internal/machine/cluster" + "github.com/psviderski/uncloud/internal/machine/corroservice" + machinedocker "github.com/psviderski/uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/machine/store" ) const ( diff --git a/internal/machine/network.go b/internal/machine/network.go index 859c9343..3b384632 100644 --- a/internal/machine/network.go +++ b/internal/machine/network.go @@ -14,12 +14,12 @@ import ( "slices" "strconv" "time" - "uncloud/internal/machine/api/pb" - "uncloud/internal/machine/caddyfile" - "uncloud/internal/machine/corroservice" - "uncloud/internal/machine/docker" - "uncloud/internal/machine/network" - "uncloud/internal/machine/store" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/caddyfile" + "github.com/psviderski/uncloud/internal/machine/corroservice" + "github.com/psviderski/uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/machine/store" ) const ( diff --git a/internal/machine/network/config.go b/internal/machine/network/config.go index 7ecb2184..3de8d45a 100644 --- a/internal/machine/network/config.go +++ b/internal/machine/network/config.go @@ -2,10 +2,10 @@ package network import ( "fmt" + "github.com/psviderski/uncloud/internal/secret" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "net" "net/netip" - "uncloud/internal/secret" ) type Config struct { diff --git a/internal/machine/network/ip.go b/internal/machine/network/ip.go index 500a1551..1a7f33c7 100644 --- a/internal/machine/network/ip.go +++ b/internal/machine/network/ip.go @@ -2,9 +2,9 @@ package network import ( "fmt" + "github.com/psviderski/uncloud/internal/secret" "net" "net/netip" - "uncloud/internal/secret" ) // MachineIP returns the IP address of the machine which is the first address in the subnet. diff --git a/internal/machine/network/tunnel/tunnel.go b/internal/machine/network/tunnel/tunnel.go index 239526bf..b3c64dd0 100644 --- a/internal/machine/network/tunnel/tunnel.go +++ b/internal/machine/network/tunnel/tunnel.go @@ -9,7 +9,7 @@ import ( "net" "net/netip" "time" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/secret" ) const ( diff --git a/internal/machine/network/wireguard.go b/internal/machine/network/wireguard.go index 648fb5ef..c4ca5cde 100644 --- a/internal/machine/network/wireguard.go +++ b/internal/machine/network/wireguard.go @@ -5,7 +5,7 @@ import ( "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "net/netip" "time" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/secret" ) const ( diff --git a/internal/machine/network/wireguard_linux.go b/internal/machine/network/wireguard_linux.go index dba6b309..873f87dc 100644 --- a/internal/machine/network/wireguard_linux.go +++ b/internal/machine/network/wireguard_linux.go @@ -17,7 +17,7 @@ import ( "slices" "sync" "time" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/secret" ) type WireGuardNetwork struct { diff --git a/internal/machine/state.go b/internal/machine/state.go index d5e9ca1e..e90f7d40 100644 --- a/internal/machine/state.go +++ b/internal/machine/state.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" "sync" - "uncloud/internal/machine/network" + "github.com/psviderski/uncloud/internal/machine/network" ) const ( diff --git a/internal/machine/store/container.go b/internal/machine/store/container.go index 2c15b9a5..e7896f4e 100644 --- a/internal/machine/store/container.go +++ b/internal/machine/store/container.go @@ -8,7 +8,7 @@ import ( "log/slog" "strings" "time" - "uncloud/internal/api" + "github.com/psviderski/uncloud/internal/api" ) const ( diff --git a/internal/machine/store/store.go b/internal/machine/store/store.go index 546cddca..b6954b13 100644 --- a/internal/machine/store/store.go +++ b/internal/machine/store/store.go @@ -7,8 +7,8 @@ import ( "fmt" "google.golang.org/protobuf/encoding/protojson" "log/slog" - "uncloud/internal/corrosion" - "uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/corrosion" + "github.com/psviderski/uncloud/internal/machine/api/pb" ) var ( diff --git a/internal/machine/token.go b/internal/machine/token.go index 8ef97bf5..78abec28 100644 --- a/internal/machine/token.go +++ b/internal/machine/token.go @@ -6,7 +6,7 @@ import ( "fmt" "net/netip" "strings" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/secret" ) const ( diff --git a/internal/ucind/cluster.go b/internal/ucind/cluster.go index 9072bfe8..2c292d54 100644 --- a/internal/ucind/cluster.go +++ b/internal/ucind/cluster.go @@ -12,9 +12,9 @@ import ( "google.golang.org/protobuf/types/known/emptypb" "net/netip" "time" - "uncloud/internal/machine" - "uncloud/internal/machine/api/pb" - "uncloud/internal/machine/cluster" + "github.com/psviderski/uncloud/internal/machine" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/machine/cluster" ) const ( diff --git a/internal/ucind/config.go b/internal/ucind/config.go index cb1f73b8..7d147d90 100644 --- a/internal/ucind/config.go +++ b/internal/ucind/config.go @@ -2,7 +2,7 @@ package ucind import ( "fmt" - "uncloud/internal/cli/config" + "github.com/psviderski/uncloud/internal/cli/config" ) type ConfigUpdater struct { diff --git a/internal/ucind/machine.go b/internal/ucind/machine.go index 3a205874..5654e69e 100644 --- a/internal/ucind/machine.go +++ b/internal/ucind/machine.go @@ -14,9 +14,9 @@ import ( "net" "net/netip" "time" - "uncloud/internal/cli/client" - "uncloud/internal/cli/client/connector" - "uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/cli/client/connector" + "github.com/psviderski/uncloud/internal/secret" ) const ( diff --git a/test/e2e/assert.go b/test/e2e/assert.go index 7cfc668e..dd140f9f 100644 --- a/test/e2e/assert.go +++ b/test/e2e/assert.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" - "uncloud/internal/api" - "uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/cli/client" ) func assertServiceMatchesSpec(t *testing.T, svc api.Service, spec api.ServiceSpec) { diff --git a/test/e2e/cluster_test.go b/test/e2e/cluster_test.go index 7e2fe20c..eaaee7d8 100644 --- a/test/e2e/cluster_test.go +++ b/test/e2e/cluster_test.go @@ -11,9 +11,9 @@ import ( "os" "testing" "time" - "uncloud/internal/cli/client" - "uncloud/internal/machine/api/pb" - "uncloud/internal/ucind" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/machine/api/pb" + "github.com/psviderski/uncloud/internal/ucind" ) func createTestCluster( diff --git a/test/e2e/compose_test.go b/test/e2e/compose_test.go index 177cc9ab..ff1216d3 100644 --- a/test/e2e/compose_test.go +++ b/test/e2e/compose_test.go @@ -3,13 +3,13 @@ package e2e import ( "context" "errors" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/compose" + "github.com/psviderski/uncloud/internal/ucind" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" - "uncloud/internal/api" - "uncloud/internal/cli/client" - "uncloud/internal/compose" - "uncloud/internal/ucind" ) func TestComposeDeployment(t *testing.T) { diff --git a/test/e2e/service_test.go b/test/e2e/service_test.go index 71ea3201..ade653f8 100644 --- a/test/e2e/service_test.go +++ b/test/e2e/service_test.go @@ -10,12 +10,12 @@ import ( "net/netip" "strings" "testing" - "uncloud/internal/api" - "uncloud/internal/cli/client" - "uncloud/internal/machine/api/pb" - machinedocker "uncloud/internal/machine/docker" - "uncloud/internal/secret" - "uncloud/internal/ucind" + "github.com/psviderski/uncloud/internal/api" + "github.com/psviderski/uncloud/internal/cli/client" + "github.com/psviderski/uncloud/internal/machine/api/pb" + machinedocker "github.com/psviderski/uncloud/internal/machine/docker" + "github.com/psviderski/uncloud/internal/secret" + "github.com/psviderski/uncloud/internal/ucind" ) func newServiceID() string {