Migrate away from deprecated wrappers (#81)

Author: majst01

.github/workflows/docker.yaml

@@ -38,15 +38,16 @@ jobs:
         cache: false
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v7
       with:
-        args: --build-tags integration -p bugs -p unused -D protogetter --timeout=10m
+        args: --build-tags integration -D protogetter --timeout=10m
 
-    - name: Make tag
-      run: |
-        [ "${GITHUB_EVENT_NAME}" == 'pull_request' ] && echo "tag=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV || true
-        [ "${GITHUB_EVENT_NAME}" == 'release' ] && echo "tag=${GITHUB_REF##*/}" >> $GITHUB_ENV || true
-        [ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: |
+          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
     - name: Build and Test
       run: |
@@ -63,4 +64,4 @@ jobs:
         context: .
         push: true
         sbom: true
-        tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.tag }}
+        tags: ${{ steps.meta.outputs.tags }}

Dockerfile

@@ -1,5 +1,5 @@
-FROM alpine:3.21 as health-downloader
-ENV GRPC_HEALTH_PROBE_VERSION=v0.4.37 \
+FROM alpine:3.22 AS health-downloader
+ENV GRPC_HEALTH_PROBE_VERSION=v0.4.39 \
     GRPC_HEALTH_PROBE_URL=https://github.com/grpc-ecosystem/grpc-health-probe/releases/download
 RUN apk -U add curl \
  && curl -fLso /bin/grpc_health_probe \

api/rest/mapper/mapper.go

@@ -6,7 +6,6 @@ import (
 	v1 "github.com/metal-stack/masterdata-api/api/rest/v1"
 	mdmv1 "github.com/metal-stack/masterdata-api/api/v1"
 	"google.golang.org/protobuf/types/known/timestamppb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 func ToMdmV1Tenant(t *v1.Tenant) *mdmv1.Tenant {
@@ -145,14 +144,9 @@ func ToMdmV1Quota(q *v1.Quota) *mdmv1.Quota {
 	if q == nil {
 		return nil
 	}
-	if q.Quota == nil {
-		return nil
-	}
 
 	return &mdmv1.Quota{
-		Quota: &wrapperspb.Int32Value{
-			Value: *q.Quota,
-		},
+		Max: q.Quota,
 	}
 }
 
@@ -178,18 +172,11 @@ func ToMdmV1ProjectFindRequest(r *v1.ProjectFindRequest) *mdmv1.ProjectFindReque
 		return nil
 	}
 
-	mdmv1r := new(mdmv1.ProjectFindRequest)
-	if r.Id != nil {
-		mdmv1r.Id = &wrapperspb.StringValue{Value: *r.Id}
-	}
-	if r.Description != nil {
-		mdmv1r.Description = &wrapperspb.StringValue{Value: *r.Description}
-	}
-	if r.Name != nil {
-		mdmv1r.Name = &wrapperspb.StringValue{Value: *r.Name}
-	}
-	if r.TenantId != nil {
-		mdmv1r.TenantId = &wrapperspb.StringValue{Value: *r.TenantId}
+	mdmv1r := &mdmv1.ProjectFindRequest{
+		Id:          r.Id,
+		Name:        r.Name,
+		Description: r.Description,
+		TenantId:    r.TenantId,
 	}
 
 	return mdmv1r
@@ -200,12 +187,9 @@ func ToMdmV1TenantFindRequest(r *v1.TenantFindRequest) *mdmv1.TenantFindRequest
 		return nil
 	}
 
-	mdmv1r := new(mdmv1.TenantFindRequest)
-	if r.Id != nil {
-		mdmv1r.Id = &wrapperspb.StringValue{Value: *r.Id}
-	}
-	if r.Name != nil {
-		mdmv1r.Name = &wrapperspb.StringValue{Value: *r.Name}
+	mdmv1r := &mdmv1.TenantFindRequest{
+		Id:   r.Id,
+		Name: r.Name,
 	}
 	if r.Paging != nil {
 		mdmv1r.Paging = &mdmv1.Paging{
@@ -253,17 +237,11 @@ func ToV1Quota(q *mdmv1.Quota) *v1.Quota {
 	if q == nil {
 		return nil
 	}
+
 	return &v1.Quota{
-		Quota: unwrapInt32(q.Quota),
+		Quota: q.Max,
 	}
 }
-func unwrapInt32(w *wrapperspb.Int32Value) *int32 {
-	if w == nil {
-		return nil
-	}
-
-	return &w.Value
-}
 
 func mustTimestampToTime(ts *timestamppb.Timestamp) *time.Time {
 	if ts == nil {