Merge pull request #429 from spiral/2.0

Release 2.0-dev

4 files changed, 205 insertions, 167 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 8f4dc73b..00000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-name: build
-
-on:
-  push:
-  pull_request:
-    branches:
-      # Branches from forks have the form 'user:branch-name' so we only run
-      # this job on pull_request events for branches that look like fork
-      # branches. Without this we would end up running this job twice for non
-      # forked PRs, once for the push and then once for opening the PR.
-      - '**:**'
-
-jobs:
-  php:
-    name: Build (PHP ${{ matrix.php }}, ${{ matrix.setup }} setup)
-    runs-on: ubuntu-20.04
-    timeout-minutes: 10
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [ '7.2', '7.3', '7.4', '8.0' ]
-        setup: [ basic, lowest ]
-    steps:
-      - name: Set up PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2 # action page: <https://github.com/shivammathur/setup-php>
-        with:
-          php-version: ${{ matrix.php }}
-
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Syntax check only (lint)
-        run: find ./src/ ./tests/ -name "*.php" -print0 | xargs -0 -n1 -P8 php -l
-
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Init Composer Cache # Docs: <https://git.io/JfAKn#php---composer>
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.setup }}-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install lowest Composer dependencies
-        if: matrix.setup == 'lowest'
-        run: composer update --prefer-dist --no-progress --prefer-lowest --ansi
-
-      - name: Install basic Composer dependencies
-        if: matrix.setup == 'basic'
-        run: composer update --prefer-dist --no-progress --ansi
-
-      - name: Analyze PHP sources
-        run: composer analyze
-
-      # TODO write phpunit tests
-      #- name: Analyze PHP sources
-      #  run: composer test
-
-  golang:
-    name: Build (Go ${{ matrix.go }}, PHP ${{ matrix.php }})
-    runs-on: ubuntu-20.04
-    timeout-minutes: 20
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [ '7.2', '7.3', '7.4', '8.0' ]
-        go: [ '1.14', '1.15' ]
-    steps:
-      - name: Set up Go ${{ matrix.go }}
-        uses: actions/setup-go@v2 # action page: <https://github.com/actions/setup-go>
-        with:
-          go-version: ${{ matrix.go }}
-
-      - name: Set up PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2 # action page: <https://github.com/shivammathur/setup-php>
-        with:
-          php-version: ${{ matrix.php }}
-
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Init Composer Cache # Docs: <https://git.io/JfAKn#php---composer>
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install Composer dependencies
-        run: composer update --prefer-dist --no-progress --ansi
-
-      - name: Init Go modules Cache # Docs: <https://git.io/JfAKn#go---modules>
-        uses: actions/cache@v2
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: ${{ runner.os }}-go-
-
-      - name: Install Go dependencies
-        run: go mod download
-
-      - name: Run golang tests
-        run: |
-          mkdir ./coverage-ci
-          go test                   -race -v -covermode=atomic -coverprofile=./coverage-ci/lib.txt
-          go test ./util            -race -v -covermode=atomic -coverprofile=./coverage-ci/util.txt
-          go test ./service         -race -v -covermode=atomic -coverprofile=./coverage-ci/service.txt
-          go test ./service/env     -race -v -covermode=atomic -coverprofile=./coverage-ci/env.txt
-          go test ./service/rpc     -race -v -covermode=atomic -coverprofile=./coverage-ci/rpc.txt
-          go test ./service/http    -race -v -covermode=atomic -coverprofile=./coverage-ci/http.txt
-          go test ./service/static  -race -v -covermode=atomic -coverprofile=./coverage-ci/static.txt
-          go test ./service/limit   -race -v -covermode=atomic -coverprofile=./coverage-ci/limit.txt
-          go test ./service/headers -race -v -covermode=atomic -coverprofile=./coverage-ci/headers.txt
-          go test ./service/metrics -race -v -covermode=atomic -coverprofile=./coverage-ci/metrics.txt
-          go test ./service/health  -race -v -covermode=atomic -coverprofile=./coverage-ci/health.txt
-          go test ./service/gzip    -race -v -covermode=atomic -coverprofile=./coverage-ci/gzip.txt
-          # reload tests temporarily excluded from CI due to intensive work with the file system, and unpredictable GHA
-          # go test ./service/reload  -race -v -covermode=atomic -coverprofile=./coverage-ci/reload.txt
-          cat ./coverage-ci/*.txt > ./coverage-ci/summary.txt
-
-      - uses: codecov/codecov-action@v1 # Docs: <https://github.com/codecov/codecov-action>
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage-ci/summary.txt
-          fail_ci_if_error: false
-
-
-  golangci-lint:
-    name: Golang-CI (lint)
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Run linter
-        uses: golangci/golangci-lint-action@v2 # Action page: <https://github.com/golangci/golangci-lint-action>
-        with:
-          version: v1.35 # without patch version
-          only-new-issues: false # show only new issues if it's a pull request
-
-  image:
-    name: Build docker image
-    runs-on: ubuntu-20.04
-    timeout-minutes: 10
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Build image
-        run: docker build -t roadrunner:local -f Dockerfile .
-
-      - name: Scan image
-        uses: anchore/scan-action@v2 # action page: <https://github.com/anchore/scan-action>
-        with:
-          image: roadrunner:local
-          fail-build: true
-          severity-cutoff: low # negligible, low, medium, high or critical
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
new file mode 100644
index 00000000..27df293a
--- /dev/null
+++ b/.github/workflows/linux.yml
@@ -0,0 +1,113 @@
+name: Linux
+
+on:
+  push:
+  pull_request:
+    branches:
+      # Branches from forks have the form 'user:branch-name' so we only run
+      # this job on pull_request events for branches that look like fork
+      # branches. Without this we would end up running this job twice for non
+      # forked PRs, once for the push and then once for opening the PR.
+      - "**:**"
+
+jobs:
+  golang:
+    name: Build (Go ${{ matrix.go }}, PHP ${{ matrix.php }}, OS ${{matrix.os}})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ "7.4", "8.0" ]
+        go: [ "1.14", "1.15" ]
+        os: [ ubuntu-20.04 ]
+    steps:
+      - name: Set up Go ${{ matrix.go }}
+        uses: actions/setup-go@v2 # action page: <https://github.com/actions/setup-go>
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: Set up PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2 # action page: <https://github.com/shivammathur/setup-php>
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: sockets
+
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Init Composer Cache # Docs: <https://git.io/JfAKn#php---composer>
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: cd tests && composer update --prefer-dist --no-progress --ansi
+
+      - name: Init Go modules Cache # Docs: <https://git.io/JfAKn#go---modules>
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - name: Install Go dependencies
+        run: go mod download
+
+      - name: Run golang tests on Linux
+        run: |
+          docker-compose -f ./tests/docker-compose.yaml up -d
+          mkdir ./coverage-ci
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/pipe.txt -covermode=atomic ./pkg/transport/pipe
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/socket.txt -covermode=atomic ./pkg/transport/socket
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/pool.txt -covermode=atomic ./pkg/pool
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/worker.txt -covermode=atomic ./pkg/worker
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/worker_stack.txt -covermode=atomic ./pkg/worker_watcher
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/http_config.txt -covermode=atomic ./plugins/http/config
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/http.txt -covermode=atomic ./tests/plugins/http
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/informer.txt -covermode=atomic ./tests/plugins/informer
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/reload.txt -covermode=atomic ./tests/plugins/reload
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/server.txt -covermode=atomic ./tests/plugins/server
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/checker.txt -covermode=atomic ./tests/plugins/checker
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/config.txt -covermode=atomic ./tests/plugins/config
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/gzip.txt -covermode=atomic ./tests/plugins/gzip
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/headers.txt -covermode=atomic ./tests/plugins/headers
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/logger.txt -covermode=atomic ./tests/plugins/logger
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/metrics.txt -covermode=atomic ./tests/plugins/metrics
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/redis.txt -covermode=atomic ./tests/plugins/redis
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/resetter.txt -covermode=atomic ./tests/plugins/resetter
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/rpc.txt -covermode=atomic ./tests/plugins/rpc
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/static.txt -covermode=atomic ./tests/plugins/static
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/boltdb_unit.txt -covermode=atomic ./plugins/kv/boltdb
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/kv_unit.txt -covermode=atomic ./plugins/kv/memory
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/memcached_unit.txt -covermode=atomic ./plugins/kv/memcached
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/boltdb.txt -covermode=atomic ./tests/plugins/kv/boltdb
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/memory.txt -covermode=atomic ./tests/plugins/kv/memory
+          go test -v -race -cover -tags=debug -coverpkg=./... -coverprofile=./coverage-ci/memcached.txt -covermode=atomic ./tests/plugins/kv/memcached
+          docker-compose -f ./tests/docker-compose.yaml down
+          cat ./coverage-ci/*.txt > ./coverage-ci/summary.txt
+
+      - uses: codecov/codecov-action@v1 # Docs: <https://github.com/codecov/codecov-action>
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage-ci/summary.txt
+          fail_ci_if_error: false
+
+  golangci-lint:
+    name: Golang-CI (lint)
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Run linter
+        uses: golangci/golangci-lint-action@v2 # Action page: <https://github.com/golangci/golangci-lint-action>
+        with:
+          version: v1.35 # without patch version
+          only-new-issues: false # show only new issues if it's a pull request
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
new file mode 100644
index 00000000..77f9cfda
--- /dev/null
+++ b/.github/workflows/macos.yml
@@ -0,0 +1,88 @@
+name: macOS
+
+on:
+  push:
+  pull_request:
+    branches:
+      # Branches from forks have the form 'user:branch-name' so we only run
+      # this job on pull_request events for branches that look like fork
+      # branches. Without this we would end up running this job twice for non
+      # forked PRs, once for the push and then once for opening the PR.
+      - "**:**"
+
+jobs:
+  golang:
+    name: Build (Go ${{ matrix.go }}, PHP ${{ matrix.php }}, OS ${{matrix.os}})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ "7.4", "8.0" ]
+        go: [ "1.14", "1.15" ]
+        os: [ macos-latest ]
+    steps:
+      - name: Set up Go ${{ matrix.go }}
+        uses: actions/setup-go@v2 # action page: <https://github.com/actions/setup-go>
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: Set up PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2 # action page: <https://github.com/shivammathur/setup-php>
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: sockets
+
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Init Composer Cache # Docs: <https://git.io/JfAKn#php---composer>
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: cd tests && composer update --prefer-dist --no-progress --ansi
+
+      - name: Init Go modules Cache # Docs: <https://git.io/JfAKn#go---modules>
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - name: Install Go dependencies
+        run: go mod download
+
+      - name: Run golang tests
+        run: |
+          go test -v -race -tags=debug ./pkg/transport/pipe
+          go test -v -race -tags=debug ./pkg/transport/socket
+          go test -v -race -tags=debug ./pkg/pool
+          go test -v -race -tags=debug ./pkg/worker
+          go test -v -race -tags=debug ./pkg/worker_watcher
+          go test -v -race -tags=debug ./plugins/http/config
+          go test -v -race -tags=debug ./tests/plugins/http
+          go test -v -race -tags=debug ./tests/plugins/informer
+          go test -v -race -tags=debug ./tests/plugins/reload
+          go test -v -race -tags=debug ./tests/plugins/server
+          go test -v -race -tags=debug ./tests/plugins/checker
+          go test -v -race -tags=debug ./tests/plugins/config
+          go test -v -race -tags=debug ./tests/plugins/gzip
+          go test -v -race -tags=debug ./tests/plugins/headers
+          go test -v -race -tags=debug ./tests/plugins/logger
+          go test -v -race -tags=debug ./tests/plugins/metrics
+          go test -v -race -tags=debug ./tests/plugins/redis
+          go test -v -race -tags=debug ./tests/plugins/resetter
+          go test -v -race -tags=debug ./tests/plugins/rpc
+          go test -v -race -tags=debug ./tests/plugins/static
+          go test -v -race -tags=debug ./plugins/kv/boltdb
+          go test -v -race -tags=debug ./plugins/kv/memory
+          go test -v -race -tags=debug ./tests/plugins/kv/boltdb
+          go test -v -race -tags=debug ./tests/plugins/kv/memory
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b1cd83ae..785f40ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15.5
+          go-version: 1.15.6
 
       - name: Check out code
         uses: actions/checkout@v2
@@ -55,10 +55,10 @@ jobs:
           CGO_ENABLED: 0
           LDFLAGS: >-
             -s
-            -X github.com/spiral/roadrunner/cmd/rr/cmd.Version=${{ steps.values.outputs.version }}
-            -X github.com/spiral/roadrunner/cmd/rr/cmd.BuildTime=${{ steps.values.outputs.timestamp }}
+            -X github.com/spiral/roadrunner/cmd/cli.Version=${{ steps.values.outputs.version }}
+            -X github.com/spiral/roadrunner/cmd/cli.BuildTime=${{ steps.values.outputs.timestamp }}
         run: |
-          go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/rr/main.go
+          go build -trimpath -ldflags "$LDFLAGS" -o "./${{ steps.values.outputs.binary-name }}" ./cmd/main.go
           stat "./${{ steps.values.outputs.binary-name }}"
 
       - name: Generate distributive directory name