cherry-pick #1411 from master

.circleci/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14.0
+FROM golang:1.14.3
 
 # Warm apt cache and install dependencies
 # bzip2 is required by the node_tests (to extract its dependencies).
@@ -17,7 +17,7 @@ RUN echo -e '#!/bin/bash\njava -jar /usr/local/bin/swagger-codegen-cli.jar "$@"'
 	chmod +x /usr/local/bin/swagger-codegen
 
 # Install protoc
-ENV PROTOC_VERSION=3.10.1
+ENV PROTOC_VERSION=3.12.0
 RUN wget https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip \
     -O /protoc-${PROTOC_VERSION}-linux-x86_64.zip && \
     unzip /protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /usr/local/ && \

.circleci/README.md

@@ -2,21 +2,7 @@
 
 Contained within is the CI test setup for the Gateway. It runs on Circle CI.
 
-### I want to regenerate the files after making changes!
-
-Great, it should be as simple as thus (run from the root of the directory):
-
-```bash
-$ docker run -v $(pwd):/go/src/github.com/grpc-ecosystem/grpc-gateway --rm jfbrandhorst/grpc-gateway-build-env:1.14 \
-    /bin/bash -c 'cd /go/src/github.com/grpc-ecosystem/grpc-gateway && \
-        make realclean && \
-        make examples'
-```
-
-If this has resulted in some file changes in the repo, please ensure you check those in with your merge request.
-
 ### Whats up with the Dockerfile?
 
-The `Dockerfile` in this folder is used as the build environment when regenerating the files (see above).
-The canonical repository for this Dockerfile is `jfbrandhorst/grpc-gateway-build-env`. Please request access
-before attempting to make any changes to the Dockerfile.
+The `Dockerfile` in this folder is used as the build environment when regenerating the files (see CONTRIBUTING.md).
+The canonical repository for this Dockerfile is `docker.pkg.github.com/grpc-ecosystem/grpc-gateway/build-env`.

.circleci/config.yml

@@ -1,25 +1,67 @@
-version: 2
+version: 2.1
+
+commands:
+  configure_bazel:
+    description: Create Bazel config file (.bazelrc)
+    steps:
+      - run: |
+          cat > .bazelrc \<< EOF
+          startup --output_base /root/.cache/_grpc_gateway_bazel
+          build --test_output errors
+          build --features race
+          # Workaround https://github.com/bazelbuild/bazel/issues/3645
+          # See https://docs.bazel.build/versions/0.23.0/command-line-reference.html
+          build --local_ram_resources=4096 # Circle Docker runners have 4G of memory
+          build --local_cpu_resources=2    # Circle Docker runners have 2 vCPU
+          EOF
+  generate:
+    steps:
+      - run: make realclean
+      - run: make examples
+      - run: make testproto
+      - run: go mod tidy
+  renovate_git_amend_push:
+    description: Git amend and push changes
+    steps:
+      - run: |
+          git add .
+          if output=$(git status --porcelain) && [ ! -z "$output" ]; then
+            git config user.name "Renovate Bot"
+            git config user.email "bot@renovateapp.com"
+            git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/grpc-ecosystem/grpc-gateway.git
+            git commit --amend --no-edit
+            git push --force-with-lease origin ${CIRCLE_BRANCH}
+          fi
+
+executors:
+  build-env:
+    environment:
+    ## Split key to avoid github revoking it
+      password0: '99544cdcb19ad4e3fd64'
+      password1: '3ec86b2e5a431be2d72c'
+      GLOG_logtostderr: '1'
+    docker:
+      - image: docker.pkg.github.com/grpc-ecosystem/grpc-gateway/build-env:1.14
+        auth:
+          username: gateway-ci-user
+          password: ${password0}${password1}
+
 jobs:
   build:
-    docker:
-      - image: jfbrandhorst/grpc-gateway-build-env:1.14
+    executor: build-env
     working_directory: /src/grpc-gateway
     steps:
       - checkout
       - run: go build ./...
   test:
-    docker:
-      - image: jfbrandhorst/grpc-gateway-build-env:1.14
+    executor: build-env
     working_directory: /src/grpc-gateway
