fix js dynamic proto load and add js integration test

Signed-off-by: Gregory Hill <[email protected]>

Author: Gregory Hill

Diff for: .circleci/Dockerfile

@@ -1,20 +1,26 @@
-FROM circleci/golang:1.11
+FROM golang:1.11-alpine
 
-RUN curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip
-RUN unzip protoc-3.3.0-linux-x86_64.zip -d protobuf
-RUN sudo cp protobuf/bin/protoc /usr/bin/protoc
+ENV PROTO_VERSION 3.3.0
+ENV DCOMP_VERSION 1.23.2
+
+RUN apk add --update --no-cache nodejs npm make curl unzip git python bash gcc docker build-base
+
+RUN curl -L "https://github.com/docker/compose/releases/download/${DCOMP_VERSION}/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose
+RUN curl -OL https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protoc-${PROTO_VERSION}-linux-x86_64.zip
+RUN unzip protoc-${PROTO_VERSION}-linux-x86_64.zip -d protobuf
+RUN cp protobuf/bin/protoc /usr/bin/protoc
 RUN rm -rf protobuf protoc-*
+
 RUN go get -u golang.org/x/tools/cmd/goimports
 RUN go get -u github.com/golang/protobuf/protoc-gen-go
 RUN go get -u github.com/golang/dep/cmd/dep
-RUN go get -u github.com/goreleaser/goreleaser
 
 # install aws auth binaries
 RUN curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
 RUN unzip awscli-bundle.zip
-RUN sudo ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
+RUN ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
 
 # install gcloud auth binaries
 RUN curl https://sdk.cloud.google.com | bash
-RUN ls /home/circleci/google-cloud-sdk/bin/
-ENV PATH /home/circleci/google-cloud-sdk/bin/:$PATH
+RUN ls /root/google-cloud-sdk/bin/
+ENV PATH /root/google-cloud-sdk/bin/:$PATH

Diff for: .circleci/config.yml

@@ -12,6 +12,12 @@ setup_docker: &setup_docker
 
 version: 2
 jobs:
+  ensure_vendor:
+    <<: *defaults
+    steps:
+      - checkout
+      - run: make ensure_vendor
+
   test:
     <<: *defaults
     steps:
@@ -20,47 +26,40 @@ jobs:
       - run: make test
       - run: make build
 
-  test_integration:
+  build_docker:
     <<: *defaults
     steps:
+      - checkout
       - setup_remote_docker:
           <<: *setup_docker
-      - checkout
-      - run:
-          name: Store Service Account
-          command: echo $GCLOUD_SERVICE_KEY > /tmp/gcloud-service-key.json
-      - run: gcloud auth activate-service-account --key-file=/tmp/gcloud-service-key.json
-      - run: make test_integration
+      - run: make docker_build
 
-  ensure_vendor:
+  test_js:
     <<: *defaults
     steps:
       - checkout
-      - run: make ensure_vendor
+      - run: make npm_install
+      - run: make test_js
 
-  build_docker:
-    <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker:
-          <<: *setup_docker
-      - run: make docker_build
-
-  release_dev:
+  test_integration:
     <<: *defaults
     steps:
       - setup_remote_docker:
           <<: *setup_docker
       - checkout
-      - run: make release_dev
+      - run:
+          name: Store Service Account
+          command: echo $GCLOUD_SERVICE_KEY > /tmp/gcloud-service-key.json
+      - run: gcloud auth activate-service-account --key-file=/tmp/gcloud-service-key.json
+      - run: make test_integration
 
-  release:
+  push_latest:
     <<: *defaults
     steps:
       - setup_remote_docker:
           <<: *setup_docker
       - checkout
-      - run: make release
+      - run: make latest
 
 workflows:
   version: 2
@@ -76,35 +75,34 @@ workflows:
           filters:
             <<: *tags_filters
 
-      - test_integration:
+      - build_docker:
           requires:
           - test
           filters:
             <<: *tags_filters
-            branches:
-              only:
-              - develop
-              - master
 
-      - build_docker:
+      - test_js:
           requires:
           - test
           filters:
             <<: *tags_filters
 
-      - release_dev:
+      - test_integration:
           requires:
-          - build_docker
-          - test_integration
+          - test
           filters:
+            <<: *tags_filters
             branches:
-              only: develop
+              only:
+              - develop
+              - master
 
-      - release:
+      - push_latest:
           requires:
           - build_docker
           - test_integration
           filters:
             <<: *tags_filters
             branches:
-              ignore: /.*/
+              only:
+              - master

Diff for: .gitignore

@@ -21,6 +21,5 @@ notes.md
 
 commit_hash.txt
 node_modules
-hoard-js/node_modules
 
 .vscode/

Diff for: Makefile

