Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gavinmcnair committed Apr 22, 2020
2 parents b0424fa + d896a3f commit 2adebff
Show file tree
Hide file tree
Showing 57 changed files with 883 additions and 518 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
@@ -0,0 +1 @@
* @bai
44 changes: 44 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,44 @@
name: CI

on: [push, pull_request]

jobs:
test:
name: Go ${{ matrix.go-version }} on Ubuntu
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
go-version: [1.12.x, 1.13.x]
platform: [ubuntu-latest]

steps:
- uses: actions/checkout@v1

- name: Setup Go
uses: actions/setup-go@v1
with:
go-version: ${{ matrix.go-version }}

- uses: actions/cache@v1
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
# See https://github.com/actions/setup-go/issues/14
- name: Setup env
run: |
echo "::set-env name=GOPATH::$(go env GOPATH)"
echo "::add-path::$(go env GOPATH)/bin"
shell: bash

- name: Install dependencies
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.1

- name: Run test suite
run: make test

- name: Run linter
run: make lint
49 changes: 49 additions & 0 deletions .github/workflows/release.yml
@@ -0,0 +1,49 @@
name: Release

on:
push:
branches-ignore:
- '**'
tags:
- 'v*.*.*'

jobs:
test:
name: Release
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: Setup Go
uses: actions/setup-go@v1
with:
go-version: 1.13.x

- uses: actions/cache@v1
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
# See https://github.com/actions/setup-go/issues/14
- name: Setup env
run: |
echo "::set-env name=GOPATH::$(go env GOPATH)"
echo "::add-path::$(go env GOPATH)/bin"
shell: bash

- name: Login to GitHub Registry
run: |
docker login docker.pkg.github.com -u bai -p "${GITHUB_TOKEN}"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v1
with:
version: latest
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
74 changes: 74 additions & 0 deletions .golangci.yml
@@ -0,0 +1,74 @@
run:
timeout: 5m
deadline: 10m

linters-settings:
govet:
check-shadowing: false
golint:
min-confidence: 0
gocyclo:
min-complexity: 25
maligned:
suggest-new: true
dupl:
threshold: 100
goconst:
min-len: 2
min-occurrences: 3
misspell:
locale: US
goimports:
local-prefixes: github.com/linkedin/Burrow
gocritic:
enabled-tags:
- diagnostic
- experimental
- opinionated
- performance
- style
disabled-checks:
- wrapperFunc
- ifElseChain
funlen:
lines: 200
statements: 200

linters:
disable-all: true
enable:
- bodyclose
- deadcode
- depguard
- dogsled
# - dupl
# - errcheck
- funlen
- gocritic
- gocyclo
- gofmt
- goimports
- golint
# - gosec
- gosimple
- govet
- ineffassign
- interfacer
- misspell
- nakedret
- scopelint
- staticcheck
- structcheck
- stylecheck
- typecheck
- unconvert
- unused
- varcheck
- whitespace
- goconst
# - gochecknoinits

issues:
exclude:
- consider giving a name to these results
- include an explanation for nolint directive
78 changes: 43 additions & 35 deletions .goreleaser.yml
@@ -1,38 +1,46 @@
# .goreleaser.yml
# Build customization
project_name: Burrow

builds:
- main: main.go
binary: burrow
goos:
- windows
- darwin
- linux
goarch:
- amd64
# Archive customization
archive:
format: tar.gz
- main: main.go
binary: burrow
env:
- CGO_ENABLED=0
goos:
- windows
- darwin
- linux
goarch:
- amd64
archives:
- format: tar.gz
files:
- LICENSE
- NOTICE
- README.md
- CHANGELOG.md
- config/burrow.toml
- config/default-email.tmpl
- config/default-http-delete.tmpl
- config/default-http-post.tmpl
- config/default-slack-delete.tmpl
- config/default-slack-post.tmpl
- LICENSE
- NOTICE
- README.md
- CHANGELOG.md
- config/burrow.toml
- config/default-email.tmpl
- config/default-http-delete.tmpl
- config/default-http-post.tmpl
- config/default-slack-delete.tmpl
- config/default-slack-post.tmpl
snapshot:
name_template: "{{ .FullCommit }}"
dockers:
-
goos: linux
goarch: amd64
goarm: ''
binaries:
- burrow
dockerfile: Dockerfile.gorelease
image_templates:
- 'toddpalino/burrow:latest'
- 'toddpalino/burrow:{{ .Tag }}'
extra_files:
- docker-config/burrow.toml
- goos: linux
goarch: amd64
goarm: ''
binaries:
- burrow
dockerfile: Dockerfile.gorelease
image_templates:
- 'docker.pkg.github.com/linkedin/burrow/burrow:latest'
- 'docker.pkg.github.com/linkedin/burrow/burrow:{{ .Tag }}'
extra_files:
- docker-config/burrow.toml
build_flag_templates:
- "--label=org.label-schema.schema-version=1.0"
- "--label=org.label-schema.version={{ .Version }}"
- "--label=org.label-schema.name={{ .ProjectName }}"
- "--label=org.label-schema.vcs=https://github.com/linkedin/Burrow"
- "--label=org.label-schema.vcs-ref={{ .FullCommit }}"
61 changes: 0 additions & 61 deletions .travis.yml

