Knlambert/2.14.0 rc

.ambassador-internal/openapi.yaml

@@ -0,0 +1,56 @@
+openapi: 3.0.0
+info:
+  title: Emojivoto API
+  description: Endpoints for the Emojivoto backend.
+  version: 0.1.0
+paths:
+  /vote:
+    get:
+      parameters:
+        - in: query
+          name: choice
+          schema:
+            type: string
+          required: true
+          description: The emoji to vote for
+      responses:
+        '200':
+          description: The resource was deleted successfully.
+  /list:
+    get:
+      summary: Returns a list of available emojies
+      responses:
+        '200':
+          description: A JSON object with a quote and some additional metadata.
+          content:
+            application/json:
+              schema:
+                items:
+                  type: "array"
+                  items:
+                    type: "object"
+                    properties:
+                      shortcode:
+                        type: string
+                      unicode:
+                        type: string
+  /leaderboard:
+    get:
+      summary: Returns a leaderboard of the best emojies
+      responses:
+        '200':
+          description: A JSON object with a quote and some additional metadata.
+          content:
+            application/json:
+              schema:
+                items:
+                  type: "array"
+                  items:
+                    type: "object"
+                    properties:
+                      shortcode:
+                        type: string
+                      unicode:
+                        type: string
+                      votes:
+                        type: number

.github/workflows/publish.yaml

