Merge branch 'master' of https://github.com/dgiot/dgiot_server

.ci/build_packages/Dockerfile

@@ -1,11 +1,11 @@
 ARG BUILD_FROM=emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04
 FROM ${BUILD_FROM}
 
-ARG EMQX_NAME=emqx
+ARG EMQX_NAME=dgiot
 
-COPY . /emqx
+COPY . /dgiot
 
-WORKDIR /emqx
+WORKDIR /dgiot
 
 RUN make ${EMQX_NAME}-zip || cat rebar3.crashdump
 

.ci/build_packages/tests.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -x -e -u
-export CODE_PATH=${CODE_PATH:-"/emqx"}
-export EMQX_NAME=${EMQX_NAME:-"emqx"}
+export CODE_PATH=${CODE_PATH:-"/dgiot"}
+export EMQX_NAME=${EMQX_NAME:-"dgiot"}
 export PACKAGE_PATH="${CODE_PATH}/_packages/${EMQX_NAME}"
 export RELUP_PACKAGE_PATH="${CODE_PATH}/relup_packages/${EMQX_NAME}"
 # export EMQX_NODE_NAME="emqx-on-$(uname -m)@127.0.0.1"

.ci/fvt_tests/.env

@@ -1 +1 @@
-TARGET=emqx/emqx
+TARGET=dgiot/dgiot

.github/workflows/build_packages.yaml

@@ -31,17 +31,17 @@ jobs:
           if make -C source emqx-ee --dry-run > /dev/null 2>&1; then
             echo "::set-output name=profiles::[\"emqx-ee\"]"
           else
-            echo "::set-output name=profiles::[\"emqx\", \"emqx-edge\"]"
+            echo "::set-output name=profiles::[\"dgiot\", \"emqx-edge\"]"
           fi
       - name: get_all_deps
-        if: endsWith(github.repository, 'emqx')
+        if: endsWith(github.repository, 'dgiot')
         run: |
           make -C source deps-all
           zip -ryq source.zip source
       - name: get_all_deps
         if: endsWith(github.repository, 'enterprise')
         run: |
-          echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
+          echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
           git config --global credential.helper store
           echo "${{ secrets.CI_GIT_TOKEN }}" >> source/scripts/git-token
           make -C source deps-all
@@ -55,7 +55,7 @@ jobs:
     runs-on: windows-2019
 
     needs: prepare
-    if: endsWith(github.repository, 'emqx')
+    if: endsWith(github.repository, 'dgiot')
 
     strategy:
       matrix:
@@ -100,7 +100,7 @@ jobs:
         Compress-Archive -Path _build/${{ matrix.profile }}/rel/emqx -DestinationPath _build/${{ matrix.profile }}/rel/$pkg_name
         mv _build/${{ matrix.profile }}/rel/$pkg_name _packages/${{ matrix.profile }}
         Get-FileHash -Path "_packages/${{ matrix.profile }}/$pkg_name" | Format-List | grep 'Hash' | awk '{print $3}'  > _packages/${{ matrix.profile }}/$pkg_name.sha256
-    - name: run emqx
+    - name: run dgiot
       timeout-minutes: 1
       run: |
         cd source
@@ -253,7 +253,7 @@ jobs:
       run: |
         set -e -u -x
         cd source
-        if [ $PROFILE = "emqx" ];then broker="emqx-ce"; else broker="$PROFILE"; fi
+        if [ $PROFILE = "dgiot" ];then broker="emqx-ce"; else broker="$PROFILE"; fi
         if [ $PROFILE = "emqx-ee" ];then edition='enterprise'; else edition='opensource'; fi
 
         vsn="$(./pkg-vsn.sh)"
@@ -403,7 +403,7 @@ jobs:
     - name: upload aws s3
       run: |
         set -e -u
-        if [ "${{ matrix.profile }}"  == "emqx" ];then
+        if [ "${{ matrix.profile }}"  == "dgiot" ];then
             broker="emqx-ce"
         else
             broker=${{ matrix.profile }}