-    environment:
-      GLOG_logtostderr: '1'
     steps:
       - checkout
       - run: go test -race -coverprofile=coverage.txt ./...
       - run: bash <(curl -s https://codecov.io/bash)
   node_test:
-    docker:
-      - image: jfbrandhorst/grpc-gateway-build-env:1.14
+    executor: build-env
     working_directory: /src/grpc-gateway
     steps:
       - checkout
@@ -31,23 +73,34 @@ jobs:
           npm install &&
           ./node_modules/.bin/gulp
   generate:
-    docker:
-      - image: jfbrandhorst/grpc-gateway-build-env:1.14
+    executor: build-env
     working_directory: /src/grpc-gateway
     steps:
       - checkout
-      - run: make realclean
-      - run: make examples
-      - run: go mod tidy
+      - generate
       - run: git diff --exit-code
   lint:
     docker:
-      - image: jfbrandhorst/grpc-gateway-build-env:1.14
+      - image: golang:1.14
     working_directory: /src/grpc-gateway
     steps:
       - checkout
-      - run: go get golang.org/x/lint/golint
-      - run: make lint
+      - restore_cache:
+          keys:
+            - v1-staticcheck-cache-{{ checksum "go.sum" }}
+            - v1-staticcheck-cache-
+      - run:
+          name: Install staticcheck outside local module
+          command: |
+            cd $(mktemp -d) &&
+            go mod init tmp &&
+            go get honnef.co/go/tools/cmd/staticcheck
+      - run: staticcheck ./...
+      - save_cache:
+          key: v1-staticcheck-cache-{{ checksum "go.sum" }}
+          paths:
+            - /root/.cache/go-build
+            - /root/.cache/staticcheck
   fuzzit:
     docker:
       - image: fuzzitdev/fuzzit:golang1.12-stretch-llvm9
@@ -62,32 +115,35 @@ jobs:
     working_directory: /src/grpc-gateway
     steps:
       - checkout
+      - restore_cache:
+          keys:
+            - v2-bazel-cache-{{ checksum "repositories.bzl" }}
+            - v2-bazel-cache-
+      - configure_bazel
       - run:
-          name: Create Bazel config file (.bazelrc)
+          name: Check that Bazel BUILD files are up-to-date
           command: |
-            cat > .bazelrc << EOF
-            startup --output_base $HOME/.cache/_grpc_gateway_bazel
-            build --test_output errors
-            build --features race
-            # Workaround https://github.com/bazelbuild/bazel/issues/3645
-            # See https://docs.bazel.build/versions/0.23.0/command-line-reference.html
-            build --local_ram_resources=HOST_RAM*.5
-            EOF
+            bazel run //:gazelle &&
+            git diff --exit-code
       - run:
-          name: Check that Bazel BUILD files are up-to-date
-          command: 'bazel run //:gazelle -- --mode=diff ||
-            (echo "ERROR: Bazel files out-of-date, please run \`bazel run :gazelle\`" >&2; exit 1)'
+          name: Check that repositories.bzl is up-to-date
+          command: |
+            bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=repositories.bzl%go_repositories &&
+            git diff --exit-code
+      - run:
+          name: Check formatting of Bazel BUILD files
+          command: |
+            bazel run //:buildifier &&
+            git diff --exit-code
       - run:
           name: Run tests with Bazel
           command: bazel test //...
-      - run:
-          name: Check formatting of Bazel BUILD files
-          command: 'bazel run //:buildifier_check ||
-            (echo "ERROR: Bazel files not formatted, please run \`bazel run :buildifier\`" >&2; exit 1)'
-          when: always
+      - save_cache:
+          key: v2-bazel-cache-{{ checksum "repositories.bzl" }}
+          paths:
+            - /root/.cache/_grpc_gateway_bazel
   gorelease:
-    docker:
-      - image: jfbrandhorst/grpc-gateway-build-env:1.14
+    executor: build-env
     working_directory: /src/grpc-gateway
     steps:
       - checkout
@@ -97,15 +153,37 @@ jobs:
             cd $(mktemp -d) &&
             go mod init tmp &&
             go get golang.org/x/exp/cmd/gorelease@latest
-      - run: gorelease
+      - run: gorelease -base=v2.0.0-alpha.2
   release:
-    docker:
-      - image: jfbrandhorst/grpc-gateway-build-env:1.14
+    executor: build-env
     working_directory: /src/grpc-gateway
     steps:
       - checkout
       - run: go mod vendor
       - run: curl -sL https://git.io/goreleaser | bash
+  update-repositoriesbzl:
+    docker:
+      - image: l.gcr.io/google/bazel:latest
+    working_directory: /src/grpc-gateway
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v2-bazel-cache-{{ checksum "repositories.bzl" }}
+            - v2-bazel-cache-
+      - configure_bazel
+      - run:
+          name: Update repositories.bzl
+          command: |
+            bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=repositories.bzl%go_repositories
+      - renovate_git_amend_push
+  regenerate:
+    executor: build-env
+    working_directory: /src/grpc-gateway
+    steps:
+      - checkout
+      - generate
+      - renovate_git_amend_push
 workflows:
   version: 2
   all:
@@ -124,3 +202,20 @@ workflows:
               ignore: /.*/
             tags:
               only: /v[0-9]+(\.[0-9]+)*(-.*)*/
+      - update-repositoriesbzl:
+          filters:
+            branches:
+              only: /renovate\/v2-.+/
+            tags:
+              ignore: /.*/
+      - regenerate:
+          requires:
+            # Run after update-repositoriesbzl to avoid
+            # git conflicts
+            - update-repositoriesbzl
+          filters:
+            branches:
+              only: /renovate\/v2-.+/
+            tags:
+              ignore: /.*/
+

ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md

@@ -6,11 +6,11 @@
   ```sh
   go get -u github.com/grpc-ecosystem/grpc-gateway
   ```
-- [ ] Delete the `protoc-gen-grpc-gateway` and `protoc-gen-swagger` binary from your `PATH`,
+- [ ] Delete the `protoc-gen-grpc-gateway` and `protoc-gen-openapiv2` binary from your `PATH`,
   and reinstall the latest versions:
   ```sh
   go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
-  go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
+  go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2
   ```
 
 ## I still have a problem!

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,28 @@
+---
+name: 🐛 Bug Report
+about: Submit a bug report to help us improve
+---
+
+## 🐛 Bug Report
+
+(A clear and concise description of what the bug is.)
+
+## To Reproduce
+
+(Write your steps here:)
+
+1. Step 1...
+1. Step 2...
+1. Step 3...
+
+## Expected behavior
+
+(Write what you thought would happen.)
+
+## Actual Behavior
+
+(Write what happened. Add screenshots, if applicable.)
+
+## Your Environment
+
+(Environment name, version and operating system.)

.github/ISSUE_TEMPLATE/documentation.md

@@ -0,0 +1,8 @@
+---
+name: 📚 Documentation
+about: Report an issue related to documentation
+---
+
+## 📚 Documentation
+
+(A clear and concise description of what the issue is.)

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,8 @@
+---
+name: 🚀 Feature
+about: Submit a proposal/request for a new feature
+---
+
+## 🚀 Feature
+
+(A clear and concise description of what the feature is.)

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,24 @@
+<!--
+Thank you for sending the PR! We appreciate you spending the time to work on these changes.
+
+Help us understand your motivation by explaining why you decided to make this change.
+
+You can learn more about contributing to grpc-gateway here: https://github.com/grpc-ecosystem/grpc-gateway/blob/master/CONTRIBUTING.md
+
+Happy contributing!
+
+-->
+
+#### References to other Issues or PRs
+
+<!-- If this pull request fixes an issue, write "Fixes #NNNN" in that exact
+format, e.g. "Fixes #1234" (see
+https://tinyurl.com/auto-closing for more information). Also, please
+write a comment on that issue linking back to this pull request once it is
+open. -->
+
+#### Have you read the [Contributing Guidelines](https://github.com/grpc-ecosystem/grpc-gateway/blob/master/CONTRIBUTING.md)?
+
+#### Brief description of what is fixed or changed
+
+#### Other comments

.gitignore

@@ -7,6 +7,7 @@ bazel-genfiles
 bazel-grpc-gateway
 bazel-out
 bazel-testlogs
+.bazelrc
 
 # Go vendor directory
 vendor

.goreleaser.yml

@@ -10,9 +10,9 @@ builds:
       - windows
     goarch:
       - amd64
-  - main: ./protoc-gen-swagger/main.go
-    id: protoc-gen-swagger
-    binary: protoc-gen-swagger
+  - main: ./protoc-gen-openapiv2/main.go
+    id: protoc-gen-openapiv2
+    binary: protoc-gen-openapiv2
     env:
       - CGO_ENABLED=0
     goos: