test: app move (basics)
This commit is contained in:
@ -6,6 +6,7 @@ import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
contextPkg "coopcloud.tech/abra/pkg/context"
|
||||
@ -38,18 +39,24 @@ func WithTimeout(timeout int) Opt {
|
||||
func New(serverName string, opts ...Opt) (*client.Client, error) {
|
||||
var clientOpts []client.Opt
|
||||
|
||||
if serverName != "default" {
|
||||
context, err := GetContext(serverName)
|
||||
if err != nil {
|
||||
return nil, errors.New(i18n.G("unknown server, run \"abra server add %s\"?", serverName))
|
||||
}
|
||||
ctx, err := GetContext(serverName)
|
||||
if err != nil {
|
||||
return nil, errors.New(i18n.G("unknown server, run \"abra server add %s\"?", serverName))
|
||||
}
|
||||
|
||||
ctxEndpoint, err := contextPkg.GetContextEndpoint(context)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ctxEndpoint, err := contextPkg.GetContextEndpoint(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var isUnix bool
|
||||
if strings.Contains(ctxEndpoint, "unix://") {
|
||||
isUnix = true
|
||||
}
|
||||
|
||||
if serverName != "default" && !isUnix {
|
||||
conf := &Conf{}
|
||||
|
||||
for _, opt := range opts {
|
||||
opt(conf)
|
||||
}
|
||||
@ -93,7 +100,7 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
|
||||
}
|
||||
|
||||
if info.Swarm.LocalNodeState == "inactive" {
|
||||
if serverName != "default" {
|
||||
if serverName != "default" && !isUnix {
|
||||
return cl, errors.New(i18n.G("swarm mode not enabled on %s?", serverName))
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user