InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: rename/deprecate WithVersion, WithVersionFromEnv

Browse Source 
Add WithAPIVersion and WithAPIVersionFromEnv to be more clear on
the intent, and to align with other related options and fields.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-11-12 16:39:20 +01:00
parent e5db2380f5
commit dae3650dcc
34 changed files with 111 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
integration/network/bridge/bridge_linux_test.go
View File

@@ -948,7 +948,7 @@ func TestEmptyPortBindingsBC(t *testing.T) {
defer d.Stop(t)
createInspect := func(t *testing.T, version string, pbs []networktypes.PortBinding) (networktypes.PortMap, []string) {
apiClient := d.NewClientT(t, client.WithVersion(version))
apiClient := d.NewClientT(t, client.WithAPIVersion(version))
defer apiClient.Close()
// Skip this subtest if the daemon doesn't support the client version.
@@ -1074,7 +1074,7 @@ func TestBridgeIPAMStatus(t *testing.T) {
d.StartWithBusybox(ctx, t)
defer d.Stop(t)
c := d.NewClientT(t, client.WithVersion("1.52"))
c := d.NewClientT(t, client.WithAPIVersion("1.52"))
checkSubnets := func(
netName string, want networktypes.SubnetStatuses,
@@ -1193,7 +1193,7 @@ func TestBridgeIPAMStatus(t *testing.T) {
},
})
oldc := d.NewClientT(t, client.WithVersion("1.51"))
oldc := d.NewClientT(t, client.WithAPIVersion("1.51"))
res, err := oldc.NetworkInspect(ctx, netName, client.NetworkInspectOptions{})
if assert.Check(t, err) {
assert.Check(t, res.Network.Status == nil, "expected nil Status with API version 1.51")

6
integration/network/ipvlan/ipvlan_test.go
View File

@@ -488,7 +488,7 @@ func TestIpvlanIPAM(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
ctx := testutil.StartSpan(ctx, t)
c := d.NewClientT(t, client.WithVersion(tc.apiVersion))
c := d.NewClientT(t, client.WithAPIVersion(tc.apiVersion))
netOpts := []func(*client.NetworkCreateOptions){
net.WithIPvlan("", "l3"),
@@ -551,13 +551,13 @@ func TestIpvlanIPAM(t *testing.T) {
}
assert.Check(t, is.Equal(strings.TrimSpace(sysctlRes.Combined()), expDisableIPv6))
cc := d.NewClientT(t, client.WithVersion("1.52"))
cc := d.NewClientT(t, client.WithAPIVersion("1.52"))
res, err := cc.NetworkInspect(ctx, netName, client.NetworkInspectOptions{})
if assert.Check(t, err) && assert.Check(t, res.Network.Status != nil) {
assert.Check(t, is.DeepEqual(wantSubnetStatus, res.Network.Status.IPAM.Subnets, cmpopts.EquateEmpty()))
}
cc.Close()
cc = d.NewClientT(t, client.WithVersion("1.51"))
cc = d.NewClientT(t, client.WithAPIVersion("1.51"))
res, err = cc.NetworkInspect(ctx, netName, client.NetworkInspectOptions{})
assert.Check(t, err)
assert.Check(t, res.Network.Status == nil)

6
integration/network/macvlan/macvlan_test.go
View File

@@ -484,7 +484,7 @@ func TestMacvlanIPAM(t *testing.T) {
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
ctx := testutil.StartSpan(ctx, t)
c := d.NewClientT(t, client.WithVersion(tc.apiVersion))
c := d.NewClientT(t, client.WithAPIVersion(tc.apiVersion))
netOpts := []func(*client.NetworkCreateOptions){
net.WithMacvlan(""),
@@ -554,13 +554,13 @@ func TestMacvlanIPAM(t *testing.T) {
}
assert.Check(t, is.Equal(strings.TrimSpace(sysctlRes.Combined()), expDisableIPv6))
cc := d.NewClientT(t, client.WithVersion("1.52"))
cc := d.NewClientT(t, client.WithAPIVersion("1.52"))
res, err := cc.NetworkInspect(ctx, netName, client.NetworkInspectOptions{})
if assert.Check(t, err) && assert.Check(t, res.Network.Status != nil) {
assert.Check(t, is.DeepEqual(wantSubnetStatus, res.Network.Status.IPAM.Subnets, cmpopts.EquateEmpty()))
}
_ = cc.Close()
cc = d.NewClientT(t, client.WithVersion("1.51"))
cc = d.NewClientT(t, client.WithAPIVersion("1.51"))
res, err = cc.NetworkInspect(ctx, netName, client.NetworkInspectOptions{})
assert.Check(t, err)
assert.Check(t, res.Network.Status == nil)