Skip to content

Commit 868e633

Browse files
committed
fix ci
1 parent 2331900 commit 868e633

File tree

7 files changed

+17
-13
lines changed

7 files changed

+17
-13
lines changed

docs/reference/manual/hcloud_primary-ip_create.md

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/manual/hcloud_server_create.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/cmd/all/list_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func TestListAll(t *testing.T) {
4141
},
4242
},
4343
Created: time.Now().Add(-72 * time.Hour),
44+
Location: &hcloud.Location{Name: "hel1"},
4445
Datacenter: &hcloud.Datacenter{Name: "hel1-dc2"},
4546
},
4647
}, nil)
@@ -236,8 +237,8 @@ func TestListAll(t *testing.T) {
236237

237238
expOut := `SERVERS
238239
---
239-
ID NAME STATUS IPV4 IPV6 PRIVATE NET DATACENTER AGE
240-
123 my server running 192.0.2.1 - - hel1-dc2 3d
240+
ID NAME STATUS IPV4 IPV6 PRIVATE NET LOCATION AGE
241+
123 my server running 192.0.2.1 - - hel1 3d
241242
242243
IMAGES
243244
---

internal/cmd/primaryip/create_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestCreate(t *testing.T) {
3939
hcloud.PrimaryIPCreateOpts{
4040
Name: "my-ip",
4141
Type: "ipv4",
42-
Datacenter: "fsn1-dc14",
42+
Location: "fsn1",
4343
Labels: map[string]string{"foo": "bar"},
4444
AssigneeType: "server",
4545
AutoDelete: hcloud.Ptr(true),
@@ -87,6 +87,9 @@ func TestCreateJSON(t *testing.T) {
8787
Name: "my-ip",
8888
IP: net.ParseIP("192.168.2.1"),
8989
Type: "ipv4",
90+
Location: &hcloud.Location{
91+
Name: "fsn1",
92+
},
9093
Datacenter: &hcloud.Datacenter{
9194
ID: 1,
9295
Name: "fsn1-dc14",
@@ -106,7 +109,7 @@ func TestCreateJSON(t *testing.T) {
106109
hcloud.PrimaryIPCreateOpts{
107110
Name: "my-ip",
108111
Type: "ipv4",
109-
Datacenter: "fsn1-dc14",
112+
Location: "fsn1",
110113
Labels: map[string]string{"foo": "bar"},
111114
AssigneeType: "server",
112115
AutoDelete: hcloud.Ptr(true),

internal/cmd/primaryip/testdata/create_response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"id": 0,
1313
"latitude": 0,
1414
"longitude": 0,
15-
"name": "",
15+
"name": "fsn1",
1616
"network_zone": ""
1717
},
1818
"datacenter": {

internal/cmd/server/create.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,7 @@ func createOptsFromFlags(
444444
// Else -> Backwards-compatible split
445445
var datacenterID int64
446446
datacenterID, err = strconv.ParseInt(datacenterIDOrName, 10, 64)
447-
448-
if err != nil {
447+
if err == nil {
449448
// Input was a valid number/ID
450449
var datacenter *hcloud.Datacenter
451450
datacenter, _, err = s.Client().Datacenter().GetByID(s, datacenterID)
@@ -466,6 +465,7 @@ func createOptsFromFlags(
466465

467466
if len(parts) != 2 {
468467
err = fmt.Errorf("Datacenter name is not valid, expected format $LOCATION-$DATACENTER, but got: %s", datacenterIDOrName)
468+
return
469469
}
470470

471471
createOpts.Location = &hcloud.Location{Name: parts[0]}

internal/cmd/server/list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ var ListCmd = &base.ListCmd[*hcloud.Server, schema.Server]{
9191
AddFieldFn("datacenter", func(server *hcloud.Server) string {
9292
if server.Datacenter != nil {
9393
return server.Datacenter.Name
94-
} else {
95-
return "-"
9694
}
95+
return "-"
96+
9797
}).
9898
AddFieldFn("location", func(server *hcloud.Server) string {
9999
return server.Location.Name

0 commit comments

Comments
 (0)