Skip to content

Modern Docker Management, Designed for Everyone

fix: preserve IPAM fields in network inspect responses (#3335)

Kyle Mendell7de00386eeb9
diff --git a/backend/pkg/utils/mapper/mapper.go b/backend/pkg/utils/mapper/mapper.go
index 18906ead0..f542d26e9 100644
--- a/backend/pkg/utils/mapper/mapper.go
+++ b/backend/pkg/utils/mapper/mapper.go
@@ -1,10 +1,46 @@
package mapper
import (
+ "fmt"
+ "net/netip"
+
"emperror.dev/errors"
"github.com/jinzhu/copier"
)
+var typeConverters = []copier.TypeConverter{
+ {
+ SrcType: netip.Prefix{},
+ DstType: "",
+ Fn: func(src any) (any, error) {
+ prefix, ok := src.(netip.Prefix)
+ if !ok {
+ return nil, fmt.Errorf("expected netip.Prefix, got %T", src)
+ }
+ if !prefix.IsValid() {
+ return "", nil
+ }
+
+ return prefix.String(), nil
+ },
+ },
+ {
+ SrcType: netip.Addr{},
+ DstType: "",
+ Fn: func(src any) (any, error) {
+ addr, ok := src.(netip.Addr)
+ if !ok {
+ return nil, fmt.Errorf("expected netip.Addr, got %T", src)
+ }
+ if !addr.IsValid() {
+ return "", nil
+ }
+
+ return addr.String(), nil
+ },
+ },
+}
+
func MapSlice[S any, D any](source []S) ([]D, error) {
dest := make([]D, len(source))
for i := range source {
@@ -25,7 +61,8 @@ func MapOne[S any, D any](source S) (D, error) {
func MapStruct(source any, destination any) error {
return copier.CopyWithOption(destination, source, copier.Option{
- DeepCopy: true,
+ DeepCopy: true,
+ Converters: typeConverters,
})
}
diff --git a/backend/pkg/utils/mapper/mapper_test.go b/backend/pkg/utils/mapper/mapper_test.go
new file mode 100644
index 000000000..ff9d99e83
--- /dev/null
+++ b/backend/pkg/utils/mapper/mapper_test.go
@@ -0,0 +1,44 @@
+package mapper
+
+import (
+ "net/netip"
+ "testing"
+
+ networktypes "github.com/getarcaneapp/arcane/types/v2/network"
+ dockernetwork "github.com/moby/moby/api/types/network"
+ "github.com/stretchr/testify/require"
+)
+
+func TestMapOneConvertsNetworkIPAMConfigInternal(t *testing.T) {
+ source := dockernetwork.Inspect{
+ Network: dockernetwork.Network{
+ IPAM: dockernetwork.IPAM{
+ Driver: "default",
+ Config: []dockernetwork.IPAMConfig{
+ {
+ Subnet: netip.MustParsePrefix("172.16.5.0/24"),
+ Gateway: netip.MustParseAddr("172.16.5.1"),
+ AuxAddress: map[string]netip.Addr{
+ "dns": netip.MustParseAddr("172.16.5.53"),
+ "unset": {},
+ },
+ },
+ },
+ },
+ },
+ }
+
+ mapped, err := MapOne[dockernetwork.Inspect, networktypes.Inspect](source)
+ require.NoError(t, err)
+ require.Equal(t, "default", mapped.IPAM.Driver)
+ require.Len(t, mapped.IPAM.Config, 1)
+
+ config := mapped.IPAM.Config[0]
+ require.Equal(t, "172.16.5.0/24", config.Subnet)
+ require.Equal(t, "172.16.5.1", config.Gateway)
+ require.Empty(t, config.IPRange)
+ require.Equal(t, map[string]string{
+ "dns": "172.16.5.53",
+ "unset": "",
+ }, config.AuxAddress)
+}