Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: printing for server create with mulitple networks #824

Merged
merged 1 commit into from
Jul 25, 2024
Merged

fix: printing for server create with mulitple networks #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions internal/cmd/server/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,10 @@ var CreateCmd = base.CreateCmd{
cmd.Printf("IPv6 Network: %s\n", server.PublicNet.IPv6.Network.String())
}
if len(server.PrivateNet) > 0 {
var networks []string
cmd.Printf("Private Networks:\n")
for _, network := range server.PrivateNet {
networks = append(networks, fmt.Sprintf("- %s (%s)", network.IP.String(), s.Client().Network().Name(network.Network.ID)))
cmd.Printf("\t- %s (%s)\n", network.IP.String(), s.Client().Network().Name(network.Network.ID))
}
cmd.Printf("Private Networks:\n\t%s\n", strings.Join(networks, "\n"))
}
// Only print the root password if it's not empty,
// which is only the case if it wasn't created with an SSH key.
Expand Down
56 changes: 48 additions & 8 deletions internal/cmd/server/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/hetznercloud/cli/internal/cmd/server"
"github.com/hetznercloud/cli/internal/testutil"
"github.com/hetznercloud/hcloud-go/v2/hcloud"
"github.com/hetznercloud/hcloud-go/v2/hcloud/schema"
)

//go:embed testdata/create_response.json
Expand Down Expand Up @@ -41,27 +42,60 @@ func TestCreate(t *testing.T) {
Server: &hcloud.Server{
ID: 1234,
PublicNet: hcloud.ServerPublicNet{
IPv4: hcloud.ServerPublicNetIPv4{
IP: net.ParseIP("192.0.2.1"),
},
IPv4: hcloud.ServerPublicNetIPv4FromSchema(schema.ServerPublicNetIPv4{
IP: "192.0.2.1",
}),
IPv6: hcloud.ServerPublicNetIPv6FromSchema(schema.ServerPublicNetIPv6{
IP: "2001:0db8:c013:4d58::/64",
}),
},
PrivateNet: []hcloud.ServerPrivateNet{
hcloud.ServerPrivateNetFromSchema(schema.ServerPrivateNet{
Network: 4461841,
IP: "10.1.0.2",
}),
hcloud.ServerPrivateNetFromSchema(schema.ServerPrivateNet{
Network: 4461842,
IP: "10.2.0.2",
}),
},
},
Action: &hcloud.Action{ID: 123},
NextActions: []*hcloud.Action{{ID: 234}},
Action: &hcloud.Action{ID: 123},
NextActions: []*hcloud.Action{{ID: 234}},
RootPassword: "password",
}, nil, nil)
fx.Client.ServerClient.EXPECT().
GetByID(gomock.Any(), int64(1234)).
Return(&hcloud.Server{
ID: 1234,
PublicNet: hcloud.ServerPublicNet{
IPv4: hcloud.ServerPublicNetIPv4{
IP: net.ParseIP("192.0.2.1"),
},
IPv4: hcloud.ServerPublicNetIPv4FromSchema(schema.ServerPublicNetIPv4{
IP: "192.0.2.1",
}),
IPv6: hcloud.ServerPublicNetIPv6FromSchema(schema.ServerPublicNetIPv6{
IP: "2001:0db8:c013:4d58::/64",
}),
},
PrivateNet: []hcloud.ServerPrivateNet{
hcloud.ServerPrivateNetFromSchema(schema.ServerPrivateNet{
Network: 4461841,
IP: "10.1.0.2",
}),
hcloud.ServerPrivateNetFromSchema(schema.ServerPrivateNet{
Network: 4461842,
IP: "10.2.0.2",
}),
},
}, nil, nil)
fx.ActionWaiter.EXPECT().
WaitForActions(gomock.Any(), gomock.Any(), []*hcloud.Action{{ID: 123}, {ID: 234}}).
Return(nil)
fx.Client.NetworkClient.EXPECT().
Name(int64(4461841)).
Return("foo")
fx.Client.NetworkClient.EXPECT().
Name(int64(4461842)).
Return("bar")

args := []string{"--name", "cli-test", "--type", "cx22", "--image", "ubuntu-20.04"}
out, errOut, err := fx.Run(cmd, args)
Expand All @@ -70,6 +104,12 @@ func TestCreate(t *testing.T) {
assert.Empty(t, errOut)
expOut := `Server 1234 created
IPv4: 192.0.2.1
IPv6: 2001:db8:c013:4d58::1
IPv6 Network: 2001:db8:c013:4d58::/64
Private Networks:
- 10.1.0.2 (foo)
- 10.2.0.2 (bar)
Root password: password
`
assert.Equal(t, expOut, out)
}
Expand Down
Loading