From 2bc5cb238f300933b006b4b3291bf2b22631025c Mon Sep 17 00:00:00 2001 From: Abhishek Kondur Date: Tue, 4 Apr 2023 15:43:06 +0400 Subject: [PATCH] change emqx apis to support v5.0.09 --- compose/docker-compose-emqx.yml | 2 +- compose/docker-compose.ee.yml | 2 +- mq/emqx.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compose/docker-compose-emqx.yml b/compose/docker-compose-emqx.yml index 59782d9a..8abaf900 100644 --- a/compose/docker-compose-emqx.yml +++ b/compose/docker-compose-emqx.yml @@ -65,7 +65,7 @@ services: - dnsconfig:/root/dnsconfig mq: container_name: mq - image: emqx/emqx:5.0.17 + image: emqx/emqx:5.0.09 restart: unless-stopped environment: EMQX_NAME: "emqx" diff --git a/compose/docker-compose.ee.yml b/compose/docker-compose.ee.yml index 0417633d..e96d1de1 100644 --- a/compose/docker-compose.ee.yml +++ b/compose/docker-compose.ee.yml @@ -68,7 +68,7 @@ services: - dnsconfig:/root/dnsconfig mq: container_name: mq - image: emqx/emqx:5.0.17 + image: emqx/emqx:5.0.09 restart: unless-stopped environment: EMQX_NAME: "emqx" diff --git a/mq/emqx.go b/mq/emqx.go index 84ea72c8..cd6eb2d6 100644 --- a/mq/emqx.go +++ b/mq/emqx.go @@ -205,7 +205,7 @@ func GetUserACL(username string) (*aclObject, error) { if err != nil { return nil, err } - req, err := http.NewRequest(http.MethodGet, servercfg.GetEmqxRestEndpoint()+"/api/v5/authorization/sources/built_in_database/rules/users/"+username, nil) + req, err := http.NewRequest(http.MethodGet, servercfg.GetEmqxRestEndpoint()+"/api/v5/authorization/sources/built_in_database/username/"+username, nil) if err != nil { return nil, err } @@ -241,7 +241,7 @@ func CreateDefaultDenyRule() error { if err != nil { return err } - req, err := http.NewRequest(http.MethodPost, servercfg.GetEmqxRestEndpoint()+"/api/v5/authorization/sources/built_in_database/rules/all", bytes.NewReader(payload)) + req, err := http.NewRequest(http.MethodPost, servercfg.GetEmqxRestEndpoint()+"/api/v5/authorization/sources/built_in_database/all", bytes.NewReader(payload)) if err != nil { return err } @@ -301,7 +301,7 @@ func CreateHostACL(hostID, serverName string) error { if err != nil { return err } - req, err := http.NewRequest(http.MethodPut, servercfg.GetEmqxRestEndpoint()+"/api/v5/authorization/sources/built_in_database/rules/users/"+hostID, bytes.NewReader(payload)) + req, err := http.NewRequest(http.MethodPut, servercfg.GetEmqxRestEndpoint()+"/api/v5/authorization/sources/built_in_database/username/"+hostID, bytes.NewReader(payload)) if err != nil { return err } @@ -369,7 +369,7 @@ func AppendNodeUpdateACL(hostID, nodeNetwork, nodeID, serverName string) error { if err != nil { return err } - req, err := http.NewRequest(http.MethodPut, servercfg.GetEmqxRestEndpoint()+"/api/v5/authorization/sources/built_in_database/rules/users/"+hostID, bytes.NewReader(payload)) + req, err := http.NewRequest(http.MethodPut, servercfg.GetEmqxRestEndpoint()+"/api/v5/authorization/sources/built_in_database/username/"+hostID, bytes.NewReader(payload)) if err != nil { return err }