@@ -0,0 +1,32 @@
+name: publish
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+      - name: install protobuf compiler
+        run: sudo apt install -y protobuf-compiler
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.17.5'
+      - name: install protoc
+        run: |
+              go get -u github.com/golang/protobuf/proto && \
+              go get -u github.com/golang/protobuf/protoc-gen-go && \
+              go get google.golang.org/protobuf/reflect/protoreflect && \
+              go get google.golang.org/protobuf/runtime/protoimpl && \
+              go get google.golang.org/grpc/cmd/protoc-gen-go-grpc
+      - name: Build release
+        run: make -C emojivoto-web build-releases
+      - name: Release
+        uses: softprops/action-gh-release@v0.1.14
+        with:
+          files: ./emojivoto-web/bin/*

Dockerfile

@@ -1,9 +1,11 @@
-FROM buoyantio/emojivoto-svc-base:v11
+FROM datawire/emojivoto-svc-base:v11.1
 
 ARG svc_name
 
 COPY $svc_name/target/ /usr/local/bin/
 
+COPY .ambassador-internal/openapi.yaml /.ambassador-internal/openapi.yaml
+
 # ARG variables arent available for ENTRYPOINT
 ENV SVC_NAME $svc_name
 ENTRYPOINT cd /usr/local/bin && $SVC_NAME

Dockerfile-ui

@@ -0,0 +1,8 @@
+FROM nginx:latest
+
+ARG svc_name
+
+COPY $svc_name/dist/index.html /usr/share/nginx/html/index.html
+COPY $svc_name/dist/index_bundle.js /usr/share/nginx/html/
+COPY web-app-nginx.conf /etc/nginx/conf.d/default.conf
+RUN chown -R nginx:nginx /var/cache/nginx

Makefile

@@ -5,18 +5,37 @@ include ./common.mk
 all: build integration-tests
 
 build-base-docker-image:
-	docker build . -f Dockerfile-base -t "buoyantio/emojivoto-svc-base:$(IMAGE_TAG)"
+	docker build . -f Dockerfile-base -t "datawire/emojivoto-svc-base:$(IMAGE_TAG)"
 
 web:
 	$(MAKE) -C emojivoto-web
 
+web-app:
+	$(MAKE) -C emojivoto-web-app
+
 emoji-svc:
 	$(MAKE) -C emojivoto-emoji-svc
 
 voting-svc:
 	$(MAKE) -C emojivoto-voting-svc
 
-build: web emoji-svc voting-svc
+emoji-svc-local:
+	$(MAKE) -C emojivoto-emoji-svc local
+
+voting-svc-local:
+	$(MAKE) -C emojivoto-voting-svc local
+
+web-local:
+	$(MAKE) -C emojivoto-web local
+
+web-app-local:
+	$(MAKE) -C emojivoto-web-app local
+
+build: web web-app emoji-svc voting-svc
+
+build-ui: build-container-ui
+
+local: web-local web-app-local emoji-svc-local voting-svc-local
 
 multi-arch:
 	$(MAKE) -C emojivoto-web build-multi-arch
@@ -39,6 +58,6 @@ deploy-to-docker-compose:
 	docker-compose -f ./docker-compose.yml up -d
 
 push-%:
-	docker push buoyantio/emojivoto-$*:$(IMAGE_TAG)
+	docker push datawire/emojivoto-$*:$(IMAGE_TAG)
 
-push: push-svc-base push-emoji-svc push-voting-svc push-web
+push: push-svc-base push-emoji-svc push-voting-svc push-web push-web-app

README.md

@@ -132,13 +132,31 @@ This can be disabled by unsetting the `PROM_PORT` environment variable.
 
 ### Emojivoto webapp
 
+#### Requirements
+1. Set your `GOPATH`
+```shell
+   export GOPATH=/path/to/go
+```
+2. Add your `GOPATH/bin` to the `PATH`
+```shell
+   export PATH=$PATH:$GOPATH/bin
+```
+3. Install protobuf compiler: https://grpc.io/docs/protoc-installation/
+4. Install go packages
+```shell
+go get -u github.com/golang/protobuf/protoc-gen-go
+go get google.golang.org/protobuf/reflect/protoreflect@v1.26.0
+go get google.golang.org/protobuf/runtime/protoimpl@v1.26.0
+```
+5. Install yarn: https://classic.yarnpkg.com/en/docs/install/
+#### Building process
 This app is written with React and bundled with webpack.
 Use the following to run the emojivoto go services and develop on the frontend.
 
 Set up proto files, build apps
 
 ```bash
-make build
+make local
 ```
 
 Start the voting service

assets/Vote-fixed.jsx

@@ -0,0 +1,149 @@
+import React from 'react';
+import _ from 'lodash';
+import { Link } from 'react-router-dom';
+import 'whatwg-fetch';
+
+const EmojiVotoPage = ({headline, contents, containerClass, preHeadline}) => {
+  return (
+    <div className={containerClass}>
+      <div className="page-content container-fluid">
+        <div className="row">
+          <div className="col-md-12">
+            {!preHeadline ? null : preHeadline}
+            <h1 className="headline">{headline}</h1>
+
+            {contents}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+export default class Vote extends React.Component {
+  constructor(props) {
+    super(props);
+    this.resetState = this.resetState.bind(this);
+    this.state = {
+      emojiList: [],
+      selectedEmoji: null,
+      error: null
+    }
+  }
+
+  loadFromServer() {
+    fetch('/api/list').then(rsp => {
+      rsp.json().then(r => {
+        this.setState({ emojiList: r })
+      }).catch(e => {
+        this.setState( {error: e.statusText });
+      }).catch(e => {
+        this.setState( {error: e.statusText });
+      });
+    });
+  }
+
+  componentDidMount() {
+    this.loadFromServer();
+  }
+
+  vote(emoji) {
+    fetch(`/api/vote?choice=${emoji.shortcode}`).then(rsp => {
+      if (rsp.ok) {
+        this.setState({ selectedEmoji: emoji, error: null });
+      } else {
+        throw new Error("Unable to Register Vote");
+      }
+    }).catch(e => {
+        this.setState({ selectedEmoji: emoji, error: e.toString() });
+      });
+  }
+
+  resetState() {
+    this.setState({ selectedEmoji: null, error: null });
+  }
+
+  renderEmojiList(emojis) {
+    return _.map(emojis, (emoji, i) => {
+      return (
+        <div
+          className="emoji emoji-votable"
+          key={`emoji-${i}`}
+          onClick={e => this.vote(emoji)}
+        >
+          {emoji.unicode}
+        </div>
+      );
+    });
+  }
+
+  renderLeaderboardLink() {
+    return <Link to="/leaderboard"><div className="btn btn-blue">View the leaderboard</div></Link>;
+  }
+
+  render() {
+    if (this.state.error) {
+      let errorMessage = <p>We couldn't process your request.</p>;
+      if(this.state.selectedEmoji.shortcode === ":doughnut:") {
+        errorMessage = (<div>
+          <p className="doughnut-explanation">Sorry, currently unable to vote for 🍩.<br />
+            Please go back and choose another emoji.
+          </p>
+          <p><Link to="/" onClick={this.resetState}>Pick another</Link>!</p>
+        </div>);
+      }
+
+      let contents = (
+        <div>
+          {errorMessage}
+          <Link to="/" onClick={this.resetState}><div className="btn btn-blue">Select again</div></Link>
+        </div>
+      );
+
+      return <EmojiVotoPage
+        preHeadline={<h1 className="title">404</h1>}
+        headline="🚧"
+        contents={contents}
+        containerClass="background-500"
+      />;
+    } else if (!this.state.selectedEmoji) {
+      let emojiList = this.state.emojiList;
+      let contents = (
+        <div>
+          <h1>EMOJI VOTE</h1>
+          <p>Tap to vote for your favorite emoji below</p>
+          {this.renderLeaderboardLink()}
+          {!_.isEmpty(emojiList) ? null : <div>Loading emoji...</div>}
+
+          <div className="emoji-list">
+            {this.renderEmojiList(emojiList)}
+
+            <div className="footer-text">
+              <p>A <a href='https://buoyant.io'>Buoyant</a> social experiment</p>
+              <p>© 2017 Buoyant, Inc. All Rights Reserved.</p>
+            </div>
+          </div>
+        </div>
+      );
+
+      return <EmojiVotoPage
+        headline="🗳"
+        contents={contents}
+        containerClass="background"
+      />;
+    } else {
+      let contents = (
+        <div>
+          <p>See how you stack up against others</p>
+          {this.renderLeaderboardLink()}
+          <Link to="/" onClick={this.resetState}><div className="btn btn-white">Pick another one</div></Link>
+        </div>
+      );
+      return <EmojiVotoPage
+        preHeadline={<h1>You picked:</h1>}
+        headline={this.state.selectedEmoji.unicode}
+        contents={contents}
+        containerClass ="background"
+      />;
+    }
+  }
+}

common.mk

@@ -1,4 +1,4 @@
-export IMAGE_TAG := v11
+export IMAGE_TAG := v11.6
 
 .PHONY: package protoc test
 
@@ -10,23 +10,28 @@ clean:
 	mkdir -p $(target_dir)
 	mkdir -p gen
 
-protoc:
-	protoc -I .. ../proto/*.proto --go_out=plugins=grpc:gen
+protoc: 
+	protoc -I .. ../proto/*.proto --go_out=paths=source_relative:./gen --go-grpc_out=paths=source_relative:./gen
 
 package: protoc compile build-container
 
+package-ui: build-container-ui
+
 build-container:
-	docker build .. -t "buoyantio/$(svc_name):$(IMAGE_TAG)" --build-arg svc_name=$(svc_name)
+	docker build .. --platform linux/amd64 -t "datawire/$(svc_name):$(IMAGE_TAG)" --build-arg svc_name=$(svc_name)
 
 build-multi-arch:
-	docker buildx build .. -t "buoyantio/$(svc_name):$(IMAGE_TAG)" --build-arg svc_name=$(svc_name) \
-		-f ../Dockerfile-multi-arch --platform linux/amd64,linux/arm64,linux/arm/v7 --push
+	docker buildx build .. -t "datawire/$(svc_name):$(IMAGE_TAG)" --build-arg svc_name=$(svc_name) \
+		-f ../Dockerfile-multi-arch --platform linux/amd64,linux/arm64 --push
+
+build-container-ui:
+	docker build .. -t "datawire/emojivoto-web-app:$(IMAGE_TAG)" --build-arg svc_name=emojivoto-web-app -f ../Dockerfile-ui
 
 compile:
-	GOOS=linux go build -v -o $(target_dir)/$(svc_name) cmd/server.go
+	GOOS=linux GOARCH=amd64 go build -v -o $(target_dir)/$(svc_name) cmd/server.go
 
 test:
 	go test ./...
 
 run:
-	go run cmd/server.go
+	go run cmd/server.go