Feature/upstream sync

.circleci/config.yml

@@ -0,0 +1,49 @@
+shared_configs:
+  simple_job_steps: &simple_job_steps
+    - checkout
+    - run:
+        name: Run tests
+        command: |
+          make deps test
+  full_job_steps: &full_job_steps
+    - checkout
+    - run:
+        name: Run tests
+        command: |
+          make ci
+
+
+# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+jobs:
+  build-1-15:
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.15
+    steps: *simple_job_steps
+
+  build-1-16:
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.16
+    steps: *full_job_steps
+
+  build-1-17:
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.17
+    steps: *simple_job_steps
+
+  build-1-18:
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.18
+    steps: *simple_job_steps
+
+workflows:
+  pr-build-test:
+    jobs:
+      - build-1-15
+      - build-1-16
+      - build-1-17
+      - build-1-18

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    # Check for updates once a week
+    schedule:
+      interval: "weekly"

.goreleaser.yml

@@ -8,9 +8,12 @@ builds:
     goarch:
       - amd64
       - 386
+      - arm64
     ignore:
       - goos: darwin
         goarch: 386
+      - goos: windows
+        goarch: arm64
     ldflags:
       - -s -w -X main.version=v{{.Version}}
 

Dockerfile

@@ -1,20 +1,18 @@
-FROM golang:1.13-alpine as builder
+FROM golang:1.18-alpine as builder
 MAINTAINER FullStory Engineering
 
 # create non-privileged group and user
 RUN addgroup -S grpcui && adduser -S grpcui -G grpcui
 
 WORKDIR /tmp/fullstorydev/grpcui
 # copy just the files/sources we need to build grpcui
-COPY VERSION *.go go.* /tmp/fullstorydev/grpcui/
+COPY *.go go.* /tmp/fullstorydev/grpcui/
 COPY cmd /tmp/fullstorydev/grpcui/cmd
 COPY internal /tmp/fullstorydev/grpcui/internal
 COPY standalone /tmp/fullstorydev/grpcui/standalone
 # and build a completely static binary (so we can use
 # scratch as basis for the final image)
 ENV CGO_ENABLED=0
-ENV GOOS=linux
-ENV GOARCH=amd64
 ENV GO111MODULE=on
 RUN go build -o /grpcui \
     -ldflags "-w -extldflags \"-static\" -X \"main.version=$(cat VERSION)\"" \

Makefile

@@ -22,8 +22,8 @@ install:
 
 .PHONY: release
 release:
-	@GO111MODULE=on go install github.com/goreleaser/goreleaser
-	goreleaser --rm-dist
+	@go install github.com/goreleaser/goreleaser@v1.5.0
+	goreleaser release --rm-dist
 
 .PHONY: docker
 docker:
@@ -33,8 +33,10 @@ docker:
 
 .PHONY: generate
 generate:
-	@go install github.com/go-bindata/go-bindata/go-bindata
-	@go install github.com/golang/protobuf/protoc-gen-go
+	@go install github.com/go-bindata/go-bindata/go-bindata@8639be0519b3
+	@go install google.golang.org/protobuf/cmd/protoc-gen-go@a709e31e5d12
+	@go install google.golang.org/grpc/cmd/[email protected]
+	@go install github.com/jhump/protoreflect/desc/sourceinfo/cmd/protoc-gen-gosrcinfo
 	go generate ./...
 
 .PHONY: checkgofmt
@@ -50,29 +52,31 @@ vet:
 
 .PHONY: staticcheck
 staticcheck:
-	@GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck
+	@go install honnef.co/go/tools/cmd/staticcheck@v0.0.1-2020.1.4
 	staticcheck ./...
 
 .PHONY: ineffassign
 ineffassign:
-	@GO111MODULE=on go install github.com/gordonklaus/ineffassign
+	@go install github.com/gordonklaus/ineffassign@7953dde2c7bf
 	ineffassign .
 
 .PHONY: predeclared
 predeclared:
-	@GO111MODULE=on go install github.com/nishanths/predeclared
+	@go install github.com/nishanths/predeclared@86fad755b4d3
 	predeclared .
 
 # Intentionally omitted from CI, but target here for ad-hoc reports.
 .PHONY: golint
 golint:
-	@GO111MODULE=on go install golang.org/x/lint/golint
+	# TODO: pin version
+	@go install golang.org/x/lint/golint@latest
 	golint -min_confidence 0.9 -set_exit_status ./...
 
 # Intentionally omitted from CI, but target here for ad-hoc reports.
 .PHONY: errcheck
 errcheck:
-	@GO111MODULE=on go install github.com/kisielk/errcheck
+	# TODO: pin version
+	@go install github.com/kisielk/errcheck@latest
 	errcheck ./...
 
 .PHONY: test

README.md

@@ -1,5 +1,5 @@
 # gRPC UI
-[![Build Status](https://travis-ci.com/fullstorydev/grpcui.svg?branch=master)](https://travis-ci.com/github/fullstorydev/grpcui/branches)
+[![Build Status](https://circleci.com/gh/fullstorydev/grpcui/tree/master.svg?style=svg)](https://circleci.com/gh/fullstorydev/grpcui/tree/master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/fullstorydev/grpcui)](https://goreportcard.com/report/github.com/fullstorydev/grpcui)
 
 `grpcui` is a command-line tool that lets you interact with gRPC servers via a browser.
@@ -62,8 +62,7 @@ the form of an HTML table.
 ### From Source
 You can use the `go` tool to install `grpcui`:
 ```shell
-go get github.com/fullstorydev/grpcui/...
-go install github.com/fullstorydev/grpcui/cmd/grpcui
+go install github.com/fullstorydev/grpcui/cmd/grpcui@latest
 ```
 
 This installs the command into the `bin` sub-folder of wherever your `$GOPATH`
@@ -251,3 +250,4 @@ protoc --proto_path=. \
 The `--descriptor_set_out` argument is what tells `protoc` to produce a protoset,
 and the `--include_imports` argument is necessary for the protoset to contain
 everything that `grpcui` needs to process and understand the schema.
+