@@ -417,14 +417,14 @@ jobs:
     - uses: Rory-Z/upload-release-asset@v1
       if: github.event_name == 'release' && matrix.profile != 'emqx-ee'
       with:
-        repo: emqx
-        path: "_packages/${{ matrix.profile }}/emqx-*"
+        repo: dgiot
+        path: "_packages/${{ matrix.profile }}/dgiot-*"
         token: ${{ github.token }}
     - uses: Rory-Z/upload-release-asset@v1
       if: github.event_name == 'release' && matrix.profile == 'emqx-ee'
       with:
         repo: emqx-enterprise
-        path: "_packages/${{ matrix.profile }}/emqx-*"
+        path: "_packages/${{ matrix.profile }}/dgiot-*"
         token: ${{ github.token }}
     - name: update to emqx.io
       if: github.event_name == 'release'

.github/workflows/build_slim_packages.yaml

@@ -15,102 +15,101 @@ jobs:
     strategy:
       matrix:
         erl_otp:
-        - erl23.2.7.2-emqx-2
+          - erl23.2.7.2-emqx-2
         os:
-        - ubuntu20.04
-        - centos7
+          - ubuntu20.04
+          - centos7
 
     container: emqx/build-env:${{ matrix.erl_otp }}-${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v1
-    - name: prepare
-      run: |
-        if make emqx-ee --dry-run > /dev/null 2>&1; then
-          echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
-          git config --global credential.helper store
-          echo "${{ secrets.CI_GIT_TOKEN }}" >> ./scripts/git-token
-          echo "EMQX_NAME=emqx-ee" >> $GITHUB_ENV
-        else
-          echo "EMQX_NAME=emqx" >> $GITHUB_ENV
-        fi
-    - name: build zip packages
-      run: make ${EMQX_NAME}-zip
-    - name: build deb/rpm packages
-      run: make ${EMQX_NAME}-pkg
-    - name: pakcages test
-      run: |
-        export CODE_PATH=$GITHUB_WORKSPACE
-        .ci/build_packages/tests.sh
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ matrix.os }}
-        path: _packages/**/*.zip
-
+      - uses: actions/checkout@v1
+      - name: prepare
+        run: |
+          if make emqx-ee --dry-run > /dev/null 2>&1; then
+            echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
+            git config --global credential.helper store
+            echo "${{ secrets.CI_GIT_TOKEN }}" >> ./scripts/git-token
+            echo "EMQX_NAME=emqx-ee" >> $GITHUB_ENV
+          else
+            echo "EMQX_NAME=dgiot" >> $GITHUB_ENV
+          fi
+      - name: build zip packages
+        run: make emqx-zip
+      - name: build deb/rpm packages
+        run: make emqx-pkg
+#      - name: pakcages test
+#        run: |
+#          export CODE_PATH=$GITHUB_WORKSPACE
+#          .ci/build_packages/tests.sh
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.os }}
+          path: _packages/**/*.zip
   mac:
     runs-on: macos-10.15
 
     strategy:
       matrix:
         erl_otp:
-        - 23.2.7.2
+          - 23.2.7.2
 
     steps:
