toolshed/abra
toolshed/abra
4
2
Fork 16
Code Issues 2 Pull Requests Packages Releases 37 Activity

refactor: use pkg directory structure

Browse Source
This commit is contained in:
decentral1se 2021-09-05 21:37:03 +02:00
parent f59380a35e
commit b7742d5e18
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
55 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/app/backup.go
View File

@ -10,7 +10,7 @@ import (
"strings"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/config"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

2
cli/app/check.go
View File

@ -7,7 +7,7 @@ import (
"strings"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/config"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

2
cli/app/config.go
View File

@ -6,7 +6,7 @@ import (
"os/exec"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/config"
"github.com/AlecAivazis/survey/v2"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

4
cli/app/cp.go
View File

@ -8,8 +8,8 @@ import (
"strings"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/pkg/archive"

6
cli/app/deploy.go
View File

@ -5,9 +5,9 @@ import (
"fmt"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
stack "coopcloud.tech/abra/client/stack"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
stack "coopcloud.tech/abra/pkg/client/stack"
"coopcloud.tech/abra/pkg/config"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

2
cli/app/list.go
View File

@ -4,7 +4,7 @@ import (
"sort"
abraFormatter "coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/config"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

4
cli/app/logs.go
View File

@ -9,8 +9,8 @@ import (
"sync"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
dockerClient "github.com/docker/docker/client"

8
cli/app/new.go
View File

@ -5,12 +5,12 @@ import (
"fmt"
"path"
"coopcloud.tech/abra/catalogue"
abraFormatter "coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/recipe"
"coopcloud.tech/abra/secret"
"coopcloud.tech/abra/pkg/catalogue"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/recipe"
"coopcloud.tech/abra/pkg/secret"
"github.com/AlecAivazis/survey/v2"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

4
cli/app/ps.go
View File

@ -7,8 +7,8 @@ import (
abraFormatter "coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"github.com/docker/cli/cli/command/formatter"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"

4
cli/app/remove.go
View File

@ -7,8 +7,8 @@ import (
"os"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"github.com/AlecAivazis/survey/v2"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"

2
cli/app/restore.go
View File

@ -10,7 +10,7 @@ import (
"strings"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/config"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

6
cli/app/run.go
View File

@ -6,9 +6,9 @@ import (
"fmt"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/client/container"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/client/container"
"coopcloud.tech/abra/pkg/config"
"github.com/docker/cli/cli/command"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"

6
cli/app/secret.go
View File

@ -8,9 +8,9 @@ import (
abraFormatter "coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/secret"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/secret"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/sirupsen/logrus"

6
cli/app/undeploy.go
View File

@ -5,9 +5,9 @@ import (
"errors"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
stack "coopcloud.tech/abra/client/stack"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
stack "coopcloud.tech/abra/pkg/client/stack"
"coopcloud.tech/abra/pkg/config"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

4
cli/app/version.go
View File

@ -8,8 +8,8 @@ import (
abraFormatter "coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client/stack"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client/stack"
"coopcloud.tech/abra/pkg/config"
"github.com/docker/distribution/reference"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

4
cli/app/volume.go
View File

@ -6,8 +6,8 @@ import (
abraFormatter "coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"github.com/AlecAivazis/survey/v2"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

2
cli/internal/validate.go
View File

@ -3,7 +3,7 @@ package internal
import (
"errors"
"coopcloud.tech/abra/recipe"
"coopcloud.tech/abra/pkg/recipe"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

10
cli/recipe/recipe.go
View File

@ -11,15 +11,15 @@ import (
"strings"
"text/template"
"coopcloud.tech/abra/catalogue"
"coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/client/stack"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/catalogue"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/client/stack"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/tagcmp"
loader "coopcloud.tech/abra/client/stack"
loader "coopcloud.tech/abra/pkg/client/stack"
"github.com/AlecAivazis/survey/v2"
"github.com/docker/distribution/reference"
"github.com/go-git/go-git/v5"

2
cli/server/add.go
View File

@ -3,7 +3,7 @@ package server
import (
"fmt"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/pkg/client"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

2
cli/server/init.go
View File

@ -8,7 +8,7 @@ import (
"time"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/pkg/client"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/swarm"
"github.com/sirupsen/logrus"

4
cli/server/list.go
View File

@ -4,8 +4,8 @@ import (
"strings"
"coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

2
cli/server/remove.go
View File

@ -4,7 +4,7 @@ import (
"errors"
"coopcloud.tech/abra/cli/internal"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/pkg/client"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)

4
catalogue/catalogue.go → pkg/catalogue/catalogue.go
View File

@ -12,8 +12,8 @@ import (
"strings"
"time"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/web"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/web"
)
// RecipeCatalogueURL is the only current recipe catalogue available.

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

0
client/connection.go → pkg/client/connection.go
View File

0
client/container/LICENSE → pkg/client/container/LICENSE
View File

0
client/container/README.md → pkg/client/container/README.md
View File

0
client/container/exec.go → pkg/client/container/exec.go
View File

0
client/container/hijack.go → pkg/client/container/hijack.go
View File

0
client/container/tty.go → pkg/client/container/tty.go
View File

0
client/context.go → pkg/client/context.go
View File

0
client/context_test.go → pkg/client/context_test.go
View File

0
client/convert/LICENSE → pkg/client/convert/LICENSE
View File

0
client/convert/README.md → pkg/client/convert/README.md
View File

0
client/convert/compose.go → pkg/client/convert/compose.go
View File

0
client/convert/compose_test.go → pkg/client/convert/compose_test.go
View File

0
client/convert/service.go → pkg/client/convert/service.go
View File

0
client/convert/service_test.go → pkg/client/convert/service_test.go
View File

0
client/convert/volume.go → pkg/client/convert/volume.go
View File

0
client/convert/volume_test.go → pkg/client/convert/volume_test.go
View File

2
client/registry.go → pkg/client/registry.go
View File

@ -7,7 +7,7 @@ import (
"net/http"
"strings"
"coopcloud.tech/abra/web"
"coopcloud.tech/abra/pkg/web"
"github.com/docker/distribution/reference"
)

0
client/secret.go → pkg/client/secret.go
View File

0
client/stack/loader.go → pkg/client/stack/loader.go
View File

0
client/stack/options.go → pkg/client/stack/options.go
View File

0
client/stack/remove.go → pkg/client/stack/remove.go
View File

4
client/stack/stack.go → pkg/client/stack/stack.go
View File

@ -4,8 +4,8 @@ import (
"context"
"strings"
abraClient "coopcloud.tech/abra/client"
"coopcloud.tech/abra/client/convert"
abraClient "coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/client/convert"
composetypes "github.com/docker/cli/cli/compose/types"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"

0
client/volumes.go → pkg/client/volumes.go
View File

6
config/app.go → pkg/config/app.go
View File

@ -9,9 +9,9 @@ import (
"path/filepath"
"strings"
"coopcloud.tech/abra/client/convert"
loader "coopcloud.tech/abra/client/stack"
stack "coopcloud.tech/abra/client/stack"
"coopcloud.tech/abra/pkg/client/convert"
loader "coopcloud.tech/abra/pkg/client/stack"
stack "coopcloud.tech/abra/pkg/client/stack"
composetypes "github.com/docker/cli/cli/compose/types"
"github.com/docker/distribution/reference"
"github.com/sirupsen/logrus"

0
config/app_test.go → pkg/config/app_test.go
View File

0
config/env.go → pkg/config/env.go
View File

0
config/env_test.go → pkg/config/env_test.go
View File

2
recipe/recipe.go → pkg/recipe/recipe.go
View File

@ -6,7 +6,7 @@ import (
"path"
"strings"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/config"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
)

0
secret/pass.go → pkg/secret/pass.go
View File

4
secret/secret.go → pkg/secret/secret.go
View File

@ -9,8 +9,8 @@ import (
"strconv"
"strings"
"coopcloud.tech/abra/client"
"coopcloud.tech/abra/config"
"coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config"
"github.com/schultz-is/passgen"
)

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