remove usage of deprecated ptypes, fix linter issues (#46)

Author: majst01

.github/workflows/latest.yaml

@@ -22,7 +22,7 @@ jobs:
     - name: Lint
       uses: golangci/golangci-lint-action@v2
       with:
-        version: v1.32.2
+        args: -p bugs -p unused
 
     - name: Build and push Docker image
       run: |

.github/workflows/pull_request.yaml

@@ -27,7 +27,7 @@ jobs:
     - name: Lint
       uses: golangci/golangci-lint-action@v2
       with:
-        version: v1.32.2
+        args: -p bugs -p unused
 
     - name: Build Docker image
       run: |

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
     - name: Lint
       uses: golangci/golangci-lint-action@v2
       with:
-        version: v1.32.2
+        args: -p bugs -p unused
 
     - name: Build the Docker images
       run: |

Dockerfile

@@ -1,5 +1,5 @@
-FROM alpine:3.12 as health-downloader
-ENV GRPC_HEALTH_PROBE_VERSION=v0.3.6 \
+FROM alpine:3.13 as health-downloader
+ENV GRPC_HEALTH_PROBE_VERSION=v0.4.2 \
     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/grpc/health/v1/health.pb.go

@@ -3,11 +3,9 @@ package mapper
 import (
 	"time"
 
-	px "github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/timestamp"
-	"github.com/golang/protobuf/ptypes/wrappers"
 	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"
 )
 
@@ -152,7 +150,7 @@ func ToMdmV1Quota(q *v1.Quota) *mdmv1.Quota {
 	}
 
 	return &mdmv1.Quota{
-		Quota: &wrappers.Int32Value{
+		Quota: &wrapperspb.Int32Value{
 			Value: *q.Quota,
 		},
 	}
@@ -234,43 +232,19 @@ func ToV1Quota(q *mdmv1.Quota) *v1.Quota {
 		Quota: unwrapInt32(q.Quota),
 	}
 }
-func unwrapInt32(w *wrappers.Int32Value) *int32 {
+func unwrapInt32(w *wrapperspb.Int32Value) *int32 {
 	if w == nil {
 		return nil
 	}
 
 	return &w.Value
 }
 
-func mustTimestampToTime(ts *timestamp.Timestamp) *time.Time {
-	t, err := timestampToTime(ts)
-	if err != nil {
-		t = nil
-	}
-	return t
-}
-
-func timestampToTime(ts *timestamp.Timestamp) (*time.Time, error) {
-	if ts == nil {
-		return nil, nil
-	}
-
-	t, err := px.Timestamp(ts)
-	return &t, err
+func mustTimestampToTime(ts *timestamppb.Timestamp) *time.Time {
+	t := ts.AsTime()
+	return &t
 }
 
-func mustTimeToTimestamp(t *time.Time) *timestamp.Timestamp {
-	ts, err := timeToTimestamp(t)
-	if err != nil {
-		ts = nil
-	}
-	return ts
-}
-
-func timeToTimestamp(t *time.Time) (*timestamp.Timestamp, error) {
-	if t == nil {
-		return nil, nil
-	}
-
-	return px.TimestampProto(*t)
+func mustTimeToTimestamp(t *time.Time) *timestamppb.Timestamp {
+	return timestamppb.New(*t)
 }

api/rest/mapper/mapper.go

@@ -1,11 +1,12 @@
 package mapper
 
 import (
-	"github.com/google/go-cmp/cmp"
-	v1 "github.com/metal-stack/masterdata-api/api/rest/v1"
 	"reflect"
 	"testing"
 	"time"
+
+	"github.com/google/go-cmp/cmp"
+	v1 "github.com/metal-stack/masterdata-api/api/rest/v1"
 )
 
 func TestTenantMapperRoundtrip(t *testing.T) {
@@ -98,6 +99,7 @@ func TestTenantMapperRoundtrip(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 
 			gotMdMV1 := ToMdmV1Tenant(tt.inAndOut)

api/rest/mapper/mapper_test.go

@@ -1,8 +1,8 @@
 package v1
 
 import (
-	"github.com/golang/protobuf/ptypes/timestamp"
 	jsoniter "github.com/json-iterator/go"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
@@ -15,11 +15,11 @@ func (m *Meta) SetVersion(version int64) {
 	m.Version = version
 }
 
-func (m *Meta) SetCreatedTime(time *timestamp.Timestamp) {
+func (m *Meta) SetCreatedTime(time *timestamppb.Timestamp) {
 	m.CreatedTime = time
 }
 
-func (m *Meta) SetUpdatedTime(time *timestamp.Timestamp) {
+func (m *Meta) SetUpdatedTime(time *timestamppb.Timestamp) {
 	m.UpdatedTime = time
 }