-    - uses: actions/checkout@v1
-    - name: prepare
-      run: |
-        if make emqx-ee --dry-run > /dev/null 2>&1; then
-          echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
-          git config --global credential.helper store
-          echo "${{ secrets.CI_GIT_TOKEN }}" >> ./scripts/git-token
-          echo "EMQX_NAME=emqx-ee" >> $GITHUB_ENV
-        else
-          echo "EMQX_NAME=emqx" >> $GITHUB_ENV
-        fi
-    - name: prepare
-      run: |
-        brew update
-        brew install curl zip unzip gnu-sed kerl unixodbc freetds
-        echo "/usr/local/bin" >> $GITHUB_PATH
-        git config --global credential.helper store
-    - uses: actions/cache@v2
-      id: cache
-      with:
-        path: ~/.kerl
-        key: erl${{ matrix.erl_otp }}-macos10.15
-    - name: build erlang
-      if: steps.cache.outputs.cache-hit != 'true'
-      timeout-minutes: 60
-      run: |
-        kerl build ${{ matrix.erl_otp }}
-        kerl install ${{ matrix.erl_otp }} $HOME/.kerl/${{ matrix.erl_otp }}
-    - name: build
-      run: |
-        . $HOME/.kerl/${{ matrix.erl_otp }}/activate
-        make ${EMQX_NAME}-zip
-    - name: test
-      run: |
-        pkg_name=$(basename _packages/${EMQX_NAME}/emqx-*.zip)
-        unzip -q _packages/${EMQX_NAME}/$pkg_name
-        gsed -i '/emqx_telemetry/d' ./emqx/data/loaded_plugins
-        ./emqx/bin/emqx start || cat emqx/log/erlang.log.1
-        ready='no'
-        for i in {1..10}; do
-          if curl -fs 127.0.0.1:18083 > /dev/null; then
-            ready='yes'
-            break
+      - uses: actions/checkout@v1
+      - name: prepare
+        run: |
+          if make emqx-ee --dry-run > /dev/null 2>&1; then
+            echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
+            git config --global credential.helper store
+            echo "${{ secrets.CI_GIT_TOKEN }}" >> ./scripts/git-token
+            echo "EMQX_NAME=emqx-ee" >> $GITHUB_ENV
+          else
+            echo "EMQX_NAME=emqx" >> $GITHUB_ENV
           fi
-          sleep 1
-        done
-        if [ "$ready" != "yes" ]; then
-          echo "Timed out waiting for emqx to be ready"
-          cat emqx/log/erlang.log.1
-          exit 1
-        fi
-        ./emqx/bin/emqx_ctl status
-        ./emqx/bin/emqx stop
-        rm -rf emqx
-    - uses: actions/upload-artifact@v2
-      with:
-        name: macos
-        path: _packages/**/*.zip
+      - name: prepare
+        run: |
+          brew update
+          brew install curl zip unzip gnu-sed kerl unixodbc freetds
+          echo "/usr/local/bin" >> $GITHUB_PATH
+          git config --global credential.helper store
+      - uses: actions/cache@v2
+        id: cache
+        with:
+          path: ~/.kerl
+          key: erl${{ matrix.erl_otp }}-macos10.15
+      - name: build erlang
+        if: steps.cache.outputs.cache-hit != 'true'
+        timeout-minutes: 60
+        run: |
+          kerl build ${{ matrix.erl_otp }}
+          kerl install ${{ matrix.erl_otp }} $HOME/.kerl/${{ matrix.erl_otp }}
+      - name: build
+        run: |
+          . $HOME/.kerl/${{ matrix.erl_otp }}/activate
+          make emqx-zip
+      - name: test
+        run: |
+          pkg_name=$(basename _packages/emqx/emqx-*.zip)
+          unzip -q _packages/emqx/$pkg_name
+          gsed -i '/emqx_telemetry/d' ./emqx/data/loaded_plugins
+          ./emqx/bin/emqx start || cat emqx/log/erlang.log.1
+          ready='no'
+          for i in {1..10}; do
+            if curl -fs 127.0.0.1:18083 > /dev/null; then
+              ready='yes'
+              break
+            fi
+            sleep 1
+          done
+          if [ "$ready" != "yes" ]; then
+            echo "Timed out waiting for emqx to be ready"
+            cat emqx/log/erlang.log.1
+            exit 1
+          fi
+          ./emqx/bin/emqx_ctl status
+          ./emqx/bin/emqx stop
+          rm -rf emqx
+      - uses: actions/upload-artifact@v2
+        with:
+          name: macos
+          path: _packages/**/*.zip

.github/workflows/elvis_lint.yaml

