starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-01 22:53:05 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor: move task, error and testing utils to separte repo; apply gofumpt

Browse Source
This commit is contained in:
yusing
2025-09-27 13:41:50 +08:00
parent 5043ef778f
commit 6776f20332
203 changed files with 696 additions and 2800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/docker/client.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/yusing/godoxy/agent/pkg/agent"
"github.com/yusing/godoxy/internal/common"
"github.com/yusing/godoxy/internal/task"
"github.com/yusing/goutils/task"
)
// TODO: implement reconnect here.

4
internal/docker/container.go
View File

@@ -14,10 +14,10 @@ import (
"github.com/docker/docker/api/types/container"
"github.com/docker/go-connections/nat"
"github.com/yusing/godoxy/agent/pkg/agent"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/serialization"
"github.com/yusing/godoxy/internal/types"
"github.com/yusing/godoxy/internal/utils"
gperr "github.com/yusing/goutils/errs"
)
var DummyContainer = new(types.Container)
@@ -84,7 +84,7 @@ func FromDocker(c *container.Summary, dockerHost string) (res *types.Container)
if res.PrivateHostname == "" && res.PublicHostname == "" && res.Running {
addError(res, ErrNoNetwork)
}
return
return res
}
func IsBlacklisted(c *types.Container) bool {

12
internal/docker/container_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing"
"github.com/docker/docker/api/types/container"
. "github.com/yusing/godoxy/internal/utils/testing"
expect "github.com/yusing/goutils/testing"
)
func TestContainerExplicit(t *testing.T) {
@@ -37,7 +37,7 @@ func TestContainerExplicit(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := FromDocker(&container.Summary{Names: []string{"test"}, State: "test", Labels: tt.labels}, "")
ExpectEqual(t, c.IsExplicit, tt.isExplicit)
expect.Equal(t, c.IsExplicit, tt.isExplicit)
})
}
}
@@ -74,7 +74,7 @@ func TestContainerHostNetworkMode(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := FromDocker(tt.container, "")
ExpectEqual(t, c.IsHostNetworkMode, tt.isHostNetworkMode)
expect.Equal(t, c.IsHostNetworkMode, tt.isHostNetworkMode)
})
}
}
@@ -109,9 +109,9 @@ func TestImageNameParsing(t *testing.T) {
t.Run(tt.full, func(t *testing.T) {
helper := containerHelper{&container.Summary{Image: tt.full}}
im := helper.parseImage()
ExpectEqual(t, im.Author, tt.author)
ExpectEqual(t, im.Name, tt.image)
ExpectEqual(t, im.Tag, tt.tag)
expect.Equal(t, im.Author, tt.author)
expect.Equal(t, im.Name, tt.image)
expect.Equal(t, im.Tag, tt.tag)
})
}
}

2
internal/docker/label.go
View File

@@ -5,8 +5,8 @@ import (
"strings"
"github.com/goccy/go-yaml"
"github.com/yusing/godoxy/internal/gperr"
"github.com/yusing/godoxy/internal/types"
gperr "github.com/yusing/goutils/errs"
strutils "github.com/yusing/goutils/strings"
)