Merge pull request #12458 from id/0202-sync-release-55

sync release-55

.github/workflows/_push-entrypoint.yaml

@@ -107,7 +107,8 @@ jobs:
       version: ${{ needs.prepare.outputs.version }}
       publish: ${{ needs.prepare.outputs.release }}
       latest: ${{ needs.prepare.outputs.latest }}
-      otp_vsn: ${{ needs.prepare.outputs.otp_vsn }}
+      # TODO: revert this back to needs.prepare.outputs.otp_vsn when OTP 26 bug is fixed
+      otp_vsn: 25.3.2-2
       elixir_vsn: ${{ needs.prepare.outputs.elixir_vsn }}
       builder_vsn: ${{ needs.prepare.outputs.builder_vsn }}
     secrets: inherit

.github/workflows/build_and_push_docker_images.yaml

@@ -58,7 +58,7 @@ on:
       otp_vsn:
         required: false
         type: string
-        default: '26.2.1-2'
+        default: '25.3.2-2'
       elixir_vsn:
         required: false
         type: string
@@ -127,8 +127,8 @@ jobs:
         EMQX_RUNNER: 'debian:11-slim'
         EMQX_DOCKERFILE: 'deploy/docker/Dockerfile'
         PKG_VSN: ${{ inputs.version }}
-        EMQX_BUILDER_VSN: ${{ inputs.builder_vsn }}
-        EMQX_OTP_VSN: ${{ inputs.otp_vsn }}
-        EMQX_ELIXIR_VSN: ${{ inputs.elixir_vsn }}
+        EMQX_BUILDER_VERSION: ${{ inputs.builder_vsn }}
+        EMQX_BUILDER_OTP: ${{ inputs.otp_vsn }}
+        EMQX_BUILDER_ELIXIR: ${{ inputs.elixir_vsn }}
       run: |
         ./build ${PROFILE} docker

.github/workflows/build_packages.yaml

@@ -95,13 +95,12 @@ jobs:
         apple_developer_identity: ${{ secrets.APPLE_DEVELOPER_IDENTITY }}
         apple_developer_id_bundle: ${{ secrets.APPLE_DEVELOPER_ID_BUNDLE }}
         apple_developer_id_bundle_password: ${{ secrets.APPLE_DEVELOPER_ID_BUNDLE_PASSWORD }}
-    - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
+    - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
       if: success()
       with:
-        name: ${{ matrix.profile }}-${{ matrix.otp }}-${{ matrix.os }}
+        name: ${{ matrix.profile }}
         path: _packages/${{ matrix.profile }}/
         retention-days: 7
-        compression-level: 0
 
   linux:
     runs-on: [self-hosted, ephemeral, linux, "${{ matrix.arch }}"]
@@ -139,7 +138,7 @@ jobs:
         with_elixir:
           - 'no'
         include:
-          - profile: emqx
+          - profile: ${{ inputs.profile }}
             otp: ${{ inputs.otp_vsn }}
             arch: x64
             os: ubuntu22.04
@@ -195,7 +194,7 @@ jobs:
         fi
     - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
       with:
-        name: ${{ matrix.profile }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ matrix.os }}-${{ matrix.with_elixir == 'yes' && 'elixir' || 'erlang' }}
+        name: ${{ matrix.profile }}
         path: _packages/${{ matrix.profile }}/
         retention-days: 7
 
@@ -211,9 +210,9 @@ jobs:
         profile:
           - ${{ inputs.profile }}
     steps:
-    - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
+    - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
       with:
-        pattern: ${{ matrix.profile }}-*
+        name: ${{ matrix.profile }}
         path: packages/${{ matrix.profile }}
     - name: install dos2unix
       run: sudo apt-get update -y && sudo apt install -y dos2unix
@@ -235,6 +234,9 @@ jobs:
     - name: upload to aws s3
       env:
         PROFILE: ${{ matrix.profile }}
+        REF_NAME: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.ref || github.ref_name }}
+        AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
+        AWS_CLOUDFRONT_ID: ${{ secrets.AWS_CLOUDFRONT_ID }}
       run: |
         set -eu
         if [ $PROFILE = 'emqx' ]; then
@@ -245,5 +247,5 @@ jobs:
             echo "unknown profile $PROFILE"
             exit 1
         fi
-        aws s3 cp --recursive packages/$PROFILE s3://${{ secrets.AWS_S3_BUCKET }}/$s3dir/${{ github.ref_name }}
-        aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_CLOUDFRONT_ID }} --paths "/$s3dir/${{ github.ref_name }}/*"
+        aws s3 cp --recursive packages/$PROFILE s3://$AWS_S3_BUCKET/$s3dir/$REF_NAME
+        aws cloudfront create-invalidation --distribution-id "$AWS_CLOUDFRONT_ID" --paths "/$s3dir/$REF_NAME/*"

.github/workflows/scorecard.yaml

@@ -10,7 +10,6 @@ on:
   push:
     branches:
       - master
