Merge 90082eb into d3c3d64

EGT-Ukraine · Feb 11, 2019 · f8281cc · f8281cc
2 parents d3c3d64 + 90082eb
commit f8281cc
Show file tree

Hide file tree

Showing 26 changed files with 881 additions and 236 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,8 @@ install:
   - go get github.com/mattn/goveralls
   - go get github.com/golang/dep/cmd/dep
   - go get github.com/saturn4er/go-swagger/cmd/swagger
+  - go get github.com/golang/mock/gomock
+  - go install github.com/golang/mock/mockgen
   - go get -u -d github.com/golang/protobuf/protoc-gen-go && cd ${GOPATH}/src/github.com/golang/protobuf/protoc-gen-go && git checkout v1.2.0 && go install && cd ${TRAVIS_BUILD_DIR}
   - dep ensure -vendor-only
   - curl -L https://github.com/google/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip -o /tmp/protoc.zip

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/example/generate.yml b/example/generate.yml
@@ -3,7 +3,16 @@ proto2gql:
   paths:
     - "vendor"
     - "$GOPATH/src"
+  imports_aliases:
+    - google/protobuf/wrappers.proto:   "github.com/golang/protobuf/ptypes/wrappers/wrappers.proto"
   files:
+    # Google wrappers
+    - proto_path: "$GOPATH/src/github.com/golang/protobuf/ptypes/wrappers/wrappers.proto"
+      proto_go_package: "github.com/golang/protobuf/ptypes/wrappers"
+      messages:
+        - "Value$":
+            unwrap_field: true
+
     - name: "Google Timestamp"
       proto_path: "$GOPATH/src/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto"
       proto_go_package: "github.com/golang/protobuf/ptypes/timestamp"