opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-08-07 07:14:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SMQ-2706 - Add domain id to message topic (#2765)

Browse Source 
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
This commit is contained in:
Felix Gateru
2025-04-11 10:11:39 +03:00
committed by GitHub
parent 299cee7771
commit 6151be72ce
36 changed files with 316 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/message.go
+3 -3
View File
@@ -7,16 +7,16 @@ import "github.com/spf13/cobra"
var cmdMessages = []cobra.Command{
{
Use: "send <channel_id.subtopic> <JSON_string> <client_secret>",
Use: "send <channel_id.subtopic> <JSON_string> <domain_id> <client_secret>",
Short: "Send messages",
Long: `Sends message on the channel`,
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
if len(args) != 4 {
logUsageCmd(*cmd, cmd.Use)
return
}
if err := sdk.SendMessage(cmd.Context(), args[0], args[1], args[2]); err != nil {
if err := sdk.SendMessage(cmd.Context(), args[0], args[1], args[2], args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
cli/message_test.go
+4 -1
View File
@@ -37,6 +37,7 @@ func TestSendMesageCmd(t *testing.T) {
args: []string{
channel.ID,
message,
domainID,
client.Credentials.Secret,
},
logType: okLog,
@@ -47,6 +48,7 @@ func TestSendMesageCmd(t *testing.T) {
channel.ID,
message,
client.Credentials.Secret,
domainID,
extraArg,
},
logType: usageLog,
@@ -56,6 +58,7 @@ func TestSendMesageCmd(t *testing.T) {
args: []string{
channel.ID,
message,
domainID,
"invalid_secret",
},
sdkErr: errors.NewSDKErrorWithStatus(errors.Wrap(svcerr.ErrAuthentication, errors.Wrap(svcerr.ErrAuthorization, svcerr.ErrNotFound)), http.StatusBadRequest),
@@ -66,7 +69,7 @@ func TestSendMesageCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("SendMessage", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
sdkCall := sdkMock.On("SendMessage", mock.Anything, tc.args[0], tc.args[1], tc.args[2], tc.args[3]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{sendCmd}, tc.args...)...)
switch tc.logType {