-      - 'release-5[0-9]'
   workflow_dispatch:
 
 permissions: read-all

Makefile

@@ -20,8 +20,8 @@ endif
 
 # Dashboard version
 # from https://github.com/emqx/emqx-dashboard5
-export EMQX_DASHBOARD_VERSION ?= v1.6.1
-export EMQX_EE_DASHBOARD_VERSION ?= e1.5.0-beta.10
+export EMQX_DASHBOARD_VERSION ?= v1.7.0
+export EMQX_EE_DASHBOARD_VERSION ?= e1.5.0
 
 PROFILE ?= emqx
 REL_PROFILES := emqx emqx-enterprise

apps/emqx/include/emqx_release.hrl

@@ -35,7 +35,7 @@
 -define(EMQX_RELEASE_CE, "5.5.0").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.5.0-alpha.1").
+-define(EMQX_RELEASE_EE, "5.5.0").
 
 %% The HTTP API version
 -define(EMQX_API_VERSION, "5.0").

apps/emqx_auth/src/emqx_authn/emqx_authn_user_import_api.erl

@@ -126,7 +126,7 @@ authenticator_import_users(
     PasswordType = password_type(Req),
     Result =
         case maps:get(<<"content-type">>, Headers, undefined) of
-            <<"application/json">> ->
+            <<"application/json", _/binary>> ->
                 emqx_authn_chains:import_users(
                     ?GLOBAL, AuthenticatorID, {PasswordType, prepared_user_list, Body}
                 );
@@ -172,7 +172,7 @@ listener_authenticator_import_users(
         )
     end,
     case maps:get(<<"content-type">>, Headers, undefined) of
-        <<"application/json">> ->
+        <<"application/json", _/binary>> ->
             DoImport(prepared_user_list, Body);
         _ ->
             case Body of

apps/emqx_auth_mnesia/test/emqx_authn_api_mnesia_SUITE.erl

@@ -342,6 +342,9 @@ test_authenticator_import_users(PathPrefix) ->
     {ok, 204, _} = request(post, ImportUri ++ "?type=hash", emqx_utils_json:decode(JSONData)),
     {ok, JSONData1} = file:read_file(filename:join([Dir, <<"data/user-credentials-plain.json">>])),
     {ok, 204, _} = request(post, ImportUri ++ "?type=plain", emqx_utils_json:decode(JSONData1)),
+
+    %% test application/json; charset=utf-8
+    {ok, 204, _} = request_with_charset(post, ImportUri ++ "?type=plain", JSONData1),
     ok.
 
 %%------------------------------------------------------------------------------
@@ -350,3 +353,9 @@ test_authenticator_import_users(PathPrefix) ->
 
 request(Method, Url) ->
     request(Method, Url, []).
+
+request_with_charset(Method, Url, Body) ->
+    Headers = [emqx_mgmt_api_test_util:auth_header_()],
+    Opts = #{compatible_mode => true, httpc_req_opts => [{body_format, binary}]},
+    Request = {Url, Headers, "application/json; charset=utf-8", Body},
+    emqx_mgmt_api_test_util:do_request_api(Method, Request, Opts).

build

@@ -389,7 +389,7 @@ docker_cleanup() {
 make_docker() {
     local EMQX_BUILDER_VERSION="${EMQX_BUILDER_VERSION:-5.3-2}"
     local EMQX_BUILDER_PLATFORM="${EMQX_BUILDER_PLATFORM:-debian11}"
-    local EMQX_BUILDER_OTP="${EMQX_BUILDER_OTP:-26.2.1-2}"
+    local EMQX_BUILDER_OTP="${EMQX_BUILDER_OTP:-25.3.2-2}"
     local EMQX_BUILDER_ELIXIR="${EMQX_BUILDER_ELIXIR:-1.15.7}"
     local EMQX_BUILDER=${EMQX_BUILDER:-ghcr.io/emqx/emqx-builder/${EMQX_BUILDER_VERSION}:${EMQX_BUILDER_ELIXIR}-${EMQX_BUILDER_OTP}-${EMQX_BUILDER_PLATFORM}}
     local EMQX_RUNNER="${EMQX_RUNNER:-${EMQX_DEFAULT_RUNNER}}"

deploy/charts/emqx-enterprise/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 5.5.0-alpha.1
+version: 5.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 5.5.0-alpha.1
+appVersion: 5.5.0

scripts/rel/cut.sh

@@ -233,7 +233,7 @@ check_bpapi() {
     case "$TAG" in
         *.0)
             fname="$(echo "$TAG" | sed 's/^e//; s/\.0$//')"
-            fpath="apps/emqx/test/emqx_static_checks_data/${fname}.bpapi"
+            fpath="apps/emqx/test/emqx_static_checks_data/${fname}.bpapi2"
             logmsg "Checking $fpath"
             if [ ! -f "$fpath" ]; then
                 logerr "BPAPI file missing: $fpath"