significant code refactoring

.github/workflows/build.yaml

@@ -3,110 +3,119 @@ name: Pumba CI
 on:
   push:
     branches:
-    - '*'
+      - '*'
     tags:
-    - '*'
+      - '*'
     paths-ignore:
-    - 'docs/**'
-    - 'deploy/**'
-    - '*.md'
+      - 'docs/**'
+      - 'deploy/**'
+      - '*.md'
   pull_request:
     branches:
-    - '*'
+      - '*'
 
 jobs:
 
-  full:
- 
+  build:
+
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-
+
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-
-    - name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: list available platforms
-      run: echo ${{ steps.buildx.outputs.platforms }}
-
-    - name: decide on tag
-      id: tagger
-      run: |
-        tag=$(echo "${{ github.ref }}" | sed -e 's/^refs\/heads\///g' -e 's/^refs\/tags\///g' -e 's/^refs\/pull\///g' -e 's/\/merge$//g' | sed -e 's/master/latest/g')
-        echo "::set-output name=tag::${tag}"
-        echo "::debug::docker image tag ${tag}"
-
-    - name: prepare build arguments
-      id: prepare
-      run: |
-        args=$(echo "--progress=plain --build-arg=CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} --build-arg=VCS_COMMIT_ID=${{ github.sha }} --build-arg=VCS_BRANCH_NAME=${{ steps.tagger.outputs.tag }} --build-arg=VCS_SLUG=${{ github.repository }} --file=docker/Dockerfile .")
-        echo "::debug::prepare build args ${args}"
-        echo "::set-output name=args::${args}"
-
-    - name: cache Docker layers
-      uses: actions/cache@v2
-      id: cache
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
-
-    - name: build test images
-      run: |
-        echo "==> compile and test Go code"
-        DOCKER_BUILDKIT=1 docker build --tag=pumba/build-and-test \
-          --target=build-and-test \
-          ${{ steps.prepare.outputs.args }}
-        echo "==> prepare integration tests image"
-        DOCKER_BUILDKIT=1 docker build --tag pumba/integration-tests \
-          --target=integration-tests \
-          ${{ steps.prepare.outputs.args }}
-
-    - name: run integration tests
-      run: |
-        docker buildx ls
-        docker run -i --rm --name integration-tests -v /var/run/docker.sock:/var/run/docker.sock pumba/integration-tests
-
-    - name: upload coverage report
-      run: |
-        CI_BUILD_URL=https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks
-        docker run -i --rm --name upload-coverage -e CI_BUILD_URL=${CI_BUILD_URL} -e CI_BUILD_ID=${RUNNER_TRACKING_ID} pumba/build-and-test
-
-    - name: login to DockerHub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_ACCOUNT }}
-        password: ${{ secrets.DOCKER_TOKEN }}
-
-    - name: prepare release image
-      if: github.event_name != 'pull_request'
-      env:
-        DOCKER_ORG: ${{ secrets.DOCKER_ORG }}
-      run: |
-        docker buildx build \
-          --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \
-          --cache-from "type=local,src=/tmp/.buildx-cache" \
-          --cache-to "type=local,dest=/tmp/.buildx-cache" \
-          --output "type=image,push=true" \
-          --tag=${DOCKER_ORG}/pumba:${{ steps.tagger.outputs.tag }} \
-          ${{ steps.prepare.outputs.args }}
-
-    - name: release to GitHub
-      if: github.event_name != 'pull_request'
-      run: |
-        if [[ "${{ steps.tagger.outputs.tag }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then \
-          DOCKER_BUILDKIT=1 docker build \
-            --tag pumba/github-release \
-            --target=github-release \
-            --build-arg=RELEASE=true \
-            --build-arg=RELEASE_TAG=${{ steps.tagger.outputs.tag }} \
-            --build-arg=TAG_MESSAGE="Draft Release" \
-            --build-arg=GITHUB_TOKEN=${{ secrets.RELEASE_TOKEN }} \
-            ${{ steps.prepare.outputs.args }}; \
-        fi
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: List available platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+
+      - name: Decide on tag
+        id: tagger
+        run: |
+          tag=$(echo "${{ github.ref }}" | sed -e 's/^refs\/heads\///g' -e 's/^refs\/tags\///g' -e 's/^refs\/pull\///g' -e 's/\/merge$//g' | sed -e 's/master/latest/g')
+          echo "::set-output name=tag::${tag}"
+          echo "::debug::docker image tag ${tag}"
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Build test image
+        env:
+          DOCKER_ORG: ${{ secrets.DOCKER_ORG }}
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/Dockerfile
+          context: .
+          build-args: |
+            CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}
+            VCS_COMMIT_ID=${{ github.sha }}
+            VCS_BRANCH_NAME=${{ steps.tagger.outputs.tag }}
+            VCS_SLUG=${{ github.repository }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          load: true
+          tags: pumba/build-and-test
+          target: build-and-test
+
+      - name: Build integration test image
+        env:
+          DOCKER_ORG: ${{ secrets.DOCKER_ORG }}
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/Dockerfile
+          context: .
+          build-args: |
+            CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}
+            VCS_COMMIT_ID=${{ github.sha }}
+            VCS_BRANCH_NAME=${{ steps.tagger.outputs.tag }}
+            VCS_SLUG=${{ github.repository }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          load: true
+          tags: pumba/integration-tests
+          target: integration-tests
+
+      - name: Run integration tests
+        run: |
+          docker run -i --rm --name integration-tests -v /var/run/docker.sock:/var/run/docker.sock pumba/integration-tests
+
+      - name: Upload coverage report
+        run: |
+          CI_BUILD_URL=https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks
+          docker run -i --rm --name upload-coverage -e CI_BUILD_URL=${CI_BUILD_URL} -e CI_BUILD_ID=${RUNNER_TRACKING_ID} pumba/build-and-test
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_ACCOUNT }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Build and push release image
+        if: github.event_name != 'pull_request'
+        env:
+          DOCKER_ORG: ${{ secrets.DOCKER_ORG }}
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          build-args: |
+            CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}
+            VCS_COMMIT_ID=${{ github.sha }}
+            VCS_BRANCH_NAME=${{ steps.tagger.outputs.tag }}
+            VCS_SLUG=${{ github.repository }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          push: true
+          tags: ${DOCKER_ORG}/pumba:${{ steps.tagger.outputs.tag }}

.github/workflows/release.yaml

@@ -0,0 +1,64 @@
+name: release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+    paths-ignore:
+      - 'docs/**'
+      - 'deploy/**'
+      - '*.md'
+
+jobs:
+
+  release:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Decide on tag
+        id: tagger
+        run: |
+          tag=$(echo "${{ github.ref }}" | sed -e 's/^refs\/heads\///g' -e 's/^refs\/tags\///g' -e 's/^refs\/pull\///g' -e 's/\/merge$//g' | sed -e 's/master/latest/g')
+          echo "::set-output name=tag::${tag}"
+          echo "::debug::docker image tag ${tag}"
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Release to GitHub
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: docker/build-push-action@v2
+        with:
+          build-args: |
+            RELEASE=true
+            RELEASE_TAG=${{ steps.tagger.outputs.tag }}
+            RELEASE_TOKEN=${{ secrets.RELEASE_TOKEN }}
+            TAG_MESSAGE="Draft Release"
+            GITHUB_TOKEN=${{ secrets.RELEASE_TOKEN }}
+            CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}
+            VCS_COMMIT_ID=${{ github.sha }}
+            VCS_BRANCH_NAME=${{ steps.tagger.outputs.tag }}
+            VCS_SLUG=${{ github.repository }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          target: github-release

.golangci.yml

@@ -1,14 +1,12 @@
 linters-settings:
   govet:
     check-shadowing: true
-  golint:
-    min-confidence: 0
   gocyclo:
     min-complexity: 15
   maligned:
     suggest-new: true
   dupl:
-    threshold: 100
+    threshold: 150
   goconst:
     min-len: 2
     min-occurrences: 2
@@ -32,36 +30,58 @@ linters-settings:
       - whyNoLint
       - wrapperFunc
   funlen:
-    lines: 100
+    lines: 105
     statements: 50
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
-    - rowserrcheck
+    - asciicheck
     - bodyclose
     - deadcode
     - depguard
     - dogsled
     - dupl
+    - durationcheck
     - errcheck
+    - errname
+    - errorlint
+    - exhaustive
+    - exportloopref
     - funlen
+    - gci
+    # - gochecknoglobals TODO: remove globals from code
+    # - gochecknoinits TODO: remove main.init
+    - gocognit
     - goconst
     - gocritic
     - gocyclo
+    #    - godox
+    - goerr113
     - gofmt
     - goimports
-    - golint
+    - gomnd
+    - gomoddirectives
     - gosec
     - gosimple
     - govet
+    - goprintffuncname
+    - ifshort
+    - importas
     - ineffassign
-    - interfacer
+    - makezero
     - misspell
     - nakedret
-    - scopelint
+    # - nestif
+    - nilerr
+    - nolintlint
+    - prealloc
+    - predeclared
+    - promlinter
+    - revive
+    - rowserrcheck
     - staticcheck
     - structcheck
     - stylecheck
@@ -70,15 +90,24 @@ linters:
     - unparam
     - unused
     - varcheck
+    - wastedassign
     - whitespace
-
-  # don't enable:
-  # - gochecknoglobals
-  # - gocognit
-  # - godox
-  # - maligned
-  # - prealloc
+    - wrapcheck
+    # - wsl
 
 issues:
-    exclude:
-        - Using the variable on range scope `tt` in function literal
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - funlen
+        - bodyclose
+        - gosec
+        - dupl
+        - gocognit
+        - goconst
+        - goerr113
+    - path: mocks\*\.go
+      linters:
+        - wrapcheck
+  exclude:
+    - Using the variable on range scope `tt` in function literal