opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-06-23 04:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SMQ-2533 - Rename Magistrala to SuperMQ (#2560)

Browse Source 
Signed-off-by: Dusan Borovcanin <borovcanindusan1@gmail.com>
This commit is contained in:
Dušan Borovčanin
2024-12-04 11:17:09 +01:00
committed by GitHub
parent 10bc218dee
commit 178aa46ad4
748 changed files with 7502 additions and 7507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/README.md
+51 -51
View File
@@ -1,4 +1,4 @@
# Magistrala CLI
# SuperMQ CLI
## Build
@@ -12,10 +12,10 @@ make cli
### Service
#### Get Magistrala Services Health Check
#### Get SuperMQ Services Health Check
```bash
magistrala-cli health <service>
supermq-cli health <service>
```
### Users management
@@ -23,51 +23,51 @@ magistrala-cli health <service>
#### Create User
```bash
magistrala-cli users create <user_name> <user_email> <user_password>
supermq-cli users create <user_name> <user_email> <user_password>
magistrala-cli users create <user_name> <user_email> <user_password> <user_token>
supermq-cli users create <user_name> <user_email> <user_password> <user_token>
```
#### Login User
```bash
magistrala-cli users token <user_email> <user_password>
supermq-cli users token <user_email> <user_password>
```
#### Get User
```bash
magistrala-cli users get <user_id> <user_token>
supermq-cli users get <user_id> <user_token>
```
#### Get Users
```bash
magistrala-cli users get all <user_token>
supermq-cli users get all <user_token>
```
#### Update User Metadata
```bash
magistrala-cli users update <user_id> '{"name":"value1", "metadata":{"value2": "value3"}}' <user_token>
supermq-cli users update <user_id> '{"name":"value1", "metadata":{"value2": "value3"}}' <user_token>
```
#### Update User Password
```bash
magistrala-cli users password <old_password> <password> <user_token>
supermq-cli users password <old_password> <password> <user_token>
```
#### Enable User
```bash
magistrala-cli users enable <user_id> <user_token>
supermq-cli users enable <user_id> <user_token>
```
#### Disable User
```bash
magistrala-cli users disable <user_id> <user_token>
supermq-cli users disable <user_id> <user_token>
```
### System Provisioning
@@ -75,19 +75,19 @@ magistrala-cli users disable <user_id> <user_token>
#### Create Client
```bash
magistrala-cli clients create '{"name":"myClient"}' <user_token>
supermq-cli clients create '{"name":"myClient"}' <user_token>
```
#### Create Client with metadata
```bash
magistrala-cli clients create '{"name":"myClient", "metadata": {"key1":"value1"}}' <user_token>
supermq-cli clients create '{"name":"myClient", "metadata": {"key1":"value1"}}' <user_token>
```
#### Bulk Provision Clients
```bash
magistrala-cli provision clients <file> <user_token>
supermq-cli provision clients <file> <user_token>
```
- `file` - A CSV or JSON file containing client names (must have extension `.csv` or `.json`)
@@ -131,55 +131,55 @@ With JSON you can be able to specify more fields of the channels you want to cre
#### Update Client
```bash
magistrala-cli clients update <client_id> '{"name":"value1", "metadata":{"key1": "value2"}}' <user_token>
supermq-cli clients update <client_id> '{"name":"value1", "metadata":{"key1": "value2"}}' <user_token>
```
#### Identify Client
```bash
magistrala-cli clients identify <client_key>
supermq-cli clients identify <client_key>
```
#### Enable Client
```bash
magistrala-cli clients enable <client_id> <user_token>
supermq-cli clients enable <client_id> <user_token>
```
#### Disable Client
```bash
magistrala-cli clients disable <client_id> <user_token>
supermq-cli clients disable <client_id> <user_token>
```
#### Get Client
```bash
magistrala-cli clients get <client_id> <user_token>
supermq-cli clients get <client_id> <user_token>
```
#### Get Clients
```bash
magistrala-cli clients get all <user_token>
supermq-cli clients get all <user_token>
```
#### Get a subset list of provisioned Clients
```bash
magistrala-cli clients get all --offset=1 --limit=5 <user_token>
supermq-cli clients get all --offset=1 --limit=5 <user_token>
```
#### Create Channel
```bash
magistrala-cli channels create '{"name":"myChannel"}' <user_token>
supermq-cli channels create '{"name":"myChannel"}' <user_token>
```
#### Bulk Provision Channels
```bash
magistrala-cli provision channels <file> <user_token>
supermq-cli provision channels <file> <user_token>
```
- `file` - A CSV or JSON file containing channel names (must have extension `.csv` or `.json`)
@@ -222,37 +222,37 @@ With JSON you can be able to specify more fields of the channels you want to cre
#### Update Channel
```bash
magistrala-cli channels update '{"id":"<channel_id>","name":"myNewName"}' <user_token>
supermq-cli channels update '{"id":"<channel_id>","name":"myNewName"}' <user_token>
```
#### Enable Channel
```bash
magistrala-cli channels enable <channel_id> <user_token>
supermq-cli channels enable <channel_id> <user_token>
```
#### Disable Channel
```bash
magistrala-cli channels disable <channel_id> <user_token>
supermq-cli channels disable <channel_id> <user_token>
```
#### Get Channel
```bash
magistrala-cli channels get <channel_id> <user_token>
supermq-cli channels get <channel_id> <user_token>
```
#### Get Channels
```bash
magistrala-cli channels get all <user_token>
supermq-cli channels get all <user_token>
```
#### Get a subset list of provisioned Channels
```bash
magistrala-cli channels get all --offset=1 --limit=5 <user_token>
supermq-cli channels get all --offset=1 --limit=5 <user_token>
```
### Access control
@@ -260,13 +260,13 @@ magistrala-cli channels get all --offset=1 --limit=5 <user_token>
#### Connect Client to Channel
```bash
magistrala-cli clients connect <client_id> <channel_id> <user_token>
supermq-cli clients connect <client_id> <channel_id> <user_token>
```
#### Bulk Connect Clients to Channels
```bash
magistrala-cli provision connect <file> <user_token>
supermq-cli provision connect <file> <user_token>
```
- `file` - A CSV or JSON file containing client and channel ids (must have extension `.csv` or `.json`)
@@ -293,19 +293,19 @@ A comparable JSON file would be
#### Disconnect Client from Channel
```bash
magistrala-cli clients disconnect <client_id> <channel_id> <user_token>
supermq-cli clients disconnect <client_id> <channel_id> <user_token>
```
#### Get a subset list of Channels connected to Client
```bash
magistrala-cli clients connections <client_id> <user_token>
supermq-cli clients connections <client_id> <user_token>
```
#### Get a subset list of Clients connected to Channel
```bash
magistrala-cli channels connections <channel_id> <user_token>
supermq-cli channels connections <channel_id> <user_token>
```
### Messaging
@@ -313,13 +313,13 @@ magistrala-cli channels connections <channel_id> <user_token>
#### Send a message over HTTP
```bash
magistrala-cli messages send <channel_id> '[{"bn":"Dev1","n":"temp","v":20}, {"n":"hum","v":40}, {"bn":"Dev2", "n":"temp","v":20}, {"n":"hum","v":40}]' <client_secret>
supermq-cli messages send <channel_id> '[{"bn":"Dev1","n":"temp","v":20}, {"n":"hum","v":40}, {"bn":"Dev2", "n":"temp","v":20}, {"n":"hum","v":40}]' <client_secret>
```
#### Read messages over HTTP
```bash
magistrala-cli messages read <channel_id> <user_token> -R <reader_url>
supermq-cli messages read <channel_id> <user_token> -R <reader_url>
```
### Bootstrap
@@ -327,31 +327,31 @@ magistrala-cli messages read <channel_id> <user_token> -R <reader_url>
#### Add configuration
```bash
magistrala-cli bootstrap create '{"external_id": "myExtID", "external_key": "myExtKey", "name": "myName", "content": "myContent"}' <user_token> -b <bootstrap-url>
supermq-cli bootstrap create '{"external_id": "myExtID", "external_key": "myExtKey", "name": "myName", "content": "myContent"}' <user_token> -b <bootstrap-url>
```
#### View configuration
```bash
magistrala-cli bootstrap get <client_id> <user_token> -b <bootstrap-url>
supermq-cli bootstrap get <client_id> <user_token> -b <bootstrap-url>
```
#### Update configuration
```bash
magistrala-cli bootstrap update '{"client_id":"<client_id>", "name": "newName", "content": "newContent"}' <user_token> -b <bootstrap-url>
supermq-cli bootstrap update '{"client_id":"<client_id>", "name": "newName", "content": "newContent"}' <user_token> -b <bootstrap-url>
```
#### Remove configuration
```bash
magistrala-cli bootstrap remove <client_id> <user_token> -b <bootstrap-url>
supermq-cli bootstrap remove <client_id> <user_token> -b <bootstrap-url>
```
#### Bootstrap configuration
```bash
magistrala-cli bootstrap bootstrap <external_id> <external_key> -b <bootstrap-url>
supermq-cli bootstrap bootstrap <external_id> <external_key> -b <bootstrap-url>
```
### Groups
@@ -359,53 +359,53 @@ magistrala-cli bootstrap bootstrap <external_id> <external_key> -b <bootstrap-ur
#### Create Group
```bash
magistrala-cli groups create '{"name":"<group_name>","description":"<description>","parentID":"<parent_id>","metadata":"<metadata>"}' <user_token>
supermq-cli groups create '{"name":"<group_name>","description":"<description>","parentID":"<parent_id>","metadata":"<metadata>"}' <user_token>
```
#### Get Group
```bash
magistrala-cli groups get <group_id> <user_token>
supermq-cli groups get <group_id> <user_token>
```
#### Get Groups
```bash
magistrala-cli groups get all <user_token>
supermq-cli groups get all <user_token>
```
#### Get Group Members
```bash
magistrala-cli groups members <group_id> <user_token>
supermq-cli groups members <group_id> <user_token>
```
#### Get Memberships
```bash
magistrala-cli groups membership <member_id> <user_token>
supermq-cli groups membership <member_id> <user_token>
```
#### Assign Members to Group
```bash
magistrala-cli groups assign <member_ids> <member_type> <group_id> <user_token>
supermq-cli groups assign <member_ids> <member_type> <group_id> <user_token>
```
#### Unassign Members to Group
```bash
magistrala-cli groups unassign <member_ids> <group_id> <user_token>
supermq-cli groups unassign <member_ids> <group_id> <user_token>
```
#### Enable Group
```bash
magistrala-cli groups enable <group_id> <user_token>
supermq-cli groups enable <group_id> <user_token>
```
#### Disable Group
```bash
magistrala-cli groups disable <group_id> <user_token>
supermq-cli groups disable <group_id> <user_token>
```
cli/bootstrap.go
+5 -5
View File
@@ -6,7 +6,7 @@ package cli
import (
"encoding/json"
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -21,7 +21,7 @@ var cmdBootstrap = []cobra.Command{
return
}
var cfg mgxsdk.BootstrapConfig
var cfg smqsdk.BootstrapConfig
if err := json.Unmarshal([]byte(args[0]), &cfg); err != nil {
logErrorCmd(*cmd, err)
return
@@ -47,7 +47,7 @@ var cmdBootstrap = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
State: State,
@@ -86,7 +86,7 @@ var cmdBootstrap = []cobra.Command{
return
}
if args[0] == "config" {
var cfg mgxsdk.BootstrapConfig
var cfg smqsdk.BootstrapConfig
if err := json.Unmarshal([]byte(args[1]), &cfg); err != nil {
logErrorCmd(*cmd, err)
return
@@ -184,7 +184,7 @@ var cmdBootstrap = []cobra.Command{
return
}
var cfg mgxsdk.BootstrapConfig
var cfg smqsdk.BootstrapConfig
if err := json.Unmarshal([]byte(args[0]), &cfg); err != nil {
logErrorCmd(*cmd, err)
return
cli/bootstrap_test.go
+5 -5
View File
@@ -10,11 +10,11 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/certs_test.go
+5 -5
View File
@@ -11,11 +11,11 @@ import (
"testing"
"time"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/channels.go
+18 -18
View File
@@ -6,7 +6,7 @@ package cli
import (
"encoding/json"
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -23,7 +23,7 @@ var cmdChannels = []cobra.Command{
return
}
var channel mgxsdk.Channel
var channel smqsdk.Channel
if err := json.Unmarshal([]byte(args[0]), &channel); err != nil {
logErrorCmd(*cmd, err)
return
@@ -55,7 +55,7 @@ var cmdChannels = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Name: "",
Offset: Offset,
Limit: Limit,
@@ -86,7 +86,7 @@ var cmdChannels = []cobra.Command{
Short: "Delete channel",
Long: "Delete channel by id.\n" +
"Usage:\n" +
"\tmagistrala-cli channels delete <channel_id> $DOMAINID $USERTOKEN - delete the given channel ID\n",
"\tsupermq-cli channels delete <channel_id> $DOMAINID $USERTOKEN - delete the given channel ID\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -109,7 +109,7 @@ var cmdChannels = []cobra.Command{
return
}
var channel mgxsdk.Channel
var channel smqsdk.Channel
if err := json.Unmarshal([]byte(args[1]), &channel); err != nil {
logErrorCmd(*cmd, err)
return
@@ -133,7 +133,7 @@ var cmdChannels = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -189,13 +189,13 @@ var cmdChannels = []cobra.Command{
Short: "List users",
Long: "List users of a channel\n" +
"Usage:\n" +
"\tmagistrala-cli channels users <channel_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli channels users <channel_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -213,13 +213,13 @@ var cmdChannels = []cobra.Command{
Short: "List groups",
Long: "List groups of a channel\n" +
"Usage:\n" +
"\tmagistrala-cli channels groups <channel_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli channels groups <channel_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -240,7 +240,7 @@ var channelAssignCmds = []cobra.Command{
Short: "Assign users",
Long: "Assign users to a channel\n" +
"Usage:\n" +
"\tmagistrala-cli channels assign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <channel_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli channels assign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <channel_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 5 {
logUsageCmd(*cmd, cmd.Use)
@@ -251,7 +251,7 @@ var channelAssignCmds = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.AddUserToChannel(args[2], mgxsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3], args[4]); err != nil {
if err := sdk.AddUserToChannel(args[2], smqsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -263,7 +263,7 @@ var channelAssignCmds = []cobra.Command{
Short: "Assign groups",
Long: "Assign groups to a channel\n" +
"Usage:\n" +
"\tmagistrala-cli channels assign groups '[\"<group_id_1>\", \"<group_id_2>\"]' <channel_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli channels assign groups '[\"<group_id_1>\", \"<group_id_2>\"]' <channel_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 4 {
@@ -275,7 +275,7 @@ var channelAssignCmds = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.AddUserGroupToChannel(args[1], mgxsdk.UserGroupsRequest{UserGroupIDs: groupIDs}, args[2], args[3]); err != nil {
if err := sdk.AddUserGroupToChannel(args[1], smqsdk.UserGroupsRequest{UserGroupIDs: groupIDs}, args[2], args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -290,7 +290,7 @@ var channelUnassignCmds = []cobra.Command{
Short: "Unassign groups",
Long: "Unassign groups from a channel\n" +
"Usage:\n" +
"\tmagistrala-cli channels unassign groups '[\"<group_id_1>\", \"<group_id_2>\"]' <channel_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli channels unassign groups '[\"<group_id_1>\", \"<group_id_2>\"]' <channel_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 4 {
logUsageCmd(*cmd, cmd.Use)
@@ -301,7 +301,7 @@ var channelUnassignCmds = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.RemoveUserGroupFromChannel(args[1], mgxsdk.UserGroupsRequest{UserGroupIDs: groupIDs}, args[2], args[3]); err != nil {
if err := sdk.RemoveUserGroupFromChannel(args[1], smqsdk.UserGroupsRequest{UserGroupIDs: groupIDs}, args[2], args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -314,7 +314,7 @@ var channelUnassignCmds = []cobra.Command{
Short: "Unassign users",
Long: "Unassign users from a channel\n" +
"Usage:\n" +
"\tmagistrala-cli channels unassign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <channel_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli channels unassign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <channel_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 5 {
logUsageCmd(*cmd, cmd.Use)
@@ -325,7 +325,7 @@ var channelUnassignCmds = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.RemoveUserFromChannel(args[2], mgxsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3], args[4]); err != nil {
if err := sdk.RemoveUserFromChannel(args[2], smqsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
cli/channels_test.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/internal/testsutil"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/internal/testsutil"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/clients.go
+27 -27
View File
@@ -6,8 +6,8 @@ package cli
import (
"encoding/json"
"github.com/absmach/magistrala/clients"
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
"github.com/absmach/supermq/clients"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -17,14 +17,14 @@ var cmdClients = []cobra.Command{
Short: "Create client",
Long: "Creates new client with provided name and metadata\n" +
"Usage:\n" +
"\tmagistrala-cli clients create '{\"name\":\"new client\", \"metadata\":{\"key\": \"value\"}}' $DOMAINID $USERTOKEN\n",
"\tsupermq-cli clients create '{\"name\":\"new client\", \"metadata\":{\"key\": \"value\"}}' $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
var client mgxsdk.Client
var client smqsdk.Client
if err := json.Unmarshal([]byte(args[0]), &client); err != nil {
logErrorCmd(*cmd, err)
return
@@ -44,9 +44,9 @@ var cmdClients = []cobra.Command{
Short: "Get clients",
Long: "Get all clients or get client by id. Clients can be filtered by name or metadata\n" +
"Usage:\n" +
"\tmagistrala-cli clients get all $DOMAINID $USERTOKEN - lists all clients\n" +
"\tmagistrala-cli clients get all $DOMAINID $USERTOKEN --offset=10 --limit=10 - lists all clients with offset and limit\n" +
"\tmagistrala-cli clients get <client_id> $DOMAINID $USERTOKEN - shows client with provided <client_id>\n",
"\tsupermq-cli clients get all $DOMAINID $USERTOKEN - lists all clients\n" +
"\tsupermq-cli clients get all $DOMAINID $USERTOKEN --offset=10 --limit=10 - lists all clients with offset and limit\n" +
"\tsupermq-cli clients get <client_id> $DOMAINID $USERTOKEN - shows client with provided <client_id>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -57,7 +57,7 @@ var cmdClients = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Name: Name,
Offset: Offset,
Limit: Limit,
@@ -86,7 +86,7 @@ var cmdClients = []cobra.Command{
Short: "Delete client",
Long: "Delete client by id\n" +
"Usage:\n" +
"\tmagistrala-cli clients delete <client_id> $DOMAINID $USERTOKEN - delete client with <client_id>\n",
"\tsupermq-cli clients delete <client_id> $DOMAINID $USERTOKEN - delete client with <client_id>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -104,16 +104,16 @@ var cmdClients = []cobra.Command{
Short: "Update client",
Long: "Updates client with provided id, name and metadata, or updates client's tags, secret\n" +
"Usage:\n" +
"\tmagistrala-cli client update <client_id> '{\"name\":\"new name\", \"metadata\":{\"key\": \"value\"}}' $DOMAINID $USERTOKEN\n" +
"\tmagistrala-cli client update tags <client_id> '{\"tag1\":\"value1\", \"tag2\":\"value2\"}' $DOMAINID $USERTOKEN\n" +
"\tmagistrala-cli client update secret <client_id> <newsecret> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli client update <client_id> '{\"name\":\"new name\", \"metadata\":{\"key\": \"value\"}}' $DOMAINID $USERTOKEN\n" +
"\tsupermq-cli client update tags <client_id> '{\"tag1\":\"value1\", \"tag2\":\"value2\"}' $DOMAINID $USERTOKEN\n" +
"\tsupermq-cli client update secret <client_id> <newsecret> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 5 && len(args) != 4 {
logUsageCmd(*cmd, cmd.Use)
return
}
var client mgxsdk.Client
var client smqsdk.Client
if args[0] == "tags" {
if err := json.Unmarshal([]byte(args[2]), &client.Tags); err != nil {
logErrorCmd(*cmd, err)
@@ -160,7 +160,7 @@ var cmdClients = []cobra.Command{
Short: "Change client status to enabled",
Long: "Change client status to enabled\n" +
"Usage:\n" +
"\tmagistrala-cli clients enable <client_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli clients enable <client_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -181,7 +181,7 @@ var cmdClients = []cobra.Command{
Short: "Change client status to disabled",
Long: "Change client status to disabled\n" +
"Usage:\n" +
"\tmagistrala-cli clients disable <client_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli clients disable <client_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -202,13 +202,13 @@ var cmdClients = []cobra.Command{
Short: "Share client with a user",
Long: "Share client with a user\n" +
"Usage:\n" +
"\tmagistrala-cli clients share <client_id> <user_id> <relation> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli clients share <client_id> <user_id> <relation> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 5 {
logUsageCmd(*cmd, cmd.Use)
return
}
req := mgxsdk.UsersRelationRequest{
req := smqsdk.UsersRelationRequest{
Relation: args[2],
UserIDs: []string{args[1]},
}
@@ -226,13 +226,13 @@ var cmdClients = []cobra.Command{
Short: "Unshare client with a user",
Long: "Unshare client with a user\n" +
"Usage:\n" +
"\tmagistrala-cli clients share <client_id> <user_id> <relation> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli clients share <client_id> <user_id> <relation> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 5 {
logUsageCmd(*cmd, cmd.Use)
return
}
req := mgxsdk.UsersRelationRequest{
req := smqsdk.UsersRelationRequest{
Relation: args[2],
UserIDs: []string{args[1]},
}
@@ -250,14 +250,14 @@ var cmdClients = []cobra.Command{
Short: "Connect client",
Long: "Connect client to the channel\n" +
"Usage:\n" +
"\tmagistrala-cli clients connect <client_id> <channel_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli clients connect <client_id> <channel_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 4 {
logUsageCmd(*cmd, cmd.Use)
return
}
connIDs := mgxsdk.Connection{
connIDs := smqsdk.Connection{
ChannelIDs: []string{args[1]},
ClientIDs: []string{args[0]},
}
@@ -274,14 +274,14 @@ var cmdClients = []cobra.Command{
Short: "Disconnect client",
Long: "Disconnect client to the channel\n" +
"Usage:\n" +
"\tmagistrala-cli clients disconnect <client_id> <channel_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli clients disconnect <client_id> <channel_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 4 {
logUsageCmd(*cmd, cmd.Use)
return
}
connIDs := mgxsdk.Connection{
connIDs := smqsdk.Connection{
ClientIDs: []string{args[0]},
ChannelIDs: []string{args[1]},
}
@@ -298,13 +298,13 @@ var cmdClients = []cobra.Command{
Short: "Connected list",
Long: "List of Channels connected to Client\n" +
"Usage:\n" +
"\tmagistrala-cli connections <client_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli connections <client_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -322,13 +322,13 @@ var cmdClients = []cobra.Command{
Short: "List users",
Long: "List users of a client\n" +
"Usage:\n" +
"\tmagistrala-cli clients users <client_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli clients users <client_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
cli/clients_test.go
+8 -8
View File
@@ -10,14 +10,14 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/clients"
"github.com/absmach/magistrala/internal/testsutil"
"github.com/absmach/magistrala/pkg/apiutil"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
sdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/clients"
"github.com/absmach/supermq/internal/testsutil"
"github.com/absmach/supermq/pkg/apiutil"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
sdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/config.go
+3 -3
View File
@@ -11,8 +11,8 @@ import (
"strconv"
"strings"
"github.com/absmach/magistrala/pkg/errors"
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
"github.com/absmach/supermq/pkg/errors"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/pelletier/go-toml"
"github.com/spf13/cobra"
)
@@ -96,7 +96,7 @@ func read(file string) (config, error) {
}
// ParseConfig - parses the config file.
func ParseConfig(sdkConf mgxsdk.Config) (mgxsdk.Config, error) {
func ParseConfig(sdkConf smqsdk.Config) (smqsdk.Config, error) {
if ConfigPath == "" {
ConfigPath = defaultConfigPath
}
cli/consumers.go
+2 -2
View File
@@ -4,7 +4,7 @@
package cli
import (
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -39,7 +39,7 @@ var cmdSubscription = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
Topic: Topic,
cli/consumers_test.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/internal/testsutil"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/internal/testsutil"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/doc.go
+1 -1
View File
@@ -2,5 +2,5 @@
// SPDX-License-Identifier: Apache-2.0
// Package cli contains the domain concept definitions needed to support
// Magistrala CLI functionality.
// SuperMQ CLI functionality.
package cli
cli/domains.go
+12 -12
View File
@@ -6,7 +6,7 @@ package cli
import (
"encoding/json"
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -16,14 +16,14 @@ var cmdDomains = []cobra.Command{
Short: "Create Domain",
Long: "Create Domain with provided name and alias. \n" +
"For example:\n" +
"\tmagistrala-cli domains create domain_1 domain_1_alias $TOKEN\n",
"\tsupermq-cli domains create domain_1 domain_1_alias $TOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
dom := mgxsdk.Domain{
dom := smqsdk.Domain{
Name: args[0],
Alias: args[1],
}
@@ -49,7 +49,7 @@ var cmdDomains = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Name: Name,
Offset: Offset,
Limit: Limit,
@@ -89,7 +89,7 @@ var cmdDomains = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
Metadata: metadata,
@@ -110,14 +110,14 @@ var cmdDomains = []cobra.Command{
Short: "Update domains",
Long: "Updates domains name, alias and metadata \n" +
"Usage:\n" +
"\tmagistrala-cli domains update <domain_id> '{\"name\":\"new name\", \"alias\":\"new_alias\", \"metadata\":{\"key\": \"value\"}}' $TOKEN \n",
"\tsupermq-cli domains update <domain_id> '{\"name\":\"new name\", \"alias\":\"new_alias\", \"metadata\":{\"key\": \"value\"}}' $TOKEN \n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 4 && len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
var d mgxsdk.Domain
var d smqsdk.Domain
if err := json.Unmarshal([]byte(args[1]), &d); err != nil {
logErrorCmd(*cmd, err)
@@ -138,7 +138,7 @@ var cmdDomains = []cobra.Command{
Short: "Change domain status to enabled",
Long: "Change domain status to enabled\n" +
"Usage:\n" +
"\tmagistrala-cli domains enable <domain_id> <token>\n",
"\tsupermq-cli domains enable <domain_id> <token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -157,7 +157,7 @@ var cmdDomains = []cobra.Command{
Short: "Change domain status to disabled",
Long: "Change domain status to disabled\n" +
"Usage:\n" +
"\tmagistrala-cli domains disable <domain_id> <token>\n",
"\tsupermq-cli domains disable <domain_id> <token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -179,7 +179,7 @@ var domainAssignCmds = []cobra.Command{
Short: "Assign users",
Long: "Assign users to a domain\n" +
"Usage:\n" +
"\tmagistrala-cli domains assign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <domain_id> $TOKEN\n",
"\tsupermq-cli domains assign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <domain_id> $TOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 4 {
logUsageCmd(*cmd, cmd.Use)
@@ -190,7 +190,7 @@ var domainAssignCmds = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.AddUserToDomain(args[2], mgxsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3]); err != nil {
if err := sdk.AddUserToDomain(args[2], smqsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -205,7 +205,7 @@ var domainUnassignCmds = []cobra.Command{
Short: "Unassign users",
Long: "Unassign users from a domain\n" +
"Usage:\n" +
"\tmagistrala-cli domains unassign users <user_id> <domain_id> $TOKEN\n",
"\tsupermq-cli domains unassign users <user_id> <domain_id> $TOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
cli/domains_test.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/internal/testsutil"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/internal/testsutil"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/groups.go
+24 -24
View File
@@ -6,8 +6,8 @@ package cli
import (
"encoding/json"
"github.com/absmach/magistrala/groups"
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
"github.com/absmach/supermq/groups"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -17,13 +17,13 @@ var cmdGroups = []cobra.Command{
Short: "Create group",
Long: "Creates new group\n" +
"Usage:\n" +
"\tmagistrala-cli groups create '{\"name\":\"new group\", \"description\":\"new group description\", \"metadata\":{\"key\": \"value\"}}' $DOMAINID $USERTOKEN\n",
"\tsupermq-cli groups create '{\"name\":\"new group\", \"description\":\"new group description\", \"metadata\":{\"key\": \"value\"}}' $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
var group mgxsdk.Group
var group smqsdk.Group
if err := json.Unmarshal([]byte(args[0]), &group); err != nil {
logErrorCmd(*cmd, err)
return
@@ -42,14 +42,14 @@ var cmdGroups = []cobra.Command{
Short: "Update group",
Long: "Updates group\n" +
"Usage:\n" +
"\tmagistrala-cli groups update '{\"id\":\"<group_id>\", \"name\":\"new group\", \"description\":\"new group description\", \"metadata\":{\"key\": \"value\"}}' $DOMAINID $USERTOKEN\n",
"\tsupermq-cli groups update '{\"id\":\"<group_id>\", \"name\":\"new group\", \"description\":\"new group description\", \"metadata\":{\"key\": \"value\"}}' $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
var group mgxsdk.Group
var group smqsdk.Group
if err := json.Unmarshal([]byte(args[0]), &group); err != nil {
logErrorCmd(*cmd, err)
return
@@ -69,10 +69,10 @@ var cmdGroups = []cobra.Command{
Short: "Get group",
Long: "Get all users groups, group children or group by id.\n" +
"Usage:\n" +
"\tmagistrala-cli groups get all $DOMAINID $USERTOKEN - lists all groups\n" +
"\tmagistrala-cli groups get children <group_id> $DOMAINID $USERTOKEN - lists all children groups of <group_id>\n" +
"\tmagistrala-cli groups get parents <group_id> $DOMAINID $USERTOKEN - lists all parent groups of <group_id>\n" +
"\tmagistrala-cli groups get <group_id> $DOMAINID $USERTOKEN - shows group with provided group ID\n",
"\tsupermq-cli groups get all $DOMAINID $USERTOKEN - lists all groups\n" +
"\tsupermq-cli groups get children <group_id> $DOMAINID $USERTOKEN - lists all children groups of <group_id>\n" +
"\tsupermq-cli groups get parents <group_id> $DOMAINID $USERTOKEN - lists all parent groups of <group_id>\n" +
"\tsupermq-cli groups get <group_id> $DOMAINID $USERTOKEN - shows group with provided group ID\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) < 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -83,7 +83,7 @@ var cmdGroups = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -100,7 +100,7 @@ var cmdGroups = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
DomainID: args[2],
@@ -118,7 +118,7 @@ var cmdGroups = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -147,7 +147,7 @@ var cmdGroups = []cobra.Command{
Short: "Delete group",
Long: "Delete group by id.\n" +
"Usage:\n" +
"\tmagistrala-cli groups delete <group_id> $DOMAINID $USERTOKEN - delete the given group ID\n",
"\tsupermq-cli groups delete <group_id> $DOMAINID $USERTOKEN - delete the given group ID\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -165,13 +165,13 @@ var cmdGroups = []cobra.Command{
Short: "List users",
Long: "List users in a group\n" +
"Usage:\n" +
"\tmagistrala-cli groups users <group_id> $DOMAINID $USERTOKEN",
"\tsupermq-cli groups users <group_id> $DOMAINID $USERTOKEN",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
Status: Status,
@@ -189,13 +189,13 @@ var cmdGroups = []cobra.Command{
Short: "List channels",
Long: "List channels in a group\n" +
"Usage:\n" +
"\tmagistrala-cli groups channels <group_id> $DOMAINID $USERTOKEN",
"\tsupermq-cli groups channels <group_id> $DOMAINID $USERTOKEN",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
Status: Status,
@@ -213,7 +213,7 @@ var cmdGroups = []cobra.Command{
Short: "Change group status to enabled",
Long: "Change group status to enabled\n" +
"Usage:\n" +
"\tmagistrala-cli groups enable <group_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli groups enable <group_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -234,7 +234,7 @@ var cmdGroups = []cobra.Command{
Short: "Change group status to disabled",
Long: "Change group status to disabled\n" +
"Usage:\n" +
"\tmagistrala-cli groups disable <group_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli groups disable <group_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -258,7 +258,7 @@ var groupAssignCmds = []cobra.Command{
Short: "Assign users",
Long: "Assign users to a group\n" +
"Usage:\n" +
"\tmagistrala-cli groups assign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <group_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli groups assign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <group_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 5 {
logUsageCmd(*cmd, cmd.Use)
@@ -269,7 +269,7 @@ var groupAssignCmds = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.AddUserToGroup(args[2], mgxsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3], args[4]); err != nil {
if err := sdk.AddUserToGroup(args[2], smqsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -284,7 +284,7 @@ var groupUnassignCmds = []cobra.Command{
Short: "Unassign users",
Long: "Unassign users from a group\n" +
"Usage:\n" +
"\tmagistrala-cli groups unassign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <group_id> $DOMAINID $USERTOKEN\n",
"\tsupermq-cli groups unassign users <relation> '[\"<user_id_1>\", \"<user_id_2>\"]' <group_id> $DOMAINID $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 5 {
logUsageCmd(*cmd, cmd.Use)
@@ -295,7 +295,7 @@ var groupUnassignCmds = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.RemoveUserFromGroup(args[2], mgxsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3], args[4]); err != nil {
if err := sdk.RemoveUserFromGroup(args[2], smqsdk.UsersRelationRequest{Relation: args[0], UserIDs: userIDs}, args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
cli/groups_test.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/internal/testsutil"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/internal/testsutil"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/health.go
+2 -2
View File
@@ -10,9 +10,9 @@ func NewHealthCmd() *cobra.Command {
return &cobra.Command{
Use: "health <service>",
Short: "Health Check",
Long: "Magistrala service Health Check\n" +
Long: "SuperMQ service Health Check\n" +
"usage:\n" +
"\tmagistrala-cli health <service>",
"\tsupermq-cli health <service>",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 1 {
logUsageCmd(*cmd, cmd.Use)
cli/health_test.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/pkg/errors"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/pkg/errors"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/invitations.go
+10 -10
View File
@@ -4,7 +4,7 @@
package cli
import (
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -14,13 +14,13 @@ var cmdInvitations = []cobra.Command{
Short: "Send invitation",
Long: "Send invitation to user\n" +
"For example:\n" +
"\tmagistrala-cli invitations send 39f97daf-d6b6-40f4-b229-2697be8006ef 4ef09eff-d500-4d56-b04f-d23a512d6f2a administrator $USER_AUTH_TOKEN\n",
"\tsupermq-cli invitations send 39f97daf-d6b6-40f4-b229-2697be8006ef 4ef09eff-d500-4d56-b04f-d23a512d6f2a administrator $USER_AUTH_TOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 4 {
logUsageCmd(*cmd, cmd.Use)
return
}
inv := mgxsdk.Invitation{
inv := smqsdk.Invitation{
UserID: args[0],
DomainID: args[1],
Relation: args[2],
@@ -38,16 +38,16 @@ var cmdInvitations = []cobra.Command{
Short: "Get invitations",
Long: "Get invitations\n" +
"Usage:\n" +
"\tmagistrala-cli invitations get all <user_auth_token> - lists all invitations\n" +
"\tmagistrala-cli invitations get all <user_auth_token> --offset <offset> --limit <limit> - lists all invitations with provided offset and limit\n" +
"\tmagistrala-cli invitations get <user_id> <domain_id> <user_auth_token> - shows invitation by user id and domain id\n",
"\tsupermq-cli invitations get all <user_auth_token> - lists all invitations\n" +
"\tsupermq-cli invitations get all <user_auth_token> --offset <offset> --limit <limit> - lists all invitations with provided offset and limit\n" +
"\tsupermq-cli invitations get <user_id> <domain_id> <user_auth_token> - shows invitation by user id and domain id\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 && len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Identity: Identity,
Offset: Offset,
Limit: Limit,
@@ -75,7 +75,7 @@ var cmdInvitations = []cobra.Command{
Short: "Accept invitation",
Long: "Accept invitation to domain\n" +
"Usage:\n" +
"\tmagistrala-cli invitations accept 39f97daf-d6b6-40f4-b229-2697be8006ef $USERTOKEN\n",
"\tsupermq-cli invitations accept 39f97daf-d6b6-40f4-b229-2697be8006ef $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -95,7 +95,7 @@ var cmdInvitations = []cobra.Command{
Short: "Reject invitation",
Long: "Reject invitation to domain\n" +
"Usage:\n" +
"\tmagistrala-cli invitations reject 39f97daf-d6b6-40f4-b229-2697be8006ef $USER_AUTH_TOKEN\n",
"\tsupermq-cli invitations reject 39f97daf-d6b6-40f4-b229-2697be8006ef $USER_AUTH_TOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -115,7 +115,7 @@ var cmdInvitations = []cobra.Command{
Short: "Delete invitation",
Long: "Delete invitation\n" +
"Usage:\n" +
"\tmagistrala-cli invitations delete 39f97daf-d6b6-40f4-b229-2697be8006ef 4ef09eff-d500-4d56-b04f-d23a512d6f2a $USERTOKEN\n",
"\tsupermq-cli invitations delete 39f97daf-d6b6-40f4-b229-2697be8006ef 4ef09eff-d500-4d56-b04f-d23a512d6f2a $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
cli/invitations_test.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/internal/testsutil"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/internal/testsutil"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/journal.go
+5 -5
View File
@@ -4,7 +4,7 @@
package cli
import (
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -13,15 +13,15 @@ var cmdJournal = cobra.Command{
Short: "Get journal",
Long: "Get journal\n" +
"Usage:\n" +
"\tmagistrala-cli journal get user <user_id> <user_auth_token> - lists user journal logs\n" +
"\tmagistrala-cli journal get <entity_type> <entity_id> <domain_id> <user_auth_token> - lists entity journal logs\n" +
"\tmagistrala-cli journal get <entity_type> <entity_id> <domain_id> <user_auth_token> --offset <offset> --limit <limit> - lists user journal logs with provided offset and limit\n",
"\tsupermq-cli journal get user <user_id> <user_auth_token> - lists user journal logs\n" +
"\tsupermq-cli journal get <entity_type> <entity_id> <domain_id> <user_auth_token> - lists entity journal logs\n" +
"\tsupermq-cli journal get <entity_type> <entity_id> <domain_id> <user_auth_token> --offset <offset> --limit <limit> - lists user journal logs with provided offset and limit\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) < 3 || len(args) > 4 {
logUsageCmd(*cmd, cmd.Use)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
cli/journal_test.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/internal/testsutil"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/internal/testsutil"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/message.go
+4 -4
View File
@@ -4,7 +4,7 @@
package cli
import (
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -32,14 +32,14 @@ var cmdMessages = []cobra.Command{
Short: "Read messages",
Long: "Reads all channel messages\n" +
"Usage:\n" +
"\tmagistrala-cli messages read <channel_id.subtopic> <domain_id> <user_token> --offset <offset> --limit <limit> - lists all messages with provided offset and limit\n",
"\tsupermq-cli messages read <channel_id.subtopic> <domain_id> <user_token> --offset <offset> --limit <limit> - lists all messages with provided offset and limit\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
return
}
pageMetadata := mgxsdk.MessagePageMetadata{
PageMetadata: mgxsdk.PageMetadata{
pageMetadata := smqsdk.MessagePageMetadata{
PageMetadata: smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
},
cli/message_test.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/magistrala/pkg/transformers/senml"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/absmach/supermq/pkg/transformers/senml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
cli/provision.go
+45 -45
View File
@@ -15,7 +15,7 @@ import (
"time"
"github.com/0x6flab/namegenerator"
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/spf13/cobra"
)
@@ -78,7 +78,7 @@ var cmdProvision = []cobra.Command{
return
}
var chs []mgxsdk.Channel
var chs []smqsdk.Channel
for _, c := range channels {
c, err = sdk.CreateChannel(c, args[1], args[2])
if err != nil {
@@ -126,8 +126,8 @@ var cmdProvision = []cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
numClients := 2
numChan := 2
clients := []mgxsdk.Client{}
channels := []mgxsdk.Channel{}
clients := []smqsdk.Client{}
channels := []smqsdk.Channel{}
if len(args) != 0 {
logUsageCmd(*cmd, cmd.Use)
@@ -136,14 +136,14 @@ var cmdProvision = []cobra.Command{
// Create test user
name := namesgenerator.Generate()
user := mgxsdk.User{
user := smqsdk.User{
FirstName: name,
Email: fmt.Sprintf("%s@email.com", name),
Credentials: mgxsdk.Credentials{
Credentials: smqsdk.Credentials{
Username: name,
Secret: "12345678",
},
Status: mgxsdk.EnabledStatus,
Status: smqsdk.EnabledStatus,
}
user, err := sdk.CreateUser(user, "")
if err != nil {
@@ -151,16 +151,16 @@ var cmdProvision = []cobra.Command{
return
}
ut, err := sdk.CreateToken(mgxsdk.Login{Identity: user.Credentials.Username, Secret: user.Credentials.Secret})
ut, err := sdk.CreateToken(smqsdk.Login{Identity: user.Credentials.Username, Secret: user.Credentials.Secret})
if err != nil {
logErrorCmd(*cmd, err)
return
}
// create domain
domain := mgxsdk.Domain{
domain := smqsdk.Domain{
Name: fmt.Sprintf("%s-domain", name),
Status: mgxsdk.EnabledStatus,
Status: smqsdk.EnabledStatus,
}
domain, err = sdk.CreateDomain(domain, ut.AccessToken)
if err != nil {
@@ -168,7 +168,7 @@ var cmdProvision = []cobra.Command{
return
}
ut, err = sdk.CreateToken(mgxsdk.Login{Identity: user.Email, Secret: user.Credentials.Secret})
ut, err = sdk.CreateToken(smqsdk.Login{Identity: user.Email, Secret: user.Credentials.Secret})
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -176,9 +176,9 @@ var cmdProvision = []cobra.Command{
// Create clients
for i := 0; i < numClients; i++ {
t := mgxsdk.Client{
t := smqsdk.Client{
Name: fmt.Sprintf("%s-client-%d", name, i),
Status: mgxsdk.EnabledStatus,
Status: smqsdk.EnabledStatus,
}
clients = append(clients, t)
@@ -191,9 +191,9 @@ var cmdProvision = []cobra.Command{
// Create channels
for i := 0; i < numChan; i++ {
c := mgxsdk.Channel{
c := smqsdk.Channel{
Name: fmt.Sprintf("%s-channel-%d", name, i),
Status: mgxsdk.EnabledStatus,
Status: smqsdk.EnabledStatus,
}
c, err = sdk.CreateChannel(c, domain.ID, ut.AccessToken)
if err != nil {
@@ -205,7 +205,7 @@ var cmdProvision = []cobra.Command{
}
// Connect clients to channels - first client to both channels, second only to first
conIDs := mgxsdk.Connection{
conIDs := smqsdk.Connection{
ChannelIDs: []string{channels[0].ID},
ClientIDs: []string{clients[0].ID},
Types: []string{PublishType, SubscribeType},
@@ -215,7 +215,7 @@ var cmdProvision = []cobra.Command{
return
}
conIDs = mgxsdk.Connection{
conIDs = smqsdk.Connection{
ChannelIDs: []string{channels[1].ID},
ClientIDs: []string{clients[0].ID},
Types: []string{PublishType, SubscribeType},
@@ -225,7 +225,7 @@ var cmdProvision = []cobra.Command{
return
}
conIDs = mgxsdk.Connection{
conIDs = smqsdk.Connection{
ChannelIDs: []string{channels[0].ID},
ClientIDs: []string{clients[1].ID},
Types: []string{PublishType, SubscribeType},
@@ -269,18 +269,18 @@ func NewProvisionCmd() *cobra.Command {
return &cmd
}
func clientsFromFile(path string) ([]mgxsdk.Client, error) {
func clientsFromFile(path string) ([]smqsdk.Client, error) {
if _, err := os.Stat(path); os.IsNotExist(err) {
return []mgxsdk.Client{}, err
return []smqsdk.Client{}, err
}
file, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm)
if err != nil {
return []mgxsdk.Client{}, err
return []smqsdk.Client{}, err
}
defer file.Close()
clients := []mgxsdk.Client{}
clients := []smqsdk.Client{}
switch filepath.Ext(path) {
case csvExt:
reader := csv.NewReader(file)
@@ -291,14 +291,14 @@ func clientsFromFile(path string) ([]mgxsdk.Client, error) {
break
}
if err != nil {
return []mgxsdk.Client{}, err
return []smqsdk.Client{}, err
}
if len(l) < 1 {
return []mgxsdk.Client{}, errors.New("empty line found in file")
return []smqsdk.Client{}, errors.New("empty line found in file")
}
client := mgxsdk.Client{
client := smqsdk.Client{
Name: l[0],
}
@@ -307,27 +307,27 @@ func clientsFromFile(path string) ([]mgxsdk.Client, error) {
case jsonExt:
err := json.NewDecoder(file).Decode(&clients)
if err != nil {
return []mgxsdk.Client{}, err
return []smqsdk.Client{}, err
}
default:
return []mgxsdk.Client{}, err
return []smqsdk.Client{}, err
}
return clients, nil
}
func channelsFromFile(path string) ([]mgxsdk.Channel, error) {
func channelsFromFile(path string) ([]smqsdk.Channel, error) {
if _, err := os.Stat(path); os.IsNotExist(err) {
return []mgxsdk.Channel{}, err
return []smqsdk.Channel{}, err
}
file, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm)
if err != nil {
return []mgxsdk.Channel{}, err
return []smqsdk.Channel{}, err
}
defer file.Close()
channels := []mgxsdk.Channel{}
channels := []smqsdk.Channel{}
switch filepath.Ext(path) {
case csvExt:
reader := csv.NewReader(file)
@@ -338,14 +338,14 @@ func channelsFromFile(path string) ([]mgxsdk.Channel, error) {
break
}
if err != nil {
return []mgxsdk.Channel{}, err
return []smqsdk.Channel{}, err
}
if len(l) < 1 {
return []mgxsdk.Channel{}, errors.New("empty line found in file")
return []smqsdk.Channel{}, errors.New("empty line found in file")
}
channel := mgxsdk.Channel{
channel := smqsdk.Channel{
Name: l[0],
}
@@ -354,27 +354,27 @@ func channelsFromFile(path string) ([]mgxsdk.Channel, error) {
case jsonExt:
err := json.NewDecoder(file).Decode(&channels)
if err != nil {
return []mgxsdk.Channel{}, err
return []smqsdk.Channel{}, err
}
default:
return []mgxsdk.Channel{}, err
return []smqsdk.Channel{}, err
}
return channels, nil
}
func connectionsFromFile(path string) ([]mgxsdk.Connection, error) {
func connectionsFromFile(path string) ([]smqsdk.Connection, error) {
if _, err := os.Stat(path); os.IsNotExist(err) {
return []mgxsdk.Connection{}, err
return []smqsdk.Connection{}, err
}
file, err := os.OpenFile(path, os.O_RDONLY, os.ModePerm)
if err != nil {
return []mgxsdk.Connection{}, err
return []smqsdk.Connection{}, err
}
defer file.Close()
connections := []mgxsdk.Connection{}
connections := []smqsdk.Connection{}
switch filepath.Ext(path) {
case csvExt:
reader := csv.NewReader(file)
@@ -385,13 +385,13 @@ func connectionsFromFile(path string) ([]mgxsdk.Connection, error) {
break
}
if err != nil {
return []mgxsdk.Connection{}, err
return []smqsdk.Connection{}, err
}
if len(l) < 1 {
return []mgxsdk.Connection{}, errors.New("empty line found in file")
return []smqsdk.Connection{}, errors.New("empty line found in file")
}
connections = append(connections, mgxsdk.Connection{
connections = append(connections, smqsdk.Connection{
ClientIDs: []string{l[0]},
ChannelIDs: []string{l[1]},
Types: []string{PublishType, SubscribeType},
@@ -400,10 +400,10 @@ func connectionsFromFile(path string) ([]mgxsdk.Connection, error) {
case jsonExt:
err := json.NewDecoder(file).Decode(&connections)
if err != nil {
return []mgxsdk.Connection{}, err
return []smqsdk.Connection{}, err
}
default:
return []mgxsdk.Connection{}, err
return []smqsdk.Connection{}, err
}
return connections, nil
cli/sdk.go
+4 -4
View File
@@ -3,12 +3,12 @@
package cli
import mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
import smqsdk "github.com/absmach/supermq/pkg/sdk/go"
// Keep SDK handle in global var.
var sdk mgxsdk.SDK
var sdk smqsdk.SDK
// SetSDK sets magistrala SDK instance.
func SetSDK(s mgxsdk.SDK) {
// SetSDK sets supermq SDK instance.
func SetSDK(s smqsdk.SDK) {
sdk = s
}
cli/setup_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"bytes"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/supermq/cli"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)
cli/users.go
+34 -34
View File
@@ -9,8 +9,8 @@ import (
"net/url"
"strconv"
mgxsdk "github.com/absmach/magistrala/pkg/sdk/go"
"github.com/absmach/magistrala/users"
smqsdk "github.com/absmach/supermq/pkg/sdk/go"
"github.com/absmach/supermq/users"
"github.com/spf13/cobra"
)
@@ -20,7 +20,7 @@ var cmdUsers = []cobra.Command{
Short: "Create user",
Long: "Create user with provided firstname, lastname, email, username and password. Token is optional\n" +
"For example:\n" +
"\tmagistrala-cli users create jane doe janedoe@example.com jane_doe 12345678 $USER_AUTH_TOKEN\n",
"\tsupermq-cli users create jane doe janedoe@example.com jane_doe 12345678 $USER_AUTH_TOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) < 5 || len(args) > 6 {
logUsageCmd(*cmd, cmd.Use)
@@ -30,11 +30,11 @@ var cmdUsers = []cobra.Command{
args = append(args, "")
}
user := mgxsdk.User{
user := smqsdk.User{
FirstName: args[0],
LastName: args[1],
Email: args[2],
Credentials: mgxsdk.Credentials{
Credentials: smqsdk.Credentials{
Username: args[3],
Secret: args[4],
},
@@ -54,9 +54,9 @@ var cmdUsers = []cobra.Command{
Short: "Get users",
Long: "Get all users or get user by id. Users can be filtered by name or metadata or status\n" +
"Usage:\n" +
"\tmagistrala-cli users get all <user_auth_token> - lists all users\n" +
"\tmagistrala-cli users get all <user_auth_token> --offset <offset> --limit <limit> - lists all users with provided offset and limit\n" +
"\tmagistrala-cli users get <user_id> <user_auth_token> - shows user with provided <user_id>\n",
"\tsupermq-cli users get all <user_auth_token> - lists all users\n" +
"\tsupermq-cli users get all <user_auth_token> --offset <offset> --limit <limit> - lists all users with provided offset and limit\n" +
"\tsupermq-cli users get <user_id> <user_auth_token> - shows user with provided <user_id>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -67,7 +67,7 @@ var cmdUsers = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
pageMetadata := mgxsdk.PageMetadata{
pageMetadata := smqsdk.PageMetadata{
Username: Username,
Identity: Identity,
Offset: Offset,
@@ -98,14 +98,14 @@ var cmdUsers = []cobra.Command{
Short: "Get token",
Long: "Generate a new token with username and password\n" +
"For example:\n" +
"\tmagistrala-cli users token jane.doe 12345678\n",
"\tsupermq-cli users token jane.doe 12345678\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
return
}
loginReq := mgxsdk.Login{
loginReq := smqsdk.Login{
Identity: args[0],
Secret: args[1],
}
@@ -125,7 +125,7 @@ var cmdUsers = []cobra.Command{
Short: "Get token",
Long: "Generate new token from refresh token\n" +
"For example:\n" +
"\tmagistrala-cli users refreshtoken <refresh_token>\n",
"\tsupermq-cli users refreshtoken <refresh_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 1 {
logUsageCmd(*cmd, cmd.Use)
@@ -146,10 +146,10 @@ var cmdUsers = []cobra.Command{
Short: "Update user",
Long: "Updates either user name and metadata or user tags or user email\n" +
"Usage:\n" +
"\tmagistrala-cli users update <user_id> '{\"first_name\":\"new first_name\", \"metadata\":{\"key\": \"value\"}}' $USERTOKEN - updates user first and lastname and metadata\n" +
"\tmagistrala-cli users update tags <user_id> '[\"tag1\", \"tag2\"]' $USERTOKEN - updates user tags\n" +
"\tmagistrala-cli users update username <user_id> newusername $USERTOKEN - updates user name\n" +
"\tmagistrala-cli users update email <user_id> newemail@example.com $USERTOKEN - updates user email\n",
"\tsupermq-cli users update <user_id> '{\"first_name\":\"new first_name\", \"metadata\":{\"key\": \"value\"}}' $USERTOKEN - updates user first and lastname and metadata\n" +
"\tsupermq-cli users update tags <user_id> '[\"tag1\", \"tag2\"]' $USERTOKEN - updates user tags\n" +
"\tsupermq-cli users update username <user_id> newusername $USERTOKEN - updates user name\n" +
"\tsupermq-cli users update email <user_id> newemail@example.com $USERTOKEN - updates user email\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 4 && len(args) != 3 {
@@ -157,7 +157,7 @@ var cmdUsers = []cobra.Command{
return
}
var user mgxsdk.User
var user smqsdk.User
if args[0] == "tags" {
if err := json.Unmarshal([]byte(args[2]), &user.Tags); err != nil {
logErrorCmd(*cmd, err)
@@ -233,7 +233,7 @@ var cmdUsers = []cobra.Command{
Short: "Get user profile",
Long: "Get user profile\n" +
"Usage:\n" +
"\tmagistrala-cli users profile $USERTOKEN\n",
"\tsupermq-cli users profile $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 1 {
logUsageCmd(*cmd, cmd.Use)
@@ -254,7 +254,7 @@ var cmdUsers = []cobra.Command{
Short: "Send reset password request",
Long: "Send reset password request\n" +
"Usage:\n" +
"\tmagistrala-cli users resetpasswordrequest example@mail.com\n",
"\tsupermq-cli users resetpasswordrequest example@mail.com\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 1 {
logUsageCmd(*cmd, cmd.Use)
@@ -274,7 +274,7 @@ var cmdUsers = []cobra.Command{
Short: "Reset password",
Long: "Reset password\n" +
"Usage:\n" +
"\tmagistrala-cli users resetpassword 12345678 12345678 $REQUESTTOKEN\n",
"\tsupermq-cli users resetpassword 12345678 12345678 $REQUESTTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -294,7 +294,7 @@ var cmdUsers = []cobra.Command{
Short: "Update password",
Long: "Update password\n" +
"Usage:\n" +
"\tmagistrala-cli users password old_password new_password $USERTOKEN\n",
"\tsupermq-cli users password old_password new_password $USERTOKEN\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -315,7 +315,7 @@ var cmdUsers = []cobra.Command{
Short: "Change user status to enabled",
Long: "Change user status to enabled\n" +
"Usage:\n" +
"\tmagistrala-cli users enable <user_id> <user_auth_token>\n",
"\tsupermq-cli users enable <user_id> <user_auth_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -336,7 +336,7 @@ var cmdUsers = []cobra.Command{
Short: "Change user status to disabled",
Long: "Change user status to disabled\n" +
"Usage:\n" +
"\tmagistrala-cli users disable <user_id> <user_auth_token>\n",
"\tsupermq-cli users disable <user_id> <user_auth_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -357,7 +357,7 @@ var cmdUsers = []cobra.Command{
Short: "Delete user",
Long: "Delete user by id\n" +
"Usage:\n" +
"\tmagistrala-cli users delete <user_id> $USERTOKEN - delete user with <user_id>\n",
"\tsupermq-cli users delete <user_id> $USERTOKEN - delete user with <user_id>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -375,14 +375,14 @@ var cmdUsers = []cobra.Command{
Short: "List channels",
Long: "List channels of user\n" +
"Usage:\n" +
"\tmagistrala-cli users channels <user_id> <user_auth_token>\n",
"\tsupermq-cli users channels <user_id> <user_auth_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -402,14 +402,14 @@ var cmdUsers = []cobra.Command{
Short: "List clients",
Long: "List clients of user\n" +
"Usage:\n" +
"\tmagistrala-cli users clients <user_id> <user_auth_token>\n",
"\tsupermq-cli users clients <user_id> <user_auth_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -429,14 +429,14 @@ var cmdUsers = []cobra.Command{
Short: "List domains",
Long: "List user's domains\n" +
"Usage:\n" +
"\tmagistrala-cli users domains <user_id> <user_auth_token>\n",
"\tsupermq-cli users domains <user_id> <user_auth_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -456,14 +456,14 @@ var cmdUsers = []cobra.Command{
Short: "List groups",
Long: "List groups of user\n" +
"Usage:\n" +
"\tmagistrala-cli users groups <user_id> <user_auth_token>\n",
"\tsupermq-cli users groups <user_id> <user_auth_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
return
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
}
@@ -483,7 +483,7 @@ var cmdUsers = []cobra.Command{
Short: "Search users",
Long: "Search users by query\n" +
"Usage:\n" +
"\tmagistrala-cli users search <query> <user_auth_token>\n",
"\tsupermq-cli users search <query> <user_auth_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
@@ -495,7 +495,7 @@ var cmdUsers = []cobra.Command{
logErrorCmd(*cmd, fmt.Errorf("failed to parse query: %s", err))
}
pm := mgxsdk.PageMetadata{
pm := smqsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
Name: values.Get("name"),
cli/users_test.go
+7 -7
View File
@@ -10,13 +10,13 @@ import (
"strings"
"testing"
"github.com/absmach/magistrala/cli"
"github.com/absmach/magistrala/internal/testsutil"
"github.com/absmach/magistrala/pkg/errors"
svcerr "github.com/absmach/magistrala/pkg/errors/service"
mgsdk "github.com/absmach/magistrala/pkg/sdk/go"
sdkmocks "github.com/absmach/magistrala/pkg/sdk/mocks"
"github.com/absmach/magistrala/users"
"github.com/absmach/supermq/cli"
"github.com/absmach/supermq/internal/testsutil"
"github.com/absmach/supermq/pkg/errors"
svcerr "github.com/absmach/supermq/pkg/errors/service"
mgsdk "github.com/absmach/supermq/pkg/sdk/go"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/absmach/supermq/users"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)