proto: Port example.go to proto3

wking · wking · commit a4d502c9f6ad · 2015-09-26T13:04:16.000-07:00
Using jsonpb [1,2]. Drop the proto.String bits to avoid errors like: ./example.go:17: cannot use proto.String("linux") (type *string) as type string in field value And use a reference to s to avoid: ./example.go:29: cannot use s (type oci.LinuxSpec) as type proto.Message in argument to marshaler.Marshal: oci.LinuxSpec does not implement proto.Message (ProtoMessage method has pointer receiver) [1]: golang/protobuf#44 [2]: http://godoc.org/github.com/golang/protobuf/jsonpb Signed-off-by: W. Trevor King <wking@tremily.us>
diff --git a/proto/example.go b/proto/example.go
@@ -3,27 +3,31 @@
 package main
 
 import (
-	"encoding/json"
 	"log"
+	"os"
 
 	oci "./go/"
-	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/jsonpb"
 )
 
 func main() {
-	s := oci.LinuxSpec{
+	s := &oci.LinuxSpec{
 		Spec: &oci.Spec{
-			Platform: &oci.Platform{Os: proto.String("linux"), Arch: proto.String("x86_64")},
+			Platform: &oci.Platform{Os: "linux", Arch: "x86_64"},
 			Process: &oci.Process{
-				Cwd: proto.String("/"),
+				Cwd: "/",
 				Env: []string{"TERM=linux"},
 			},
 		},
 	}
 
-	buf, err := json.MarshalIndent(s, "", "  ")
+	marshaler := jsonpb.Marshaler{
+		EnumsAsString: true,
+		Indent:        "  ",
+	}
+
+	err := marshaler.Marshal(os.Stdout, s)
 	if err != nil {
 		log.Fatal(err)
 	}
-	println(string(buf))
 }