This file was deleted.

59 changes: 53 additions & 6 deletions CHANGELOG.md
@@ -1,9 +1,56 @@
## 1.3.0 (unreleased)

**Release Highlights**

* Add support for Go 1.13.
* Use vanilla alpine image to run Burrow instead of `iron/go`.
## 1.3.3

- #617 - @timbertson-zd - add and expose observedAt time for lag entries
- #616 - @timbertson - Fix self-reporting of burrow's own progress
- #615 - @bai - Run github actions when PR is created
- #545 - @Lukkie - Allow underscore in hostname

## 1.3.2

- #608 - @bai - Disable travis ci integration
- #607 - @bai - Build docker image with Go 1.13.7
- #605 - @alvarolmedo - Improve zk lock method to avoid trying lock errors
- #541 - @danudey - Use system SSL store for notifiers by default
- #606 - @bai - Update sarama with fixes for zstd and deadlock
- #548 - @hoesler - feature: configure sarama logger
- #601 - @bai - Add more linters and address select issues
- #597 - @bai - Use golangci-lint instead of assorted linters, build with github actions

## 1.3.1

- #596 - @bai - Fix deprecated goreleaser config opts

## 1.3.0

- #595 - @bai - Update sarama to add support for kafka 2.4.0
- #592 - @jantebeest - Feature/zookeeper tls auth
- #585 - @chadjefferies - Make DisableKeepAlives configurable
- #590 - @thenom - Added 2.2.1 supporting version
- #574 - @mweigel - Set Order field on StorageRequests produced by KafkaZkClient
- #571 - @bai - Add support for Go 1.13
- #567 - @dellalu - Replace '-' with '_' for Env
- #563 - @zerowidth - Update the sarama TLS config to allow anonymous SSL connections
- #562 - @chrnola - Add support for group member metadata v3
- #557 - @khorshuheng - Remove reference to dep in Readme
- #556 - @khorshuheng - Migrate from dep to go module
- #399 - @MadDataScience - allow space in consumer name
- #555 - @khorshuheng - Upgrade sarama to support Kafka 2.3.0
- #488 - @timbertson - start-latest + backfill-earliest mode
- #390 - @vixns - parse http notifier open-url and close-url as templates.
- #528 - @timbertson - Report burrow's own progress as a fake consumer
- #524 - @bai - Run CI and build on Golang 1.12
- #523 - @bai - Update sarama to 1.22.1
- #521 - @asaf400 - Upgrade sarama to support Kafka 2.2.0
- #512 - @vvuibert - sarama 1.21.0
- #506 - @jbvmio - Groupmeta v2
- #477 - @mlongob - Only process metadata for groups with ProtocolType = consumer
- #415 - @lins05 - Fixed pid check in docker containers
- #443 - @Lavaerius - Enabling HTTPS endpoints by using ServeTLS
- #413 - @jorgelbg - Retrieve partition owners on the kafka zookeeper client
- #420 - @maxtuzz - Notifier TLS options
- #439 - @BewareMyPower - Replace topicMap with topicPartitions in cluster module
- #493 - @timbertson - travis: test output of gofmt as a single argument
- #502 - @him2994 - Fixed: *storage.brokerOffset has value nil when no leader election for partition

## 1.2.2 (2019-02-28)

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,5 +1,5 @@
# stage 1: builder
FROM golang:1.13-alpine as builder
FROM golang:1.13.7-alpine as builder

ENV BURROW_SRC /usr/src/Burrow/

Expand All @@ -10,7 +10,7 @@ WORKDIR $BURROW_SRC
RUN go mod tidy && go build -o /tmp/burrow .

# stage 2: runner
FROM alpine:3.10
FROM alpine:3.11

LABEL maintainer="LinkedIn Burrow https://github.com/linkedin/Burrow"

Expand Down

0 comments on commit 2adebff

Please sign in to comment.