@@ -24,14 +24,16 @@ GOFILES_NOVENDOR := $(shell find . -path ./vendor -prune -o -name '*.pb.go' -pru
 PACKAGES_NOVENDOR := $(shell go list ./...)
 
 # Protobuf generated go files
-PROTO_FILES = $(shell find . -path ./vendor -prune -o -path ./hoard-js/node_modules -prune -o -type f -name '*.proto' -print)
+PROTO_FILES = $(shell find . -path ./vendor -prune -o -path ./hoard-js -prune -o -path ./node_modules -prune -o -type f -name '*.proto' -print)
 PROTO_GO_FILES = $(patsubst %.proto, %.pb.go, $(PROTO_FILES))
 PROTO_GO_FILES_REAL = $(shell find . -path ./vendor -prune -o -type f -name '*.pb.go' -print)
 
 OS_ARCHS := "linux/arm linux/386 linux/amd64 darwin/386 darwin/amd64 windows/386 windows/amd64"
 DIST := "dist"
 GOX_OUTPUT := "$DIST/{{.Dir}}_{{.OS}}_{{.Arch}}"
-BUILD_IMAGE := "quay.io/monax/hoard:build"
+export DOCKER_HUB := quay.io
+export DOCKER_REPO := $(DOCKER_HUB)/monax/hoard
+export BUILD_IMAGE := $(DOCKER_REPO):build
 
 
 # Formatting, linting and vetting
@@ -122,7 +124,7 @@ install:
 build:	check build_hoard build_hoarctl
 
 .PHONY: docker_build
-docker_build: check commit_hash
+docker_build: commit_hash
 	@scripts/build_tool.sh
 
 ## build binaries for all architectures
@@ -136,6 +138,12 @@ build_dist:
 test: check
 	@scripts/bin_wrapper.sh go test -v ./... ${GOPACKAGES_NOVENDOR}
 
+.PHONY: test_js
+test_js: build install
+	$(eval HID := $(shell HOARD_JSON_CONFIG=$$(hoard config -j memory) hoard -e &> /dev/null & echo $$!))
+	npm test
+	kill ${HID}
+
 ## run tests including integration tests
 .PHONY:	test_integration
 test_integration: check
@@ -170,24 +178,32 @@ NOTES.md: project/history.go project/cmd/notes/main.go
 docs: CHANGELOG.md NOTES.md
 
 ## tag the current HEAD commit with the current release defined in
-## ./release/release.go
+## ./project/history.go
 .PHONY: tag_release
 tag_release: test check docs build
 	@scripts/tag_release.sh
 
 .PHONY: release
-release: docs check test docker_build
+release: tag_release
 	@scripts/is_checkout_dirty.sh || (echo "checkout is dirty so not releasing!" && exit 1)
 	@scripts/release.sh
 
-.PHONY: release_dev
-release_dev: test docker_build
-	@scripts/release_dev.sh
+.PHONY: latest
+latest:
+	@scripts/release.sh latest
 
 .PHONY: build_ci_image
 build_ci_image:
-	docker build -t ${CI_IMAGE} -f ./.circleci/Dockerfile .
+	docker build -t ${BUILD_IMAGE} -f ./.circleci/Dockerfile .
 
 .PHONY: push_ci_image
 push_ci_image: build_ci_image
-	docker push ${CI_IMAGE}
+	docker push ${BUILD_IMAGE}
+
+.PHONY: npm_install
+npm_install:
+	@cd hoard-js && npm install
+
+.PHONY: npm_publish
+npm_publish:
+	npm publish --access public .

Diff for: README.md

@@ -17,10 +17,6 @@ The address is then deterministically generated from the encrypted object's (SHA
 - [Azure](https://azure.microsoft.com/en-gb/services/storage/)
 - [IPFS](https://ipfs.io/)
 
-### Planned
-- [BigchainDB](https://www.bigchaindb.com/) (and IPDB)
-- [Tendermint](https://tendermint.com/)
-
 ## Installing
 
 Hoard should be go-gettable with:
@@ -161,6 +157,33 @@ Hoard uses [GRPC](https://grpc.io/) for its API for which there is a wide range
 
 A Javascript client library can be found here: [hoard-js](https://github.com/monax/hoard/tree/master/hoard-js).
 
+Hoard-js is a fairly lightweight wrapper around the Hoard GRPC API. It mainly serves to abstract over the dynamic
+protobuf library and the static protobuf generation.
+
+#### Usage
+
+First we need to have Hoard running. For development purposes this can be accomplished by:
+
+```shell
+go get github.com/monax/hoard/cmd/hoard 
+# Run Hoard with logging
+hoard --logging
+```
+
+Hoard will run with an in-memory store by default that will be discarded when it is shutdown, but will expose the same
+interface as when using remote storage backends.
+
+To interact with Hoard from Node see [example.js](example.js) for a self-contained example of how to use every method
+of the API. To run use:
+
+```shell
+# Get dependencies
+npm install
+# Run example
+node example.js
+```
+
+
 ## Building
 
 To build Hoard you will need to have the following installed:
@@ -176,3 +199,4 @@ make protobuf_deps
 # Run checks, tests, and build binaries
 make build && make install
 ```
+

Diff for: grant/grant.pb.go

@@ -16,7 +16,7 @@ import (
 )
 
 // OpenPGPGrant encrypts and signs a given reference
-func OpenPGPGrant(ref *reference.Ref, public []byte, private *secrets.OpenPGPSecret) ([]byte, error) {
+func OpenPGPGrant(ref *reference.Ref, public string, private *secrets.OpenPGPSecret) ([]byte, error) {
 	if private == nil {
 		return nil, fmt.Errorf("cannot encrypt because no private key was provided")
 	}
@@ -28,9 +28,9 @@ func OpenPGPGrant(ref *reference.Ref, public []byte, private *secrets.OpenPGPSec
 	}
 
 	var to openpgp.EntityList
-	if public != nil {
+	if public != "" {
 		// use public keyring
-		if to, err = openpgp.ReadArmoredKeyRing(bytes.NewBuffer(public)); err != nil {
+		if to, err = openpgp.ReadArmoredKeyRing(bytes.NewBufferString(public)); err != nil {
 			return nil, fmt.Errorf("could not read public keyring: %s", err)
 		}
 	} else {