Merge pull request #12 from m-lab/build-generate-schema

Add generate-schema and the ndt8 schema to the Docker image

Author: robertodauria

Dockerfile

@@ -13,6 +13,12 @@ RUN ./build.sh
 FROM alpine:3.17.3
 WORKDIR /msak
 COPY --from=build /msak/msak-server /msak/
+COPY --from=build /msak/generate-schema /msak/
 
+# Generate msak's JSON schema.
+RUN /msak/generate-schema -ndt8=/msak/ndt8.json
+
+# Verify that the msak-server binary can be run.
 RUN ./msak-server -h
+
 ENTRYPOINT ["./msak-server"]

build.sh

@@ -6,3 +6,5 @@ go build -v \
     -tags netgo \
     -ldflags "$versionflags -extldflags \"-static\"" \
     ./cmd/msak-server
+
+go build -v ./cmd/generate-schema

cmd/generate-schema/main.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"io/ioutil"
 
+	"github.com/m-lab/go/cloud/bqx"
 	"github.com/m-lab/go/rtx"
 	"github.com/m-lab/msak/pkg/ndt8/model"
 
@@ -24,6 +25,7 @@ func main() {
 	ndt8Result := model.NDT8Result{}
 	sch, err := bigquery.InferSchema(ndt8Result)
 	rtx.Must(err, "failed to generate ndt8 schema")
+	sch = bqx.RemoveRequired(sch)
 	b, err := sch.ToJSONFields()
 	rtx.Must(err, "failed to marshal schema")
 	ioutil.WriteFile(ndt8Schema, b, 0o644)

go.mod

@@ -73,4 +73,5 @@ require (
 	google.golang.org/grpc v1.54.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -630,6 +630,7 @@ gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=