@@ -10,7 +10,7 @@ jobs:
       - name: Set git token
         if: endsWith(github.repository, 'enterprise')
         run: |
-          echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
+          echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
           git config --global credential.helper store
       - run: |
           ./scripts/elvis-check.sh $GITHUB_BASE_REF

.github/workflows/git_sync.yaml

@@ -1,42 +0,0 @@
-name: Sync to enterprise
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  sync_to_enterprise:
-    runs-on: ubuntu-20.04
-    if: github.repository == 'emqx/emqx'
-    steps:
-      - name: git-sync
-        uses: Rory-Z/git-sync@v3.0.1
-        with:
-          source_repo: ${{ github.repository }}
-          source_branch: ${{ github.ref }}
-          destination_repo: "${{ github.repository_owner }}/emqx-enterprise"
-          destination_branch: ${{ github.ref }}
-          destination_ssh_private_key: "${{ secrets.CI_SSH_PRIVATE_KEY }}"
-      - name: create pull request
-        id: create_pull_request
-        run: |
-          set -euo pipefail
-          R=$(curl --silent --show-error \
-            -H "Accept: application/vnd.github.v3+json" \
-            -H "Authorization: token ${{ secrets.CI_GIT_TOKEN }}" \
-            -X POST \
-            -d '{"title": "Sync code into enterprise from opensource", "head": "master", "base":"enterprise"}' \
-            https://api.hub.fastgit.org/repos/${{ github.repository_owner }}/emqx-enterprise/pulls)
-          echo $R | jq
-          echo "::set-output name=url::$(echo $R | jq '.url')"
-      - name: request reviewers for a pull request
-        if: steps.create_pull_request.outputs.url != 'null'
-        run: |
-          set -euo pipefail
-          curl --silent --show-error \
-          -H "Accept: application/vnd.github.v3+json" \
-          -H "Authorization: token ${{ secrets.CI_GIT_TOKEN }}" \
-          -X POST \
-          -d '{"team_reviewers":["emqx-devs"]}' \
-          ${{ steps.create_pull_request.outputs.url }}/requested_reviewers

.github/workflows/run_cts_tests.yaml

@@ -44,7 +44,7 @@ jobs:
       - name: set git token
         run: |
           if make emqx-ee --dry-run > /dev/null 2>&1; then
-            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org\" > /root/.git-credentials && git config --global credential.helper store"
+            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com\" > /root/.git-credentials && git config --global credential.helper store"
           fi
       - name: run test cases
         run: |
@@ -113,7 +113,7 @@ jobs:
       - name: set git token
         run: |
           if make emqx-ee --dry-run > /dev/null 2>&1; then
-            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org\" > /root/.git-credentials && git config --global credential.helper store"
+            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com\" > /root/.git-credentials && git config --global credential.helper store"
           fi
       - name: run test cases
         run: |
@@ -195,7 +195,7 @@ jobs:
       - name: set git token
         run: |
           if make emqx-ee --dry-run > /dev/null 2>&1; then
-            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org\" > /root/.git-credentials && git config --global credential.helper store"
+            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com\" > /root/.git-credentials && git config --global credential.helper store"
           fi
       - name: run test cases
         run: |
@@ -266,7 +266,7 @@ jobs:
       - name: set git token
         run: |
           if make emqx-ee --dry-run > /dev/null 2>&1; then
-            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org\" > /root/.git-credentials && git config --global credential.helper store"
+            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com\" > /root/.git-credentials && git config --global credential.helper store"
           fi
       - name: run test cases
         run: |
@@ -389,7 +389,7 @@ jobs:
       - name: set git token
         run: |
           if make emqx-ee --dry-run > /dev/null 2>&1; then
-            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org\" > /root/.git-credentials && git config --global credential.helper store"
+            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com\" > /root/.git-credentials && git config --global credential.helper store"
           fi
       - name: run test cases
         run: |

.github/workflows/run_fvt_tests.yaml

@@ -19,7 +19,7 @@ jobs:
         - name: prepare
           run: |
             if make emqx-ee --dry-run > /dev/null 2>&1; then
-              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
+              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
               git config --global credential.helper store
               echo "${{ secrets.CI_GIT_TOKEN }}" >> scripts/git-token
               make deps-emqx-ee
@@ -69,7 +69,7 @@ jobs:
         - name: prepare
           run: |
             if make emqx-ee --dry-run > /dev/null 2>&1; then
-              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
+              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
               git config --global credential.helper store
               echo "${{ secrets.CI_GIT_TOKEN }}" >> scripts/git-token
               make deps-emqx-ee
@@ -196,7 +196,7 @@ jobs:
         - name: prepare
           run: |
             if make -C emqx emqx-ee --dry-run > /dev/null 2>&1; then
-              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
+              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
               git config --global credential.helper store
               echo "${{ secrets.CI_GIT_TOKEN }}" >> emqx/scripts/git-token
               echo "PROFILE=emqx-ee" >> $GITHUB_ENV

.github/workflows/run_test_cases.yaml

@@ -20,7 +20,7 @@ jobs:
         - name: set git credentials
           run: |
             if make emqx-ee --dry-run > /dev/null 2>&1; then
-              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
+              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
               git config --global credential.helper store
             fi
         - name: xref
@@ -37,7 +37,7 @@ jobs:
         - name: set git credentials
           run: |
             if make emqx-ee --dry-run > /dev/null 2>&1; then
-              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org" > $HOME/.git-credentials
+              echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
               git config --global credential.helper store
             fi
         - name: proper
@@ -112,7 +112,7 @@ jobs:
                 -f .ci/docker-compose-file/docker-compose-enterprise-mysql-client.yaml \
                 -f .ci/docker-compose-file/docker-compose-enterprise-pgsql-and-timescale-client.yaml \
                 up -d --build
-            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@hub.fastgit.org\" > /root/.git-credentials && git config --global credential.helper store"
+            docker exec -i erlang bash -c "echo \"https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com\" > /root/.git-credentials && git config --global credential.helper store"
             while [ $(docker ps -a --filter name=client --filter exited=0 | wc -l) \
                  != $(docker ps -a --filter name=client | wc -l) ]; do
               sleep 5

scripts/apps-version-check.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+set -euo pipefail
+
+remote="refs/remote/$(git remote -v | grep fetch | grep 'dgiot/dgiot' | awk '{print $1}')"
+latest_release=$(git describe --tags "$(git rev-list --tags --max-count=1 --remotes="$remote")")
+
+bad_app_count=0
+
+while read -r app; do
+    if [ "$app" != "dgiot" ]; then
+        app_path="$app"
+    else
+        app_path="."
+    fi
+    src_file="$app_path/src/$(basename "$app").app.src"
+    old_app_version="$(git show "$latest_release":"$src_file" | grep vsn | grep -oE '"[0-9]+.[0-9]+.[0-9]+"' | tr -d '"')"
+    now_app_version=$(grep -E 'vsn' "$src_file" | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
+    if [ "$old_app_version" = "$now_app_version" ]; then
+        changed="$(git diff --name-only "$latest_release"...HEAD \
+                    -- "$app_path/src" \
+                    -- "$app_path/priv" \
+                    -- "$app_path/c_src" | wc -l)"
+        if [ "$changed" -gt 0 ]; then
+            echo "$src_file needs a vsn bump"
+            bad_app_count=$(( bad_app_count + 1))
+        fi
+    fi
+done < <(./scripts/find-apps.sh)
+
+if [ $bad_app_count -gt 0 ]; then
+    exit 1
+else
+    echo "apps version check successfully"
+fi

scripts/find-apps.sh

@@ -11,7 +11,7 @@ find_app() {
 }
 
 # append emqx application first
-echo 'emqx'
+echo 'dgiot'
 
 find_app 'apps'
 if [ -f 'EMQX_ENTERPRISE' ]; then