Update go, alpine, proto toolchain (#527)

Author: majst01

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 RUN apk -U add ca-certificates
 COPY bin/metal-api /metal-api
 CMD ["/metal-api"]

cmd/metal-api/internal/grpc/boot-service-wait_integration_test.go

@@ -249,15 +249,14 @@ func (t *test) startMachineInstances() {
 	opts := []grpc.DialOption{
 		grpc.WithKeepaliveParams(kacp),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
-		grpc.WithBlock(),
 	}
 	for i := range t.numberMachineInstances {
 		machineID := strconv.Itoa(i)
 		// golangci-lint has an issue with math/rand/v2
 		// here it provides sufficient randomness though because it's not used for cryptographic purposes
 		port := 50005 + rand.N(t.numberApiInstances) //nolint:gosec
 		ctx, cancel := context.WithCancel(context.Background())
-		conn, err := grpc.DialContext(ctx, fmt.Sprintf("localhost:%d", port), opts...)
+		conn, err := grpc.NewClient(fmt.Sprintf("localhost:%d", port), opts...)
 		require.NoError(t, err)
 		t.cc = append(t.cc, &client{
 			ClientConn: conn,

cmd/metal-api/internal/headscale/client.go

@@ -52,18 +52,14 @@ func NewHeadscaleClient(addr, controlPlaneAddr, apiKey string, logger *slog.Logg
 
 // Connect or reconnect to Headscale server
 func (h *HeadscaleClient) connect(apiKey string) (err error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
 	grpcOptions := []grpc.DialOption{
-		grpc.WithBlock(),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithPerRPCCredentials(tokenAuth{
 			token: apiKey,
 		}),
 	}
 
-	h.conn, err = grpc.DialContext(ctx, h.address, grpcOptions...)
+	h.conn, err = grpc.NewClient(h.address, grpcOptions...)
 	if err != nil {
 		return fmt.Errorf("failed to connect to headscale server %s: %w", h.address, err)
 	}

cmd/metal-api/internal/metal/network.go

@@ -67,7 +67,7 @@ type NicState struct {
 // state has been reached.
 //
 // If the given status differs from the current Actual state, Desired is left
-// unchanged if it differes from the new state so the desired state is still tracked.
+// unchanged if it differs from the new state so the desired state is still tracked.
 // The Actual state is updated to the given status.
 //
 // This allows tracking both the desired and actual states, while clearing

cmd/metal-api/internal/service/integration_test.go

@@ -85,7 +85,7 @@ func createTestEnvironment(t *testing.T) testEnv {
 	psc.On("Find", testifymock.Anything, &mdmv1.ProjectFindRequest{}).Return(&mdmv1.ProjectListResponse{Projects: []*mdmv1.Project{
 		{Meta: &mdmv1.Meta{Id: "test-project-1"}},
 	}}, nil)
-	mdc := mdm.NewMock(psc, nil, nil)
+	mdc := mdm.NewMock(psc, nil, nil, nil)
 
 	go func() {
 		err := metalgrpc.Run(&metalgrpc.ServerConfig{
@@ -397,11 +397,10 @@ func (te *testEnv) machineWait(uuid string) error {
 	opts := []grpc.DialOption{
 		grpc.WithKeepaliveParams(kacp),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
-		grpc.WithBlock(),
 	}
 
 	port := 50005
-	conn, err := grpc.DialContext(context.Background(), fmt.Sprintf("localhost:%d", port), opts...)
+	conn, err := grpc.NewClient(fmt.Sprintf("localhost:%d", port), opts...)
 	if err != nil {
 		return err
 	}

cmd/metal-api/internal/service/ip-service_test.go

@@ -182,7 +182,7 @@ func TestAllocateIP(t *testing.T) {
 	)
 	tsc := mdmock.TenantServiceClient{}
 
-	mdc := mdm.NewMock(&psc, &tsc, nil)
+	mdc := mdm.NewMock(&psc, &tsc, nil, nil)
 
 	ipservice, err := NewIP(logger, ds, bus.DirectEndpoints(), ipamer, mdc)
 	require.NoError(t, err)

cmd/metal-api/internal/service/machine-service_allocation_test.go

@@ -56,11 +56,8 @@ func TestMachineAllocationIntegration(t *testing.T) {
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
 	port := 50006
-	conn, err := grpc.DialContext(ctx, fmt.Sprintf("localhost:%d", port), opts...)
+	conn, err := grpc.NewClient(fmt.Sprintf("localhost:%d", port), opts...)
 	require.NoError(t, err)
 
 	c := grpcv1.NewBootServiceClient(conn)
@@ -304,7 +301,7 @@ func setupTestEnvironment(machineCount int, t *testing.T) (*datastore.RethinkSto
 
 	psc := &mdmv1mock.ProjectServiceClient{}
 	psc.On("Get", testifymock.Anything, &mdmv1.ProjectGetRequest{Id: "pr1"}).Return(&mdmv1.ProjectResponse{Project: &mdmv1.Project{}}, nil)
-	mdc := mdm.NewMock(psc, nil, nil)
+	mdc := mdm.NewMock(psc, nil, nil, nil)
 
 	_, pg, err := test.StartPostgres()
 	require.NoError(t, err)

cmd/metal-api/internal/service/machine-service_integration_test.go

@@ -81,7 +81,7 @@ func TestMachineAllocationIntegrationFullCycle(t *testing.T) {
 	defer cancel()
 
 	port := 50005
-	conn, err := grpc.DialContext(ctx, fmt.Sprintf("localhost:%d", port), opts...)
+	conn, err := grpc.NewClient(fmt.Sprintf("localhost:%d", port), opts...)
 	require.NoError(t, err)
 
 	c := grpcv1.NewBootServiceClient(conn)

cmd/metal-api/internal/service/project-service_test.go

@@ -45,7 +45,7 @@ func NewMockedProjectService(t *testing.T, projectServiceMock func(mock *mdmv1mo
 	if projectServiceMock != nil {
 		projectServiceMock(psc)
 	}
-	mdc := mdm.NewMock(psc, &mdmv1mock.TenantServiceClient{}, nil)
+	mdc := mdm.NewMock(psc, &mdmv1mock.TenantServiceClient{}, nil, nil)
 	ds, mock := datastore.InitMockDB(t)
 	if dsmock != nil {
 		dsmock(mock)

cmd/metal-api/internal/service/size-service_test.go

@@ -177,7 +177,7 @@ func TestCreateSize(t *testing.T) {
 	psc.On("Find", testifymock.Anything, &mdmv1.ProjectFindRequest{}).Return(&mdmv1.ProjectListResponse{Projects: []*mdmv1.Project{
 		{Meta: &mdmv1.Meta{Id: "a"}},
 	}}, nil)
-	mdc := mdm.NewMock(psc, &mdmv1mock.TenantServiceClient{}, nil)
+	mdc := mdm.NewMock(psc, &mdmv1mock.TenantServiceClient{}, nil, nil)
 
 	sizeservice := NewSize(log, ds, mdc)
 	container := restful.NewContainer().Add(sizeservice)
@@ -243,7 +243,7 @@ func TestUpdateSize(t *testing.T) {
 	psc.On("Find", testifymock.Anything, &mdmv1.ProjectFindRequest{}).Return(&mdmv1.ProjectListResponse{Projects: []*mdmv1.Project{
 		{Meta: &mdmv1.Meta{Id: "p1"}},
 	}}, nil)
-	mdc := mdm.NewMock(psc, &mdmv1mock.TenantServiceClient{}, nil)
+	mdc := mdm.NewMock(psc, &mdmv1mock.TenantServiceClient{}, nil, nil)
 
 	sizeservice := NewSize(log, ds, mdc)
 	container := restful.NewContainer().Add(sizeservice)
@@ -301,7 +301,7 @@ func TestListSizeReservations(t *testing.T) {
 	psc.On("Find", testifymock.Anything, &mdmv1.ProjectFindRequest{}).Return(&mdmv1.ProjectListResponse{Projects: []*mdmv1.Project{
 		{Meta: &mdmv1.Meta{Id: "p1"}},
 	}}, nil)
-	mdc := mdm.NewMock(psc, &mdmv1mock.TenantServiceClient{}, nil)
+	mdc := mdm.NewMock(psc, &mdmv1mock.TenantServiceClient{}, nil, nil)
 
 	sizeservice := NewSize(log, ds, mdc)
 	container := restful.NewContainer().Add(sizeservice)