Skip to content

Commit 00938ac

Browse files
authored
Update to go-1.26 (#20)
1 parent 82373d2 commit 00938ac

17 files changed

Lines changed: 97 additions & 108 deletions

File tree

.github/workflows/docker.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@v6
2525

2626
- name: Setup Go
2727
uses: actions/setup-go@v6
@@ -30,7 +30,7 @@ jobs:
3030
cache: false
3131

3232
- name: Lint
33-
uses: golangci/golangci-lint-action@v8
33+
uses: golangci/golangci-lint-action@v9
3434
with:
3535
args: --build-tags integration --timeout=5m
3636

@@ -58,7 +58,7 @@ jobs:
5858

5959
steps:
6060
- name: Checkout code
61-
uses: actions/checkout@v5
61+
uses: actions/checkout@v6
6262

6363
- name: Setup Go
6464
uses: actions/setup-go@v6

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.22
1+
FROM alpine:3.23
22
LABEL maintainer="metal-stack authors <info@metal-stack.io>"
33
COPY bin/metalctlv2-linux-amd64 /metalctl
44
ENTRYPOINT ["/metalctl"]

cmd/admin/v2/image.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (c *image) Update(rq *adminv2.ImageServiceUpdateRequest) (*apiv2.Image, err
146146

147147
req := &adminv2.ImageServiceUpdateRequest{
148148
Id: viper.GetString("id"),
149-
Url: pointer.Pointer(viper.GetString("url")),
149+
Url: new(viper.GetString("url")),
150150
Description: pointer.PointerOrNil(viper.GetString("description")),
151151
ExpiresAt: expiresAt,
152152
Features: imageFeaturesFromString(viper.GetStringSlice("features")),

cmd/admin/v2/tenant.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ func (c *tenant) List() ([]*apiv2.Tenant, error) {
6969
req := &adminv2.TenantServiceListRequest{
7070
Name: pointer.PointerOrNil(viper.GetString("name")),
7171
Login: pointer.PointerOrNil(viper.GetString("id")),
72-
Email: pointer.PointerOrNil(viper.GetString("email")),
7372
}
7473

7574
resp, err := c.c.Client.Adminv2().Tenant().List(ctx, req)

cmd/admin/v2/token.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/metal-stack/cli/cmd/sorters"
1010
"github.com/metal-stack/metal-lib/pkg/genericcli"
1111
"github.com/metal-stack/metal-lib/pkg/genericcli/printers"
12-
"github.com/metal-stack/metal-lib/pkg/pointer"
1312
"github.com/spf13/cobra"
1413
"github.com/spf13/viper"
1514
)
@@ -57,7 +56,7 @@ func (c *token) List() ([]*apiv2.Token, error) {
5756
req := &adminv2.TokenServiceListRequest{}
5857

5958
if viper.IsSet("user") {
60-
req.User = pointer.Pointer(viper.GetString("user"))
59+
req.User = new(viper.GetString("user"))
6160
}
6261

6362
resp, err := c.c.Client.Adminv2().Token().List(ctx, req)

cmd/api/v2/ip.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/metal-stack/cli/pkg/helpers"
1010
"github.com/metal-stack/metal-lib/pkg/genericcli"
1111
"github.com/metal-stack/metal-lib/pkg/genericcli/printers"
12-
"github.com/metal-stack/metal-lib/pkg/pointer"
1312
"github.com/spf13/cobra"
1413
"github.com/spf13/viper"
1514
)
@@ -70,11 +69,11 @@ func newIPCmd(c *config.Config) *cobra.Command {
7069
CreateRequestFromCLI: func() (*apiv2.IPServiceCreateRequest, error) {
7170
return &apiv2.IPServiceCreateRequest{
7271
Project: c.GetProject(),
73-
Name: pointer.Pointer(viper.GetString("name")),
74-
Description: pointer.Pointer(viper.GetString("description")),
72+
Name: new(viper.GetString("name")),
73+
Description: new(viper.GetString("description")),
7574
Network: viper.GetString("network"),
7675
// Labels: viper.GetStringSlice("tags"), // FIXME implement
77-
Type: pointer.Pointer(ipStaticToType(viper.GetBool("static"))),
76+
Type: new(ipStaticToType(viper.GetBool("static"))),
7877
AddressFamily: addressFamilyToType(viper.GetString("addressfamily")),
7978
}, nil
8079
},

cmd/api/v2/project.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ func (c *project) Convert(r *apiv2.Project) (string, *apiv2.ProjectServiceCreate
228228
Description: r.Description,
229229
}, &apiv2.ProjectServiceUpdateRequest{
230230
Project: r.Uuid,
231-
Name: pointer.Pointer(r.Name),
232-
Description: pointer.Pointer(r.Description),
231+
Name: new(r.Name),
232+
Description: new(r.Description),
233233
}, nil
234234
}
235235

cmd/api/v2/token.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func newTokenCmd(c *config.Config) *cobra.Command {
8585
return nil, fmt.Errorf("unknown role: %s", roleString)
8686
}
8787

88-
adminRole = pointer.Pointer(apiv2.AdminRole(role))
88+
adminRole = new(apiv2.AdminRole(role))
8989
}
9090

9191
return &apiv2.TokenServiceCreateRequest{

cmd/common_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ func (c *Test[R]) TestCmd(t *testing.T) {
6262
}
6363

6464
for _, format := range outputFormats(c) {
65-
format := format
6665
t.Run(fmt.Sprintf("%v", format.Args()), func(t *testing.T) {
6766
_, out, conf := c.newMockConfig(t)
6867

cmd/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (c *Config) NewRequestContext() (context.Context, context.CancelFunc) {
4444
timeout = pointer.Pointer(30 * time.Second)
4545
}
4646
if viper.IsSet("timeout") {
47-
timeout = pointer.Pointer(viper.GetDuration("timeout"))
47+
timeout = new(viper.GetDuration("timeout"))
4848
}
4949

5050
return context.WithTimeout(context.Background(), *timeout)

0 commit comments

Comments
 (0)