Update deps, alpine3.14, better codegen (#49)

Author: majst01

Dockerfile

@@ -1,5 +1,5 @@
-FROM alpine:3.13 as health-downloader
-ENV GRPC_HEALTH_PROBE_VERSION=v0.4.2 \
+FROM alpine:3.14 as health-downloader
+ENV GRPC_HEALTH_PROBE_VERSION=v0.4.5 \
     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 \
@@ -8,7 +8,7 @@ RUN apk -U add curl \
 
 FROM metalstack/builder:latest as builder
 
-FROM alpine:3.13
+FROM alpine:3.14
 RUN apk -U add ca-certificates
 COPY --from=builder /work/bin/server /masterdata-api
 COPY --from=health-downloader /bin/grpc_health_probe /bin/grpc_health_probe

api/v1/project_scnrvalr.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 )
 
-func (m Project) Schema() string {
+func (p *Project) Schema() string {
 	return `
 	CREATE TABLE IF NOT EXISTS projects (
 		id   text PRIMARY KEY NOT NULL,
@@ -27,36 +27,36 @@ func (m Project) Schema() string {
 `
 }
 
-func (m Project) JSONField() string {
+func (p *Project) JSONField() string {
 	return "project"
 }
 
-func (m Project) TableName() string {
+func (p *Project) TableName() string {
 	return "projects"
 }
 
-func (m Project) Kind() string {
+func (p *Project) Kind() string {
 	return "Project"
 }
 
-func (m Project) APIVersion() string {
+func (p *Project) APIVersion() string {
 	return "v1"
 }
 
 // Value make the Project struct implement the driver.Valuer interface. This method
 // simply returns the JSON-encoded representation of the struct.
-func (m Project) Value() (driver.Value, error) {
-	return json.Marshal(m)
+func (p *Project) Value() (driver.Value, error) {
+	return json.Marshal(p)
 }
 
 // Scan make the Project struct implement the sql.Scanner interface. This method
 // simply decodes a JSON-encoded value into the struct fields.
-func (m *Project) Scan(value interface{}) error {
+func (p *Project) Scan(value interface{}) error {
 	b, ok := value.([]byte)
 	if !ok {
 		return fmt.Errorf("type assertion to []byte failed")
 	}
 
-	err := json.Unmarshal(b, m)
+	err := json.Unmarshal(b, p)
 	return err
 }

api/v1/tenant_scnrvalr.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 )
 
-func (m Tenant) Schema() string {
+func (t *Tenant) Schema() string {
 	return `
 	CREATE TABLE IF NOT EXISTS tenants (
 		id   text PRIMARY KEY NOT NULL,
@@ -27,36 +27,36 @@ func (m Tenant) Schema() string {
 `
 }
 
-func (m Tenant) JSONField() string {
+func (t *Tenant) JSONField() string {
 	return "tenant"
 }
 
-func (m Tenant) TableName() string {
+func (t *Tenant) TableName() string {
 	return "tenants"
 }
 
-func (m Tenant) Kind() string {
+func (t *Tenant) Kind() string {
 	return "Tenant"
 }
 
-func (m Tenant) APIVersion() string {
+func (t *Tenant) APIVersion() string {
 	return "v1"
 }
 
 // Value make the Tenant struct implement the driver.Valuer interface. This method
 // simply returns the JSON-encoded representation of the struct.
-func (m Tenant) Value() (driver.Value, error) {
-	return json.Marshal(m)
+func (t *Tenant) Value() (driver.Value, error) {
+	return json.Marshal(t)
 }
 
 // Scan make the Tenant struct implement the sql.Scanner interface. This method
 // simply decodes a JSON-encoded value into the struct fields.
-func (m *Tenant) Scan(value interface{}) error {
+func (t *Tenant) Scan(value interface{}) error {
 	b, ok := value.([]byte)
 	if !ok {
 		return fmt.Errorf("type assertion to []byte failed")
 	}
 
-	err := json.Unmarshal(b, m)
+	err := json.Unmarshal(b, t)
 	return err
 }

go.mod

@@ -7,22 +7,22 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/gogo/status v1.1.0
 	github.com/google/go-cmp v0.5.6
-	github.com/google/uuid v1.2.0
+	github.com/google/uuid v1.3.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/jmoiron/sqlx v1.3.4
-	github.com/json-iterator/go v1.1.11
-	github.com/lib/pq v1.10.2
+	github.com/json-iterator/go v1.1.12
+	github.com/lib/pq v1.10.3
 	github.com/lopezator/migrator v0.3.0
-	github.com/metal-stack/metal-lib v0.8.0
-	github.com/metal-stack/security v0.6.0
+	github.com/metal-stack/metal-lib v0.8.1
+	github.com/metal-stack/security v0.6.2
 	github.com/metal-stack/v v1.0.3
 	github.com/prometheus/client_golang v1.11.0
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/viper v1.8.1
 	github.com/stretchr/testify v1.7.0
 	github.com/testcontainers/testcontainers-go v0.11.1
-	go.uber.org/zap v1.18.1
-	google.golang.org/grpc v1.39.0
+	go.uber.org/zap v1.19.1
+	google.golang.org/grpc v1.40.0
 	google.golang.org/protobuf v1.27.1
 )