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

NOISSUE - Pass context on SDK to allow distributed tracing (#2783)

Browse Source 
Signed-off-by: Sammy Oina <sammyoina@gmail.com>
This commit is contained in:
Sammy Kerata Oina
2025-04-02 00:54:41 +03:00
committed by GitHub
parent 12b41e3ab0
commit 340098cec3
44 changed files with 2365 additions and 2216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certs/service.go
+2 -2
View File
@@ -68,7 +68,7 @@ type Revoke struct {
func (cs *certsService) IssueCert(ctx context.Context, domainID, token, clientID, ttl string) (Cert, error) {
var err error
client, err := cs.sdk.Client(clientID, domainID, token)
client, err := cs.sdk.Client(ctx, clientID, domainID, token)
if err != nil {
return Cert{}, errors.Wrap(ErrFailedCertCreation, err)
}
@@ -92,7 +92,7 @@ func (cs *certsService) RevokeCert(ctx context.Context, domainID, token, clientI
var revoke Revoke
var err error
client, err := cs.sdk.Client(clientID, domainID, token)
client, err := cs.sdk.Client(ctx, clientID, domainID, token)
if err != nil {
return revoke, errors.Wrap(ErrFailedCertRevocation, err)
}
certs/service_test.go
+2 -2
View File
@@ -106,7 +106,7 @@ func TestIssueCert(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdk.On("Client", tc.clientID, tc.domainID, tc.token).Return(mgsdk.Client{ID: tc.clientID, Credentials: mgsdk.ClientCredentials{Secret: clientKey}}, tc.clientErr)
sdkCall := sdk.On("Client", mock.Anything, tc.clientID, tc.domainID, tc.token).Return(mgsdk.Client{ID: tc.clientID, Credentials: mgsdk.ClientCredentials{Secret: clientKey}}, tc.clientErr)
agentCall := agent.On("Issue", clientID, tc.ttl, tc.ipAddr).Return(tc.cert, tc.issueCertErr)
resp, err := svc.IssueCert(context.Background(), tc.domainID, tc.token, tc.clientID, tc.ttl)
assert.True(t, errors.Contains(err, tc.err), fmt.Sprintf("%s: expected %s got %s\n", tc.desc, tc.err, err))
@@ -169,7 +169,7 @@ func TestRevokeCert(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdk.On("Client", tc.clientID, tc.domainID, tc.token).Return(mgsdk.Client{ID: tc.clientID, Credentials: mgsdk.ClientCredentials{Secret: clientKey}}, tc.clientErr)
sdkCall := sdk.On("Client", mock.Anything, tc.clientID, tc.domainID, tc.token).Return(mgsdk.Client{ID: tc.clientID, Credentials: mgsdk.ClientCredentials{Secret: clientKey}}, tc.clientErr)
agentCall := agent.On("Revoke", mock.Anything).Return(tc.revokeErr)
agentCall1 := agent.On("ListCerts", mock.Anything).Return(tc.page, tc.listErr)
_, err := svc.RevokeCert(context.Background(), tc.domainID, tc.token, tc.clientID)
cli/certs.go
+4 -4
View File
@@ -18,7 +18,7 @@ var cmdCerts = []cobra.Command{
return
}
if args[0] == "client" {
cert, err := sdk.ViewCertByClient(args[1], args[2], args[3])
cert, err := sdk.ViewCertByClient(cmd.Context(), args[1], args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -26,7 +26,7 @@ var cmdCerts = []cobra.Command{
logJSONCmd(*cmd, cert)
return
}
cert, err := sdk.ViewCert(args[0], args[1], args[2])
cert, err := sdk.ViewCert(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -43,7 +43,7 @@ var cmdCerts = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
rtime, err := sdk.RevokeCert(args[0], args[1], args[2])
rtime, err := sdk.RevokeCert(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -69,7 +69,7 @@ func NewCertsCmd() *cobra.Command {
clientID := args[0]
c, err := sdk.IssueCert(clientID, ttl, args[1], args[2])
c, err := sdk.IssueCert(cmd.Context(), clientID, ttl, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/certs_test.go
+4 -4
View File
@@ -104,8 +104,8 @@ func TestGetCertCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ViewCertByClient", mock.Anything, mock.Anything, mock.Anything).Return(tc.serials, tc.sdkErr)
sdkCall1 := sdkMock.On("ViewCert", mock.Anything, mock.Anything, mock.Anything).Return(tc.cert, tc.sdkErr)
sdkCall := sdkMock.On("ViewCertByClient", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.serials, tc.sdkErr)
sdkCall1 := sdkMock.On("ViewCert", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.cert, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
switch tc.logType {
case entityLog:
@@ -183,7 +183,7 @@ func TestRevokeCertCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("RevokeCert", tc.args[0], tc.args[1], tc.args[2]).Return(tc.time, tc.sdkErr)
sdkCall := sdkMock.On("RevokeCert", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.time, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{revokeCmd}, tc.args...)...)
switch tc.logType {
@@ -253,7 +253,7 @@ func TestIssueCertCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("IssueCert", mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.cert, tc.sdkErr)
sdkCall := sdkMock.On("IssueCert", mock.Anything, mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.cert, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{issueCmd}, tc.args...)...)
switch tc.logType {
cli/channels.go
+8 -8
View File
@@ -29,7 +29,7 @@ var cmdChannels = []cobra.Command{
return
}
channel, err := sdk.CreateChannel(channel, args[1], args[2])
channel, err := sdk.CreateChannel(cmd.Context(), channel, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -63,7 +63,7 @@ var cmdChannels = []cobra.Command{
}
if args[0] == all {
l, err := sdk.Channels(pageMetadata, args[1], args[2])
l, err := sdk.Channels(cmd.Context(), pageMetadata, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -72,7 +72,7 @@ var cmdChannels = []cobra.Command{
logJSONCmd(*cmd, l)
return
}
c, err := sdk.Channel(args[0], args[1], args[2])
c, err := sdk.Channel(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -92,7 +92,7 @@ var cmdChannels = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
if err := sdk.DeleteChannel(args[0], args[1], args[2]); err != nil {
if err := sdk.DeleteChannel(cmd.Context(), args[0], args[1], args[2]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -115,7 +115,7 @@ var cmdChannels = []cobra.Command{
return
}
channel.ID = args[0]
channel, err := sdk.UpdateChannel(channel, args[2], args[3])
channel, err := sdk.UpdateChannel(cmd.Context(), channel, args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -134,7 +134,7 @@ var cmdChannels = []cobra.Command{
return
}
channel, err := sdk.EnableChannel(args[0], args[1], args[2])
channel, err := sdk.EnableChannel(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -153,7 +153,7 @@ var cmdChannels = []cobra.Command{
return
}
channel, err := sdk.DisableChannel(args[0], args[1], args[2])
channel, err := sdk.DisableChannel(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -177,7 +177,7 @@ var cmdChannels = []cobra.Command{
Offset: Offset,
Limit: Limit,
}
ul, err := sdk.ListChannelMembers(args[0], args[1], pm, args[2])
ul, err := sdk.ListChannelMembers(cmd.Context(), args[0], args[1], pm, args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/channels_test.go
+7 -7
View File
@@ -87,7 +87,7 @@ func TestCreateChannelCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("CreateChannel", mock.Anything, tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
sdkCall := sdkMock.On("CreateChannel", mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{createCmd}, tc.args...)...)
switch tc.logType {
@@ -181,8 +181,8 @@ func TestGetChannelsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Channel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
sdkCall1 := sdkMock.On("Channels", mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("Channel", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
sdkCall1 := sdkMock.On("Channels", mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
@@ -266,7 +266,7 @@ func TestDeleteChannelCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DeleteChannel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
sdkCall := sdkMock.On("DeleteChannel", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{delCmd}, tc.args...)...)
switch tc.logType {
@@ -350,7 +350,7 @@ func TestUpdateChannelCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
var ch mgsdk.Channel
sdkCall := sdkMock.On("UpdateChannel", mock.Anything, tc.args[2], tc.args[3]).Return(tc.channel, tc.sdkErr)
sdkCall := sdkMock.On("UpdateChannel", mock.Anything, mock.Anything, tc.args[2], tc.args[3]).Return(tc.channel, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{updCmd}, tc.args...)...)
switch tc.logType {
@@ -429,7 +429,7 @@ func TestEnableChannelCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("EnableChannel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
sdkCall := sdkMock.On("EnableChannel", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{enableCmd}, tc.args...)...)
switch tc.logType {
@@ -510,7 +510,7 @@ func TestDisableChannelCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DisableChannel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
sdkCall := sdkMock.On("DisableChannel", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{disableCmd}, tc.args...)...)
switch tc.logType {
cli/clients.go
+26 -26
View File
@@ -30,7 +30,7 @@ var cmdClients = []cobra.Command{
return
}
client.Status = clients.EnabledStatus.String()
client, err := sdk.CreateClient(client, args[1], args[2])
client, err := sdk.CreateClient(cmd.Context(), client, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -64,7 +64,7 @@ var cmdClients = []cobra.Command{
Metadata: metadata,
}
if args[0] == all {
l, err := sdk.Clients(pageMetadata, args[1], args[2])
l, err := sdk.Clients(cmd.Context(), pageMetadata, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -72,7 +72,7 @@ var cmdClients = []cobra.Command{
logJSONCmd(*cmd, l)
return
}
t, err := sdk.Client(args[0], args[1], args[2])
t, err := sdk.Client(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -92,7 +92,7 @@ var cmdClients = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
if err := sdk.DeleteClient(args[0], args[1], args[2]); err != nil {
if err := sdk.DeleteClient(cmd.Context(), args[0], args[1], args[2]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -120,7 +120,7 @@ var cmdClients = []cobra.Command{
return
}
client.ID = args[1]
client, err := sdk.UpdateClientTags(client, args[3], args[4])
client, err := sdk.UpdateClientTags(cmd.Context(), client, args[3], args[4])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -131,7 +131,7 @@ var cmdClients = []cobra.Command{
}
if args[0] == "secret" {
client, err := sdk.UpdateClientSecret(args[1], args[2], args[3], args[4])
client, err := sdk.UpdateClientSecret(cmd.Context(), args[1], args[2], args[3], args[4])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -146,7 +146,7 @@ var cmdClients = []cobra.Command{
return
}
client.ID = args[0]
client, err := sdk.UpdateClient(client, args[2], args[3])
client, err := sdk.UpdateClient(cmd.Context(), client, args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -167,7 +167,7 @@ var cmdClients = []cobra.Command{
return
}
client, err := sdk.EnableClient(args[0], args[1], args[2])
client, err := sdk.EnableClient(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -188,7 +188,7 @@ var cmdClients = []cobra.Command{
return
}
client, err := sdk.DisableClient(args[0], args[1], args[2])
client, err := sdk.DisableClient(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -220,7 +220,7 @@ var cmdClients = []cobra.Command{
ClientIDs: []string{args[0]},
Types: conn_types,
}
if err := sdk.Connect(connIDs, args[3], args[4]); err != nil {
if err := sdk.Connect(cmd.Context(), connIDs, args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -252,7 +252,7 @@ var cmdClients = []cobra.Command{
ChannelIDs: []string{args[1]},
Types: conn_types,
}
if err := sdk.Disconnect(connIDs, args[3], args[4]); err != nil {
if err := sdk.Disconnect(cmd.Context(), connIDs, args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -275,7 +275,7 @@ var cmdClients = []cobra.Command{
Offset: Offset,
Limit: Limit,
}
ul, err := sdk.ListClientMembers(args[0], args[1], pm, args[2])
ul, err := sdk.ListClientMembers(cmd.Context(), args[0], args[1], pm, args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -305,7 +305,7 @@ var cmdClientsRoles = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
r, err := sdk.CreateClientRole(args[1], args[2], roleReq, args[3])
r, err := sdk.CreateClientRole(cmd.Context(), args[1], args[2], roleReq, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -333,7 +333,7 @@ var cmdClientsRoles = []cobra.Command{
Limit: Limit,
}
if args[0] == all {
rs, err := sdk.ClientRoles(args[1], args[2], pageMetadata, args[3])
rs, err := sdk.ClientRoles(cmd.Context(), args[1], args[2], pageMetadata, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -341,7 +341,7 @@ var cmdClientsRoles = []cobra.Command{
logJSONCmd(*cmd, rs)
return
}
r, err := sdk.ClientRole(args[1], args[0], args[2], args[3])
r, err := sdk.ClientRole(cmd.Context(), args[1], args[0], args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -364,7 +364,7 @@ var cmdClientsRoles = []cobra.Command{
return
}
r, err := sdk.UpdateClientRole(args[2], args[1], args[0], args[3], args[4])
r, err := sdk.UpdateClientRole(cmd.Context(), args[2], args[1], args[0], args[3], args[4])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -387,7 +387,7 @@ var cmdClientsRoles = []cobra.Command{
return
}
if err := sdk.DeleteClientRole(args[1], args[0], args[2], args[3]); err != nil {
if err := sdk.DeleteClientRole(cmd.Context(), args[1], args[0], args[2], args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -418,7 +418,7 @@ var cmdClientsActions = []cobra.Command{
return
}
acts, err := sdk.AddClientRoleActions(args[2], args[1], args[3], actions.Actions, args[4])
acts, err := sdk.AddClientRoleActions(cmd.Context(), args[2], args[1], args[3], actions.Actions, args[4])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -441,7 +441,7 @@ var cmdClientsActions = []cobra.Command{
return
}
l, err := sdk.ClientRoleActions(args[1], args[0], args[2], args[3])
l, err := sdk.ClientRoleActions(cmd.Context(), args[1], args[0], args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -465,7 +465,7 @@ var cmdClientsActions = []cobra.Command{
return
}
if args[0] == all {
if err := sdk.RemoveAllClientRoleActions(args[2], args[1], args[3], args[4]); err != nil {
if err := sdk.RemoveAllClientRoleActions(cmd.Context(), args[2], args[1], args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -479,7 +479,7 @@ var cmdClientsActions = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.RemoveClientRoleActions(args[2], args[1], args[3], actions.Actions, args[4]); err != nil {
if err := sdk.RemoveClientRoleActions(cmd.Context(), args[2], args[1], args[3], actions.Actions, args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -500,7 +500,7 @@ var cmdClientsActions = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
acts, err := sdk.AvailableClientRoleActions(args[0], args[1])
acts, err := sdk.AvailableClientRoleActions(cmd.Context(), args[0], args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -532,7 +532,7 @@ var cmdClientMembers = []cobra.Command{
return
}
memb, err := sdk.AddClientRoleMembers(args[2], args[1], args[3], members.Members, args[4])
memb, err := sdk.AddClientRoleMembers(cmd.Context(), args[2], args[1], args[3], members.Members, args[4])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -559,7 +559,7 @@ var cmdClientMembers = []cobra.Command{
Limit: Limit,
}
l, err := sdk.ClientRoleMembers(args[1], args[0], args[2], pageMetadata, args[3])
l, err := sdk.ClientRoleMembers(cmd.Context(), args[1], args[0], args[2], pageMetadata, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -584,7 +584,7 @@ var cmdClientMembers = []cobra.Command{
return
}
if args[0] == all {
if err := sdk.RemoveAllClientRoleMembers(args[2], args[1], args[3], args[4]); err != nil {
if err := sdk.RemoveAllClientRoleMembers(cmd.Context(), args[2], args[1], args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -600,7 +600,7 @@ var cmdClientMembers = []cobra.Command{
return
}
if err := sdk.RemoveClientRoleMembers(args[2], args[1], args[3], members.Members, args[4]); err != nil {
if err := sdk.RemoveClientRoleMembers(cmd.Context(), args[2], args[1], args[3], members.Members, args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
cli/clients_test.go
+22 -22
View File
@@ -434,9 +434,9 @@ func TestUpdateClientCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
var tg smqsdk.Client
sdkCall := sdkMock.On("UpdateClient", mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
sdkCall1 := sdkMock.On("UpdateClientTags", mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
sdkCall2 := sdkMock.On("UpdateClientSecret", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
sdkCall := sdkMock.On("UpdateClient", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
sdkCall1 := sdkMock.On("UpdateClientTags", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
sdkCall2 := sdkMock.On("UpdateClientSecret", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.client, tc.sdkErr)
switch {
case tc.args[0] == tagUpdateType:
@@ -530,7 +530,7 @@ func TestDeleteClientCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DeleteClient", tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
sdkCall := sdkMock.On("DeleteClient", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{delCmd}, tc.args...)...)
switch tc.logType {
@@ -608,7 +608,7 @@ func TestEnableClientCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("EnableClient", tc.args[0], tc.args[1], tc.args[2]).Return(tc.client, tc.sdkErr)
sdkCall := sdkMock.On("EnableClient", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.client, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{enableCmd}, tc.args...)...)
switch tc.logType {
@@ -689,7 +689,7 @@ func TestDisableclientCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DisableClient", tc.args[0], tc.args[1], tc.args[2]).Return(tc.client, tc.sdkErr)
sdkCall := sdkMock.On("DisableClient", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.client, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{disableCmd}, tc.args...)...)
switch tc.logType {
@@ -789,7 +789,7 @@ func TestConnectClientCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Connect", mock.Anything, tc.args[3], tc.args[4]).Return(tc.sdkErr)
sdkCall := sdkMock.On("Connect", mock.Anything, mock.Anything, tc.args[3], tc.args[4]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{connCmd}, tc.args...)...)
switch tc.logType {
@@ -884,7 +884,7 @@ func TestDisconnectClientCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Disconnect", mock.Anything, tc.args[3], tc.args[4]).Return(tc.sdkErr)
sdkCall := sdkMock.On("Disconnect", mock.Anything, mock.Anything, tc.args[3], tc.args[4]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{disconnCmd}, tc.args...)...)
switch tc.logType {
@@ -950,7 +950,7 @@ func TestCreateClientRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("CreateClientRole", tc.args[1], tc.args[2], roleReq, tc.args[3]).Return(tc.role, tc.sdkErr)
sdkCall := sdkMock.On("CreateClientRole", mock.Anything, tc.args[1], tc.args[2], roleReq, tc.args[3]).Return(tc.role, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "create"}, tc.args...)...)
switch tc.logType {
@@ -1021,9 +1021,9 @@ func TestGetClientRolesCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ClientRoles", tc.args[1], tc.args[2], mock.Anything, tc.args[3]).Return(tc.roles, tc.sdkErr)
sdkCall := sdkMock.On("ClientRoles", mock.Anything, tc.args[1], tc.args[2], mock.Anything, tc.args[3]).Return(tc.roles, tc.sdkErr)
if tc.args[0] != all {
sdkCall = sdkMock.On("ClientRole", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(role, tc.sdkErr)
sdkCall = sdkMock.On("ClientRole", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(role, tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{"roles", "get"}, tc.args...)...)
@@ -1091,7 +1091,7 @@ func TestUpdateClientRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("UpdateClientRole", tc.args[2], tc.args[1], tc.args[0], tc.args[3], tc.args[4]).Return(tc.role, tc.sdkErr)
sdkCall := sdkMock.On("UpdateClientRole", mock.Anything, tc.args[2], tc.args[1], tc.args[0], tc.args[3], tc.args[4]).Return(tc.role, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "update"}, tc.args...)...)
switch tc.logType {
@@ -1148,7 +1148,7 @@ func TestDeleteClientRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DeleteClientRole", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.sdkErr)
sdkCall := sdkMock.On("DeleteClientRole", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "delete"}, tc.args...)...)
switch tc.logType {
@@ -1212,7 +1212,7 @@ func TestAddClientRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AddClientRoleActions", tc.args[2], tc.args[1], tc.args[3], tc.actions, tc.args[4]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("AddClientRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.actions, tc.args[4]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "add"}, tc.args...)...)
switch tc.logType {
@@ -1273,7 +1273,7 @@ func TestListClientRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ClientRoleActions", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("ClientRoleActions", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "list"}, tc.args...)...)
switch tc.logType {
@@ -1351,9 +1351,9 @@ func TestDeleteClientRoleActionsCmd(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
var sdkCall *mock.Call
if tc.args[0] == all {
sdkCall = sdkMock.On("RemoveAllClientRoleActions", tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveAllClientRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
} else {
sdkCall = sdkMock.On("RemoveClientRoleActions", tc.args[2], tc.args[1], tc.args[3], actions.Actions, tc.args[4]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveClientRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], actions.Actions, tc.args[4]).Return(tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "delete"}, tc.args...)...)
@@ -1408,7 +1408,7 @@ func TestAvailableClientRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AvailableClientRoleActions", tc.args[0], tc.args[1]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("AvailableClientRoleActions", mock.Anything, tc.args[0], tc.args[1]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "available-actions"}, tc.args...)...)
switch tc.logType {
@@ -1475,7 +1475,7 @@ func TestAddClientRoleMembersCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AddClientRoleMembers", tc.args[2], tc.args[1], tc.args[3], tc.members, tc.args[4]).Return(tc.members, tc.sdkErr)
sdkCall := sdkMock.On("AddClientRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.members, tc.args[4]).Return(tc.members, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "add"}, tc.args...)...)
switch tc.logType {
@@ -1543,7 +1543,7 @@ func TestListClientRoleMembersCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ClientRoleMembers", tc.args[1], tc.args[0], tc.args[2], mock.Anything, tc.args[3]).Return(tc.members, tc.sdkErr)
sdkCall := sdkMock.On("ClientRoleMembers", mock.Anything, tc.args[1], tc.args[0], tc.args[2], mock.Anything, tc.args[3]).Return(tc.members, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "list"}, tc.args...)...)
switch tc.logType {
@@ -1621,9 +1621,9 @@ func TestDeleteClientRoleMembersCmd(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
var sdkCall *mock.Call
if tc.args[0] == all {
sdkCall = sdkMock.On("RemoveAllClientRoleMembers", tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveAllClientRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
} else {
sdkCall = sdkMock.On("RemoveClientRoleMembers", tc.args[2], tc.args[1], tc.args[3], members.Members, tc.args[4]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveClientRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], members.Members, tc.args[4]).Return(tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "delete"}, tc.args...)...)
cli/domains.go
+22 -22
View File
@@ -27,7 +27,7 @@ var cmdDomains = []cobra.Command{
Name: args[0],
Alias: args[1],
}
d, err := sdk.CreateDomain(dom, args[2])
d, err := sdk.CreateDomain(cmd.Context(), dom, args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -57,7 +57,7 @@ var cmdDomains = []cobra.Command{
Status: Status,
}
if args[0] == all {
l, err := sdk.Domains(pageMetadata, args[1])
l, err := sdk.Domains(cmd.Context(), pageMetadata, args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -65,7 +65,7 @@ var cmdDomains = []cobra.Command{
logJSONCmd(*cmd, l)
return
}
d, err := sdk.Domain(args[0], args[1])
d, err := sdk.Domain(cmd.Context(), args[0], args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -96,7 +96,7 @@ var cmdDomains = []cobra.Command{
Status: Status,
}
l, err := sdk.ListDomainMembers(args[0], pageMetadata, args[1])
l, err := sdk.ListDomainMembers(cmd.Context(), args[0], pageMetadata, args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -124,7 +124,7 @@ var cmdDomains = []cobra.Command{
return
}
d.ID = args[0]
d, err := sdk.UpdateDomain(d, args[2])
d, err := sdk.UpdateDomain(cmd.Context(), d, args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -145,7 +145,7 @@ var cmdDomains = []cobra.Command{
return
}
if err := sdk.EnableDomain(args[0], args[1]); err != nil {
if err := sdk.EnableDomain(cmd.Context(), args[0], args[1]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -165,7 +165,7 @@ var cmdDomains = []cobra.Command{
return
}
if err := sdk.DisableDomain(args[0], args[1]); err != nil {
if err := sdk.DisableDomain(cmd.Context(), args[0], args[1]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -185,7 +185,7 @@ var cmdDomains = []cobra.Command{
return
}
if err := sdk.FreezeDomain(args[0], args[1]); err != nil {
if err := sdk.FreezeDomain(cmd.Context(), args[0], args[1]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -213,7 +213,7 @@ var cmdDomainRoles = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
r, err := sdk.CreateDomainRole(args[1], roleReq, args[2])
r, err := sdk.CreateDomainRole(cmd.Context(), args[1], roleReq, args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -241,7 +241,7 @@ var cmdDomainRoles = []cobra.Command{
Limit: Limit,
}
if args[0] == all {
rs, err := sdk.DomainRoles(args[1], pageMetadata, args[2])
rs, err := sdk.DomainRoles(cmd.Context(), args[1], pageMetadata, args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -249,7 +249,7 @@ var cmdDomainRoles = []cobra.Command{
logJSONCmd(*cmd, rs)
return
}
r, err := sdk.DomainRole(args[0], args[1], args[2])
r, err := sdk.DomainRole(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -272,7 +272,7 @@ var cmdDomainRoles = []cobra.Command{
return
}
r, err := sdk.UpdateDomainRole(args[2], args[1], args[0], args[3])
r, err := sdk.UpdateDomainRole(cmd.Context(), args[2], args[1], args[0], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -295,7 +295,7 @@ var cmdDomainRoles = []cobra.Command{
return
}
if err := sdk.DeleteDomainRole(args[1], args[0], args[2]); err != nil {
if err := sdk.DeleteDomainRole(cmd.Context(), args[1], args[0], args[2]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -326,7 +326,7 @@ var cmdDomainsActions = []cobra.Command{
return
}
acts, err := sdk.AddDomainRoleActions(args[2], args[1], actions.Actions, args[3])
acts, err := sdk.AddDomainRoleActions(cmd.Context(), args[2], args[1], actions.Actions, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -349,7 +349,7 @@ var cmdDomainsActions = []cobra.Command{
return
}
l, err := sdk.DomainRoleActions(args[1], args[0], args[2])
l, err := sdk.DomainRoleActions(cmd.Context(), args[1], args[0], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -373,7 +373,7 @@ var cmdDomainsActions = []cobra.Command{
return
}
if args[0] == all {
if err := sdk.RemoveAllDomainRoleActions(args[2], args[1], args[3]); err != nil {
if err := sdk.RemoveAllDomainRoleActions(cmd.Context(), args[2], args[1], args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -387,7 +387,7 @@ var cmdDomainsActions = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.RemoveDomainRoleActions(args[2], args[1], actions.Actions, args[3]); err != nil {
if err := sdk.RemoveDomainRoleActions(cmd.Context(), args[2], args[1], actions.Actions, args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -408,7 +408,7 @@ var cmdDomainsActions = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
acts, err := sdk.AvailableDomainRoleActions(args[0])
acts, err := sdk.AvailableDomainRoleActions(cmd.Context(), args[0])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -440,7 +440,7 @@ var cmdDomainsMembers = []cobra.Command{
return
}
memb, err := sdk.AddDomainRoleMembers(args[2], args[1], members.Members, args[3])
memb, err := sdk.AddDomainRoleMembers(cmd.Context(), args[2], args[1], members.Members, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -467,7 +467,7 @@ var cmdDomainsMembers = []cobra.Command{
Limit: Limit,
}
l, err := sdk.DomainRoleMembers(args[1], args[0], pageMetadata, args[2])
l, err := sdk.DomainRoleMembers(cmd.Context(), args[1], args[0], pageMetadata, args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -492,7 +492,7 @@ var cmdDomainsMembers = []cobra.Command{
return
}
if args[0] == all {
if err := sdk.RemoveAllDomainRoleMembers(args[2], args[1], args[3]); err != nil {
if err := sdk.RemoveAllDomainRoleMembers(cmd.Context(), args[2], args[1], args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -508,7 +508,7 @@ var cmdDomainsMembers = []cobra.Command{
return
}
if err := sdk.RemoveDomainRoleMembers(args[2], args[1], members.Members, args[3]); err != nil {
if err := sdk.RemoveDomainRoleMembers(cmd.Context(), args[2], args[1], members.Members, args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
cli/domains_test.go
+20 -20
View File
@@ -80,7 +80,7 @@ func TestCreateDomainsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("CreateDomain", mock.Anything, mock.Anything).Return(tc.domain, tc.sdkErr)
sdkCall := sdkMock.On("CreateDomain", mock.Anything, mock.Anything, mock.Anything).Return(tc.domain, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{createCmd}, tc.args...)...)
switch tc.logType {
@@ -170,8 +170,8 @@ func TestGetDomainsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Domain", tc.args[0], tc.args[1]).Return(tc.domain, tc.sdkErr)
sdkCall1 := sdkMock.On("Domains", mock.Anything, tc.args[1]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("Domain", mock.Anything, tc.args[0], tc.args[1]).Return(tc.domain, tc.sdkErr)
sdkCall1 := sdkMock.On("Domains", mock.Anything, mock.Anything, tc.args[1]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
@@ -262,7 +262,7 @@ func TestUpdateDomainCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
var dom smqsdk.Domain
sdkCall := sdkMock.On("UpdateDomain", mock.Anything, tc.args[2]).Return(tc.domain, tc.sdkErr)
sdkCall := sdkMock.On("UpdateDomain", mock.Anything, mock.Anything, tc.args[2]).Return(tc.domain, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{updCmd}, tc.args...)...)
switch tc.logType {
@@ -334,7 +334,7 @@ func TestEnableDomainCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("EnableDomain", tc.args[0], tc.args[1]).Return(tc.sdkErr)
sdkCall := sdkMock.On("EnableDomain", mock.Anything, tc.args[0], tc.args[1]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{enableCmd}, tc.args...)...)
switch tc.logType {
@@ -405,7 +405,7 @@ func TestDisableDomainCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DisableDomain", tc.args[0], tc.args[1]).Return(tc.sdkErr)
sdkCall := sdkMock.On("DisableDomain", mock.Anything, tc.args[0], tc.args[1]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{disableCmd}, tc.args...)...)
switch tc.logType {
@@ -476,7 +476,7 @@ func TestFreezeDomainCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("FreezeDomain", tc.args[0], tc.args[1]).Return(tc.sdkErr)
sdkCall := sdkMock.On("FreezeDomain", mock.Anything, tc.args[0], tc.args[1]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{freezeCmd}, tc.args...)...)
switch tc.logType {
@@ -557,7 +557,7 @@ func TestCreateDomainRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("CreateDomainRole", tc.args[1], tc.roleReq, tc.args[2]).Return(tc.role, tc.sdkErr)
sdkCall := sdkMock.On("CreateDomainRole", mock.Anything, tc.args[1], tc.roleReq, tc.args[2]).Return(tc.role, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "create"}, tc.args...)...)
switch tc.logType {
@@ -631,7 +631,7 @@ func TestGetDomainRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DomainRole", tc.args[0], tc.args[1], tc.args[2]).Return(tc.role, tc.sdkErr)
sdkCall := sdkMock.On("DomainRole", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.role, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "get"}, tc.args...)...)
switch tc.logType {
@@ -709,7 +709,7 @@ func TestUpdateDomainRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("UpdateDomainRole", tc.args[2], tc.args[1], tc.args[0], tc.args[3]).Return(tc.role, tc.sdkErr)
sdkCall := sdkMock.On("UpdateDomainRole", mock.Anything, tc.args[2], tc.args[1], tc.args[0], tc.args[3]).Return(tc.role, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "update"}, tc.args...)...)
switch tc.logType {
@@ -775,7 +775,7 @@ func TestDeleteDomainRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DeleteDomainRole", tc.args[1], tc.args[0], tc.args[2]).Return(tc.sdkErr)
sdkCall := sdkMock.On("DeleteDomainRole", mock.Anything, tc.args[1], tc.args[0], tc.args[2]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "delete"}, tc.args...)...)
switch tc.logType {
@@ -844,7 +844,7 @@ func TestAddDomainRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AddDomainRoleActions", tc.args[2], tc.args[1], tc.actions, tc.args[3]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("AddDomainRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.actions, tc.args[3]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "add"}, tc.args...)...)
switch tc.logType {
@@ -912,7 +912,7 @@ func TestListDomainRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DomainRoleActions", tc.args[1], tc.args[0], tc.args[2]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("DomainRoleActions", mock.Anything, tc.args[1], tc.args[0], tc.args[2]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "list"}, tc.args...)...)
switch tc.logType {
@@ -996,9 +996,9 @@ func TestDeleteDomainRoleActionsCmd(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
var sdkCall *mock.Call
if tc.args[0] == all {
sdkCall = sdkMock.On("RemoveAllDomainRoleActions", tc.args[2], tc.args[1], tc.args[3]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveAllDomainRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3]).Return(tc.sdkErr)
} else {
sdkCall = sdkMock.On("RemoveDomainRoleActions", tc.args[2], tc.args[1], tc.actions, tc.args[3]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveDomainRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.actions, tc.args[3]).Return(tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "delete"}, tc.args...)...)
@@ -1058,7 +1058,7 @@ func TestAvailableDomainRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AvailableDomainRoleActions", tc.args[0]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("AvailableDomainRoleActions", mock.Anything, tc.args[0]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "available-actions"}, tc.args...)...)
switch tc.logType {
@@ -1133,7 +1133,7 @@ func TestAddDomainRoleMembersCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AddDomainRoleMembers", tc.args[2], tc.args[1], tc.members, tc.args[3]).Return(tc.members, tc.sdkErr)
sdkCall := sdkMock.On("AddDomainRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.members, tc.args[3]).Return(tc.members, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "add"}, tc.args...)...)
switch tc.logType {
@@ -1208,7 +1208,7 @@ func TestListDomainRoleMembersCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DomainRoleMembers", tc.args[1], tc.args[0], mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("DomainRoleMembers", mock.Anything, tc.args[1], tc.args[0], mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "list"}, tc.args...)...)
switch tc.logType {
@@ -1292,9 +1292,9 @@ func TestDeleteDomainRoleMembersCmd(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
var sdkCall *mock.Call
if tc.args[0] == all {
sdkCall = sdkMock.On("RemoveAllDomainRoleMembers", tc.args[2], tc.args[1], tc.args[3]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveAllDomainRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3]).Return(tc.sdkErr)
} else {
sdkCall = sdkMock.On("RemoveDomainRoleMembers", tc.args[2], tc.args[1], members, tc.args[3]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveDomainRoleMembers", mock.Anything, tc.args[2], tc.args[1], members, tc.args[3]).Return(tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "delete"}, tc.args...)...)
cli/groups.go
+19 -19
View File
@@ -29,7 +29,7 @@ var cmdGroups = []cobra.Command{
return
}
group.Status = groups.EnabledStatus.String()
group, err := sdk.CreateGroup(group, args[1], args[2])
group, err := sdk.CreateGroup(cmd.Context(), group, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -55,7 +55,7 @@ var cmdGroups = []cobra.Command{
return
}
group, err := sdk.UpdateGroup(group, args[1], args[2])
group, err := sdk.UpdateGroup(cmd.Context(), group, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -75,7 +75,7 @@ var cmdGroups = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
if err := sdk.DeleteGroup(args[0], args[1], args[2]); err != nil {
if err := sdk.DeleteGroup(cmd.Context(), args[0], args[1], args[2]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -94,7 +94,7 @@ var cmdGroups = []cobra.Command{
return
}
group, err := sdk.EnableGroup(args[0], args[1], args[2])
group, err := sdk.EnableGroup(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -115,7 +115,7 @@ var cmdGroups = []cobra.Command{
return
}
group, err := sdk.DisableGroup(args[0], args[1], args[2])
group, err := sdk.DisableGroup(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -145,7 +145,7 @@ var cmdGroupsRoles = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
r, err := sdk.CreateGroupRole(args[1], args[2], roleReq, args[3])
r, err := sdk.CreateGroupRole(cmd.Context(), args[1], args[2], roleReq, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -173,7 +173,7 @@ var cmdGroupsRoles = []cobra.Command{
Limit: Limit,
}
if args[0] == all {
rs, err := sdk.GroupRoles(args[1], args[2], pageMetadata, args[3])
rs, err := sdk.GroupRoles(cmd.Context(), args[1], args[2], pageMetadata, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -181,7 +181,7 @@ var cmdGroupsRoles = []cobra.Command{
logJSONCmd(*cmd, rs)
return
}
r, err := sdk.GroupRole(args[1], args[0], args[2], args[3])
r, err := sdk.GroupRole(cmd.Context(), args[1], args[0], args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -204,7 +204,7 @@ var cmdGroupsRoles = []cobra.Command{
return
}
r, err := sdk.UpdateGroupRole(args[2], args[1], args[0], args[3], args[4])
r, err := sdk.UpdateGroupRole(cmd.Context(), args[2], args[1], args[0], args[3], args[4])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -227,7 +227,7 @@ var cmdGroupsRoles = []cobra.Command{
return
}
if err := sdk.DeleteGroupRole(args[1], args[0], args[2], args[3]); err != nil {
if err := sdk.DeleteGroupRole(cmd.Context(), args[1], args[0], args[2], args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -258,7 +258,7 @@ var cmdGroupsActions = []cobra.Command{
return
}
acts, err := sdk.AddGroupRoleActions(args[2], args[1], args[3], actions.Actions, args[4])
acts, err := sdk.AddGroupRoleActions(cmd.Context(), args[2], args[1], args[3], actions.Actions, args[4])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -281,7 +281,7 @@ var cmdGroupsActions = []cobra.Command{
return
}
l, err := sdk.GroupRoleActions(args[1], args[0], args[2], args[3])
l, err := sdk.GroupRoleActions(cmd.Context(), args[1], args[0], args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -305,7 +305,7 @@ var cmdGroupsActions = []cobra.Command{
return
}
if args[0] == all {
if err := sdk.RemoveAllGroupRoleActions(args[2], args[1], args[3], args[4]); err != nil {
if err := sdk.RemoveAllGroupRoleActions(cmd.Context(), args[2], args[1], args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -319,7 +319,7 @@ var cmdGroupsActions = []cobra.Command{
logErrorCmd(*cmd, err)
return
}
if err := sdk.RemoveGroupRoleActions(args[2], args[1], args[3], actions.Actions, args[4]); err != nil {
if err := sdk.RemoveGroupRoleActions(cmd.Context(), args[2], args[1], args[3], actions.Actions, args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -340,7 +340,7 @@ var cmdGroupsActions = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
acts, err := sdk.AvailableGroupRoleActions(args[0], args[1])
acts, err := sdk.AvailableGroupRoleActions(cmd.Context(), args[0], args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -372,7 +372,7 @@ var cmdGroupMembers = []cobra.Command{
return
}
memb, err := sdk.AddGroupRoleMembers(args[2], args[1], args[3], members.Members, args[4])
memb, err := sdk.AddGroupRoleMembers(cmd.Context(), args[2], args[1], args[3], members.Members, args[4])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -399,7 +399,7 @@ var cmdGroupMembers = []cobra.Command{
Limit: Limit,
}
l, err := sdk.GroupRoleMembers(args[1], args[0], args[2], pageMetadata, args[3])
l, err := sdk.GroupRoleMembers(cmd.Context(), args[1], args[0], args[2], pageMetadata, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -424,7 +424,7 @@ var cmdGroupMembers = []cobra.Command{
return
}
if args[0] == all {
if err := sdk.RemoveAllGroupRoleMembers(args[2], args[1], args[3], args[4]); err != nil {
if err := sdk.RemoveAllGroupRoleMembers(cmd.Context(), args[2], args[1], args[3], args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -440,7 +440,7 @@ var cmdGroupMembers = []cobra.Command{
return
}
if err := sdk.RemoveGroupRoleMembers(args[2], args[1], args[3], members.Members, args[4]); err != nil {
if err := sdk.RemoveGroupRoleMembers(cmd.Context(), args[2], args[1], args[3], members.Members, args[4]); err != nil {
logErrorCmd(*cmd, err)
return
}
cli/groups_test.go
+19 -19
View File
@@ -98,7 +98,7 @@ func TestCreateGroupCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("CreateGroup", mock.Anything, tc.args[1], tc.args[2]).Return(tc.group, tc.sdkErr)
sdkCall := sdkMock.On("CreateGroup", mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.group, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{createCmd}, tc.args...)...)
switch tc.logType {
@@ -174,7 +174,7 @@ func TestDeletegroupCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DeleteGroup", tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
sdkCall := sdkMock.On("DeleteGroup", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{delCmd}, tc.args...)...)
switch tc.logType {
@@ -254,7 +254,7 @@ func TestUpdategroupCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
var ch smqsdk.Group
sdkCall := sdkMock.On("UpdateGroup", mock.Anything, tc.args[1], tc.args[2]).Return(tc.group, tc.sdkErr)
sdkCall := sdkMock.On("UpdateGroup", mock.Anything, mock.Anything, tc.args[1], tc.args[2]).Return(tc.group, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{updCmd}, tc.args...)...)
switch tc.logType {
@@ -333,7 +333,7 @@ func TestEnablegroupCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("EnableGroup", tc.args[0], tc.args[1], tc.args[2]).Return(tc.group, tc.sdkErr)
sdkCall := sdkMock.On("EnableGroup", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.group, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{enableCmd}, tc.args...)...)
switch tc.logType {
@@ -414,7 +414,7 @@ func TestDisablegroupCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DisableGroup", tc.args[0], tc.args[1], tc.args[2]).Return(tc.group, tc.sdkErr)
sdkCall := sdkMock.On("DisableGroup", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.group, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{disableCmd}, tc.args...)...)
switch tc.logType {
@@ -485,7 +485,7 @@ func TestCreateGroupRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("CreateGroupRole", tc.args[1], tc.args[2], roleReq, tc.args[3]).Return(tc.role, tc.sdkErr)
sdkCall := sdkMock.On("CreateGroupRole", mock.Anything, tc.args[1], tc.args[2], roleReq, tc.args[3]).Return(tc.role, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "create"}, tc.args...)...)
switch tc.logType {
@@ -556,9 +556,9 @@ func TestGetGroupRolesCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("GroupRoles", tc.args[1], tc.args[2], mock.Anything, tc.args[3]).Return(tc.roles, tc.sdkErr)
sdkCall := sdkMock.On("GroupRoles", mock.Anything, tc.args[1], tc.args[2], mock.Anything, tc.args[3]).Return(tc.roles, tc.sdkErr)
if tc.args[0] != all {
sdkCall = sdkMock.On("GroupRole", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(role, tc.sdkErr)
sdkCall = sdkMock.On("GroupRole", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(role, tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{"roles", "get"}, tc.args...)...)
@@ -626,7 +626,7 @@ func TestUpdateGroupRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("UpdateGroupRole", tc.args[2], tc.args[1], tc.args[0], tc.args[3], tc.args[4]).Return(tc.role, tc.sdkErr)
sdkCall := sdkMock.On("UpdateGroupRole", mock.Anything, tc.args[2], tc.args[1], tc.args[0], tc.args[3], tc.args[4]).Return(tc.role, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "update"}, tc.args...)...)
switch tc.logType {
@@ -683,7 +683,7 @@ func TestDeleteGroupRoleCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DeleteGroupRole", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.sdkErr)
sdkCall := sdkMock.On("DeleteGroupRole", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "delete"}, tc.args...)...)
switch tc.logType {
@@ -747,7 +747,7 @@ func TestAddGroupRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AddGroupRoleActions", tc.args[2], tc.args[1], tc.args[3], tc.actions, tc.args[4]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("AddGroupRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.actions, tc.args[4]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "add"}, tc.args...)...)
switch tc.logType {
@@ -808,7 +808,7 @@ func TestListGroupRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("GroupRoleActions", tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("GroupRoleActions", mock.Anything, tc.args[1], tc.args[0], tc.args[2], tc.args[3]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "list"}, tc.args...)...)
switch tc.logType {
@@ -886,9 +886,9 @@ func TestDeleteGroupRoleActionsCmd(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
var sdkCall *mock.Call
if tc.args[0] == all {
sdkCall = sdkMock.On("RemoveAllGroupRoleActions", tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveAllGroupRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
} else {
sdkCall = sdkMock.On("RemoveGroupRoleActions", tc.args[2], tc.args[1], tc.args[3], actions.Actions, tc.args[4]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveGroupRoleActions", mock.Anything, tc.args[2], tc.args[1], tc.args[3], actions.Actions, tc.args[4]).Return(tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "delete"}, tc.args...)...)
@@ -943,7 +943,7 @@ func TestAvailableGroupRoleActionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AvailableGroupRoleActions", tc.args[0], tc.args[1]).Return(tc.actions, tc.sdkErr)
sdkCall := sdkMock.On("AvailableGroupRoleActions", mock.Anything, tc.args[0], tc.args[1]).Return(tc.actions, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "actions", "available-actions"}, tc.args...)...)
switch tc.logType {
@@ -1010,7 +1010,7 @@ func TestAddGroupRoleMembersCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AddGroupRoleMembers", tc.args[2], tc.args[1], tc.args[3], tc.members, tc.args[4]).Return(tc.members, tc.sdkErr)
sdkCall := sdkMock.On("AddGroupRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.members, tc.args[4]).Return(tc.members, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "add"}, tc.args...)...)
switch tc.logType {
@@ -1078,7 +1078,7 @@ func TestListGroupRoleMembersCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("GroupRoleMembers", tc.args[1], tc.args[0], tc.args[2], mock.Anything, tc.args[3]).Return(tc.members, tc.sdkErr)
sdkCall := sdkMock.On("GroupRoleMembers", mock.Anything, tc.args[1], tc.args[0], tc.args[2], mock.Anything, tc.args[3]).Return(tc.members, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "list"}, tc.args...)...)
switch tc.logType {
@@ -1156,9 +1156,9 @@ func TestDeleteGroupRoleMembersCmd(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
var sdkCall *mock.Call
if tc.args[0] == all {
sdkCall = sdkMock.On("RemoveAllGroupRoleMembers", tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveAllGroupRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], tc.args[4]).Return(tc.sdkErr)
} else {
sdkCall = sdkMock.On("RemoveGroupRoleMembers", tc.args[2], tc.args[1], tc.args[3], members.Members, tc.args[4]).Return(tc.sdkErr)
sdkCall = sdkMock.On("RemoveGroupRoleMembers", mock.Anything, tc.args[2], tc.args[1], tc.args[3], members.Members, tc.args[4]).Return(tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{"roles", "members", "delete"}, tc.args...)...)
cli/invitations.go
+6 -6
View File
@@ -25,7 +25,7 @@ var cmdInvitations = []cobra.Command{
DomainID: args[1],
RoleID: args[2],
}
if err := sdk.SendInvitation(inv, args[3]); err != nil {
if err := sdk.SendInvitation(cmd.Context(), inv, args[3]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -53,7 +53,7 @@ var cmdInvitations = []cobra.Command{
Limit: Limit,
}
if args[0] == all {
l, err := sdk.Invitations(pageMetadata, args[1])
l, err := sdk.Invitations(cmd.Context(), pageMetadata, args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -61,7 +61,7 @@ var cmdInvitations = []cobra.Command{
logJSONCmd(*cmd, l)
return
}
u, err := sdk.Invitation(args[0], args[1], args[2])
u, err := sdk.Invitation(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -82,7 +82,7 @@ var cmdInvitations = []cobra.Command{
return
}
if err := sdk.AcceptInvitation(args[0], args[1]); err != nil {
if err := sdk.AcceptInvitation(cmd.Context(), args[0], args[1]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -102,7 +102,7 @@ var cmdInvitations = []cobra.Command{
return
}
if err := sdk.RejectInvitation(args[0], args[1]); err != nil {
if err := sdk.RejectInvitation(cmd.Context(), args[0], args[1]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -122,7 +122,7 @@ var cmdInvitations = []cobra.Command{
return
}
if err := sdk.DeleteInvitation(args[0], args[1], args[2]); err != nil {
if err := sdk.DeleteInvitation(cmd.Context(), args[0], args[1], args[2]); err != nil {
logErrorCmd(*cmd, err)
return
}
cli/invitations_test.go
+6 -6
View File
@@ -76,7 +76,7 @@ func TestSendUserInvitationCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("SendInvitation", mock.Anything, mock.Anything).Return(tc.sdkErr)
sdkCall := sdkMock.On("SendInvitation", mock.Anything, mock.Anything, mock.Anything).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{sendCmd}, tc.args...)...)
switch tc.logType {
case okLog:
@@ -168,8 +168,8 @@ func TestGetInvitationCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Invitation", tc.args[0], tc.args[1], mock.Anything).Return(tc.inv, tc.sdkErr)
sdkCall1 := sdkMock.On("Invitations", mock.Anything, tc.args[1]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("Invitation", mock.Anything, tc.args[0], tc.args[1], mock.Anything).Return(tc.inv, tc.sdkErr)
sdkCall1 := sdkMock.On("Invitations", mock.Anything, mock.Anything, tc.args[1]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
@@ -239,7 +239,7 @@ func TestAcceptInvitationCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("AcceptInvitation", mock.Anything, mock.Anything).Return(tc.sdkErr)
sdkCall := sdkMock.On("AcceptInvitation", mock.Anything, mock.Anything, mock.Anything).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{acceptCmd}, tc.args...)...)
switch tc.logType {
case okLog:
@@ -298,7 +298,7 @@ func TestRejectInvitationCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("RejectInvitation", mock.Anything, mock.Anything).Return(tc.sdkErr)
sdkCall := sdkMock.On("RejectInvitation", mock.Anything, mock.Anything, mock.Anything).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{rejectCmd}, tc.args...)...)
switch tc.logType {
case okLog:
@@ -360,7 +360,7 @@ func TestDeleteInvitationCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DeleteInvitation", mock.Anything, mock.Anything, mock.Anything).Return(tc.sdkErr)
sdkCall := sdkMock.On("DeleteInvitation", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{delCmd}, tc.args...)...)
switch tc.logType {
case okLog:
cli/journal.go
+1 -1
View File
@@ -32,7 +32,7 @@ var cmdJournal = cobra.Command{
entityType, entityID, domainID, token = args[0], args[1], args[2], args[3]
}
journal, err := sdk.Journal(entityType, entityID, domainID, pageMetadata, token)
journal, err := sdk.Journal(cmd.Context(), entityType, entityID, domainID, pageMetadata, token)
if err != nil {
logErrorCmd(*cmd, err)
return
cli/journal_test.go
+2 -2
View File
@@ -101,9 +101,9 @@ func TestGetJournalCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Journal", tc.args[0], tc.args[1], "", mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("Journal", mock.Anything, tc.args[0], tc.args[1], "", mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
if tc.args[0] != "user" {
sdkCall = sdkMock.On("Journal", tc.args[0], tc.args[1], tc.args[2], mock.Anything, tc.args[3]).Return(tc.page, tc.sdkErr)
sdkCall = sdkMock.On("Journal", mock.Anything, tc.args[0], tc.args[1], tc.args[2], mock.Anything, tc.args[3]).Return(tc.page, tc.sdkErr)
}
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
cli/message.go
+1 -1
View File
@@ -16,7 +16,7 @@ var cmdMessages = []cobra.Command{
return
}
if err := sdk.SendMessage(args[0], args[1], args[2]); err != nil {
if err := sdk.SendMessage(cmd.Context(), args[0], args[1], args[2]); err != nil {
logErrorCmd(*cmd, err)
return
}
cli/message_test.go
+2 -1
View File
@@ -14,6 +14,7 @@ import (
svcerr "github.com/absmach/supermq/pkg/errors/service"
sdkmocks "github.com/absmach/supermq/pkg/sdk/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
func TestSendMesageCmd(t *testing.T) {
@@ -65,7 +66,7 @@ func TestSendMesageCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("SendMessage", 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]).Return(tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{sendCmd}, tc.args...)...)
switch tc.logType {
cli/users.go
+18 -18
View File
@@ -40,7 +40,7 @@ var cmdUsers = []cobra.Command{
},
Status: users.EnabledStatus.String(),
}
user, err := sdk.CreateUser(user, args[5])
user, err := sdk.CreateUser(cmd.Context(), user, args[5])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -76,7 +76,7 @@ var cmdUsers = []cobra.Command{
Status: Status,
}
if args[0] == all {
l, err := sdk.Users(pageMetadata, args[1])
l, err := sdk.Users(cmd.Context(), pageMetadata, args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -84,7 +84,7 @@ var cmdUsers = []cobra.Command{
logJSONCmd(*cmd, l)
return
}
u, err := sdk.User(args[0], args[1])
u, err := sdk.User(cmd.Context(), args[0], args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -110,7 +110,7 @@ var cmdUsers = []cobra.Command{
Password: args[1],
}
token, err := sdk.CreateToken(loginReq)
token, err := sdk.CreateToken(cmd.Context(), loginReq)
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -132,7 +132,7 @@ var cmdUsers = []cobra.Command{
return
}
token, err := sdk.RefreshToken(args[0])
token, err := sdk.RefreshToken(cmd.Context(), args[0])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -164,7 +164,7 @@ var cmdUsers = []cobra.Command{
return
}
user.ID = args[1]
user, err := sdk.UpdateUserTags(user, args[3])
user, err := sdk.UpdateUserTags(cmd.Context(), user, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -177,7 +177,7 @@ var cmdUsers = []cobra.Command{
if args[0] == "email" {
user.ID = args[1]
user.Email = args[2]
user, err := sdk.UpdateUserEmail(user, args[3])
user, err := sdk.UpdateUserEmail(cmd.Context(), user, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -189,7 +189,7 @@ var cmdUsers = []cobra.Command{
if args[0] == "username" {
user.ID = args[1]
user.Credentials.Username = args[2]
user, err := sdk.UpdateUsername(user, args[3])
user, err := sdk.UpdateUsername(cmd.Context(), user, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -203,7 +203,7 @@ var cmdUsers = []cobra.Command{
if args[0] == "role" {
user.ID = args[1]
user.Role = args[2]
user, err := sdk.UpdateUserRole(user, args[3])
user, err := sdk.UpdateUserRole(cmd.Context(), user, args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -219,7 +219,7 @@ var cmdUsers = []cobra.Command{
return
}
user.ID = args[0]
user, err := sdk.UpdateUser(user, args[2])
user, err := sdk.UpdateUser(cmd.Context(), user, args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -240,7 +240,7 @@ var cmdUsers = []cobra.Command{
return
}
user, err := sdk.UserProfile(args[0])
user, err := sdk.UserProfile(cmd.Context(), args[0])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -261,7 +261,7 @@ var cmdUsers = []cobra.Command{
return
}
if err := sdk.ResetPasswordRequest(args[0]); err != nil {
if err := sdk.ResetPasswordRequest(cmd.Context(), args[0]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -281,7 +281,7 @@ var cmdUsers = []cobra.Command{
return
}
if err := sdk.ResetPassword(args[0], args[1], args[2]); err != nil {
if err := sdk.ResetPassword(cmd.Context(), args[0], args[1], args[2]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -301,7 +301,7 @@ var cmdUsers = []cobra.Command{
return
}
user, err := sdk.UpdatePassword(args[0], args[1], args[2])
user, err := sdk.UpdatePassword(cmd.Context(), args[0], args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -322,7 +322,7 @@ var cmdUsers = []cobra.Command{
return
}
user, err := sdk.EnableUser(args[0], args[1])
user, err := sdk.EnableUser(cmd.Context(), args[0], args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -343,7 +343,7 @@ var cmdUsers = []cobra.Command{
return
}
user, err := sdk.DisableUser(args[0], args[1])
user, err := sdk.DisableUser(cmd.Context(), args[0], args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -363,7 +363,7 @@ var cmdUsers = []cobra.Command{
logUsageCmd(*cmd, cmd.Use)
return
}
if err := sdk.DeleteUser(args[0], args[1]); err != nil {
if err := sdk.DeleteUser(cmd.Context(), args[0], args[1]); err != nil {
logErrorCmd(*cmd, err)
return
}
@@ -402,7 +402,7 @@ var cmdUsers = []cobra.Command{
pm.Limit = uint64(lim)
}
users, err := sdk.SearchUsers(pm, args[1])
users, err := sdk.SearchUsers(cmd.Context(), pm, args[1])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/users_test.go
+21 -21
View File
@@ -103,7 +103,7 @@ func TestCreateUsersCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("CreateUser", mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
sdkCall := sdkMock.On("CreateUser", mock.Anything, mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
if len(tc.args) == 4 {
sdkUser := mgsdk.User{
FirstName: tc.args[0],
@@ -113,7 +113,7 @@ func TestCreateUsersCmd(t *testing.T) {
Secret: tc.args[3],
},
}
sdkCall = sdkMock.On("CreateUser", mock.Anything, sdkUser).Return(tc.user, tc.sdkerr)
sdkCall = sdkMock.On("CreateUser", mock.Anything, mock.Anything, sdkUser).Return(tc.user, tc.sdkerr)
}
out := executeCommand(t, rootCmd, append([]string{createCmd}, tc.args...)...)
@@ -240,8 +240,8 @@ func TestGetUsersCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Users", mock.Anything, mock.Anything).Return(tc.page, tc.sdkerr)
sdkCall1 := sdkMock.On("User", tc.args[0], tc.args[1]).Return(tc.user, tc.sdkerr)
sdkCall := sdkMock.On("Users", mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkerr)
sdkCall1 := sdkMock.On("User", mock.Anything, tc.args[0], tc.args[1]).Return(tc.user, tc.sdkerr)
out = executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
@@ -341,7 +341,7 @@ func TestIssueTokenCmd(t *testing.T) {
Username: tc.args[0],
Password: tc.args[1],
}
sdkCall := sdkMock.On("CreateToken", lg).Return(tc.token, tc.sdkerr)
sdkCall := sdkMock.On("CreateToken", mock.Anything, lg).Return(tc.token, tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{tokCmd}, tc.args...)...)
@@ -413,7 +413,7 @@ func TestRefreshIssueTokenCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("RefreshToken", mock.Anything).Return(tc.token, tc.sdkerr)
sdkCall := sdkMock.On("RefreshToken", mock.Anything, mock.Anything).Return(tc.token, tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{refTokCmd}, tc.args...)...)
@@ -588,29 +588,29 @@ func TestUpdateUserCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("UpdateUser", mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
sdkCall1 := sdkMock.On("UpdateUserTags", mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
sdkCall2 := sdkMock.On("UpdateUserIdentity", mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
sdkCall3 := sdkMock.On("UpdateUserRole", mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
sdkCall := sdkMock.On("UpdateUser", mock.Anything, mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
sdkCall1 := sdkMock.On("UpdateUserTags", mock.Anything, mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
sdkCall2 := sdkMock.On("UpdateUserIdentity", mock.Anything, mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
sdkCall3 := sdkMock.On("UpdateUserRole", mock.Anything, mock.Anything, mock.Anything).Return(tc.user, tc.sdkerr)
switch {
case tc.args[0] == tagUpdateType:
var u mgsdk.User
u.Tags = []string{"tag1", "tag2"}
u.ID = tc.args[1]
sdkCall1 = sdkMock.On("UpdateUserTags", u, tc.args[3]).Return(tc.user, tc.sdkerr)
sdkCall1 = sdkMock.On("UpdateUserTags", mock.Anything, u, tc.args[3]).Return(tc.user, tc.sdkerr)
case tc.args[0] == emailUpdateType:
var u mgsdk.User
u.Email = tc.args[2]
u.ID = tc.args[1]
sdkCall2 = sdkMock.On("UpdateUserEmail", u, tc.args[3]).Return(tc.user, tc.sdkerr)
sdkCall2 = sdkMock.On("UpdateUserEmail", mock.Anything, u, tc.args[3]).Return(tc.user, tc.sdkerr)
case tc.args[0] == roleUpdateType && len(tc.args) == 4:
sdkCall3 = sdkMock.On("UpdateUserRole", mgsdk.User{
sdkCall3 = sdkMock.On("UpdateUserRole", mock.Anything, mgsdk.User{
Role: tc.args[2],
}, tc.args[3]).Return(tc.user, tc.sdkerr)
case tc.args[0] == userID:
sdkCall = sdkMock.On("UpdateUser", mgsdk.User{
sdkCall = sdkMock.On("UpdateUser", mock.Anything, mgsdk.User{
FirstName: "new name",
Metadata: mgsdk.Metadata{
"key": "value",
@@ -683,7 +683,7 @@ func TestGetUserProfileCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("UserProfile", tc.args[0]).Return(tc.user, tc.sdkerr)
sdkCall := sdkMock.On("UserProfile", mock.Anything, tc.args[0]).Return(tc.user, tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{profCmd}, tc.args...)...)
switch tc.logType {
@@ -744,7 +744,7 @@ func TestResetPasswordRequestCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ResetPasswordRequest", tc.args[0]).Return(tc.sdkerr)
sdkCall := sdkMock.On("ResetPasswordRequest", mock.Anything, tc.args[0]).Return(tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{resPassReqCmd}, tc.args...)...)
switch tc.logType {
@@ -809,7 +809,7 @@ func TestResetPasswordCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ResetPassword", tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkerr)
sdkCall := sdkMock.On("ResetPassword", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{resPassCmd}, tc.args...)...)
switch tc.logType {
@@ -881,7 +881,7 @@ func TestUpdatePasswordCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("UpdatePassword", tc.args[0], tc.args[1], tc.args[2]).Return(tc.user, tc.sdkerr)
sdkCall := sdkMock.On("UpdatePassword", mock.Anything, tc.args[0], tc.args[1], tc.args[2]).Return(tc.user, tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{passCmd}, tc.args...)...)
switch tc.logType {
@@ -948,7 +948,7 @@ func TestEnableUserCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("EnableUser", tc.args[0], tc.args[1]).Return(tc.user, tc.sdkerr)
sdkCall := sdkMock.On("EnableUser", mock.Anything, tc.args[0], tc.args[1]).Return(tc.user, tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{enableCmd}, tc.args...)...)
switch tc.logType {
@@ -1016,7 +1016,7 @@ func TestDisableUserCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DisableUser", tc.args[0], tc.args[1]).Return(tc.user, tc.sdkerr)
sdkCall := sdkMock.On("DisableUser", mock.Anything, tc.args[0], tc.args[1]).Return(tc.user, tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{disableCmd}, tc.args...)...)
switch tc.logType {
@@ -1109,7 +1109,7 @@ func TestDeleteUserCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("DeleteUser", mock.Anything, mock.Anything).Return(tc.sdkerr)
sdkCall := sdkMock.On("DeleteUser", mock.Anything, mock.Anything, mock.Anything).Return(tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{delCmd}, tc.args...)...)
switch tc.logType {
go.mod
+1
View File
@@ -1,6 +1,7 @@
module github.com/absmach/supermq
go 1.24.2
require (
github.com/0x6flab/namegenerator v1.4.0
github.com/absmach/callhome v0.14.0
pkg/sdk/certs.go
+9 -8
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -28,7 +29,7 @@ type Cert struct {
ClientID string `json:"client_id,omitempty"`
}
func (sdk mgSDK) IssueCert(clientID, validity, domainID, token string) (Cert, errors.SDKError) {
func (sdk mgSDK) IssueCert(ctx context.Context, clientID, validity, domainID, token string) (Cert, errors.SDKError) {
r := certReq{
ClientID: clientID,
Validity: validity,
@@ -40,7 +41,7 @@ func (sdk mgSDK) IssueCert(clientID, validity, domainID, token string) (Cert, er
url := fmt.Sprintf("%s/%s/%s", sdk.certsURL, domainID, certsEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, d, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, d, nil, http.StatusCreated)
if sdkerr != nil {
return Cert{}, sdkerr
}
@@ -52,10 +53,10 @@ func (sdk mgSDK) IssueCert(clientID, validity, domainID, token string) (Cert, er
return c, nil
}
func (sdk mgSDK) ViewCert(id, domainID, token string) (Cert, errors.SDKError) {
func (sdk mgSDK) ViewCert(ctx context.Context, id, domainID, token string) (Cert, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s", sdk.certsURL, domainID, certsEndpoint, id)
_, body, err := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, err := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if err != nil {
return Cert{}, err
}
@@ -68,13 +69,13 @@ func (sdk mgSDK) ViewCert(id, domainID, token string) (Cert, errors.SDKError) {
return cert, nil
}
func (sdk mgSDK) ViewCertByClient(clientID, domainID, token string) (CertSerials, errors.SDKError) {
func (sdk mgSDK) ViewCertByClient(ctx context.Context, clientID, domainID, token string) (CertSerials, errors.SDKError) {
if clientID == "" {
return CertSerials{}, errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s/%s", sdk.certsURL, domainID, serialsEndpoint, clientID)
_, body, err := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, err := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if err != nil {
return CertSerials{}, err
}
@@ -86,10 +87,10 @@ func (sdk mgSDK) ViewCertByClient(clientID, domainID, token string) (CertSerials
return cs, nil
}
func (sdk mgSDK) RevokeCert(id, domainID, token string) (time.Time, errors.SDKError) {
func (sdk mgSDK) RevokeCert(ctx context.Context, id, domainID, token string) (time.Time, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s", sdk.certsURL, domainID, certsEndpoint, id)
_, body, err := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusOK)
_, body, err := sdk.processRequest(ctx, http.MethodDelete, url, token, nil, nil, http.StatusOK)
if err != nil {
return time.Time{}, err
}
pkg/sdk/certs_test.go
+5 -4
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@@ -184,7 +185,7 @@ func TestIssueCert(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("IssueCert", mock.Anything, tc.domainID, tc.token, tc.clientID, tc.duration).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.IssueCert(tc.clientID, tc.duration, tc.domainID, tc.token)
resp, err := mgsdk.IssueCert(context.Background(), tc.clientID, tc.duration, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
assert.Equal(t, tc.svcRes.SerialNumber, resp.SerialNumber)
@@ -268,7 +269,7 @@ func TestViewCert(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("ViewCert", mock.Anything, tc.certID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.ViewCert(tc.certID, tc.domainID, tc.token)
resp, err := mgsdk.ViewCert(context.Background(), tc.certID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if err == nil {
assert.Equal(t, viewCertRes, resp)
@@ -362,7 +363,7 @@ func TestViewCertByClient(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("ListSerials", mock.Anything, tc.clientID, certs.PageMetadata{Revoked: defRevoke, Offset: defOffset, Limit: defLimit}).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.ViewCertByClient(tc.clientID, tc.domainID, tc.token)
resp, err := mgsdk.ViewCertByClient(context.Background(), tc.clientID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
assert.Equal(t, viewCertClientRes, resp)
@@ -451,7 +452,7 @@ func TestRevokeCert(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("RevokeCert", mock.Anything, tc.domainID, tc.token, tc.clientID).Return(tc.svcResp, tc.svcErr)
resp, err := mgsdk.RevokeCert(tc.clientID, tc.domainID, tc.token)
resp, err := mgsdk.RevokeCert(context.Background(), tc.clientID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if err == nil {
assert.NotEmpty(t, resp)
pkg/sdk/channels.go
+35 -34
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -35,14 +36,14 @@ type Channel struct {
Roles []roles.MemberRoleActions `json:"roles,omitempty"`
}
func (sdk mgSDK) CreateChannel(c Channel, domainID, token string) (Channel, errors.SDKError) {
func (sdk mgSDK) CreateChannel(ctx context.Context, c Channel, domainID, token string) (Channel, errors.SDKError) {
data, err := json.Marshal(c)
if err != nil {
return Channel{}, errors.NewSDKError(err)
}
url := fmt.Sprintf("%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
if sdkerr != nil {
return Channel{}, sdkerr
}
@@ -55,7 +56,7 @@ func (sdk mgSDK) CreateChannel(c Channel, domainID, token string) (Channel, erro
return c, nil
}
func (sdk mgSDK) CreateChannels(channels []Channel, domainID, token string) ([]Channel, errors.SDKError) {
func (sdk mgSDK) CreateChannels(ctx context.Context, channels []Channel, domainID, token string) ([]Channel, errors.SDKError) {
data, err := json.Marshal(channels)
if err != nil {
return []Channel{}, errors.NewSDKError(err)
@@ -63,7 +64,7 @@ func (sdk mgSDK) CreateChannels(channels []Channel, domainID, token string) ([]C
url := fmt.Sprintf("%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, "bulk")
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return []Channel{}, sdkerr
}
@@ -76,14 +77,14 @@ func (sdk mgSDK) CreateChannels(channels []Channel, domainID, token string) ([]C
return res.Channels, nil
}
func (sdk mgSDK) Channels(pm PageMetadata, domainID, token string) (ChannelsPage, errors.SDKError) {
func (sdk mgSDK) Channels(ctx context.Context, pm PageMetadata, domainID, token string) (ChannelsPage, errors.SDKError) {
endpoint := fmt.Sprintf("%s/%s", domainID, channelsEndpoint)
url, err := sdk.withQueryParams(sdk.channelsURL, endpoint, pm)
if err != nil {
return ChannelsPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return ChannelsPage{}, sdkerr
}
@@ -96,13 +97,13 @@ func (sdk mgSDK) Channels(pm PageMetadata, domainID, token string) (ChannelsPage
return cp, nil
}
func (sdk mgSDK) Channel(id, domainID, token string) (Channel, errors.SDKError) {
func (sdk mgSDK) Channel(ctx context.Context, id, domainID, token string) (Channel, errors.SDKError) {
if id == "" {
return Channel{}, errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, id)
_, body, err := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, err := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if err != nil {
return Channel{}, err
}
@@ -115,7 +116,7 @@ func (sdk mgSDK) Channel(id, domainID, token string) (Channel, errors.SDKError)
return c, nil
}
func (sdk mgSDK) UpdateChannel(c Channel, domainID, token string) (Channel, errors.SDKError) {
func (sdk mgSDK) UpdateChannel(ctx context.Context, c Channel, domainID, token string) (Channel, errors.SDKError) {
if c.ID == "" {
return Channel{}, errors.NewSDKError(apiutil.ErrMissingID)
}
@@ -126,7 +127,7 @@ func (sdk mgSDK) UpdateChannel(c Channel, domainID, token string) (Channel, erro
return Channel{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return Channel{}, sdkerr
}
@@ -139,7 +140,7 @@ func (sdk mgSDK) UpdateChannel(c Channel, domainID, token string) (Channel, erro
return c, nil
}
func (sdk mgSDK) UpdateChannelTags(c Channel, domainID, token string) (Channel, errors.SDKError) {
func (sdk mgSDK) UpdateChannelTags(ctx context.Context, c Channel, domainID, token string) (Channel, errors.SDKError) {
if c.ID == "" {
return Channel{}, errors.NewSDKError(apiutil.ErrMissingID)
}
@@ -150,7 +151,7 @@ func (sdk mgSDK) UpdateChannelTags(c Channel, domainID, token string) (Channel,
return Channel{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return Channel{}, sdkerr
}
@@ -163,7 +164,7 @@ func (sdk mgSDK) UpdateChannelTags(c Channel, domainID, token string) (Channel,
return c, nil
}
func (sdk mgSDK) Connect(conn Connection, domainID, token string) errors.SDKError {
func (sdk mgSDK) Connect(ctx context.Context, conn Connection, domainID, token string) errors.SDKError {
data, err := json.Marshal(conn)
if err != nil {
return errors.NewSDKError(err)
@@ -171,12 +172,12 @@ func (sdk mgSDK) Connect(conn Connection, domainID, token string) errors.SDKErro
url := fmt.Sprintf("%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, connectEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
return sdkerr
}
func (sdk mgSDK) Disconnect(conn Connection, domainID, token string) errors.SDKError {
func (sdk mgSDK) Disconnect(ctx context.Context, conn Connection, domainID, token string) errors.SDKError {
data, err := json.Marshal(conn)
if err != nil {
return errors.NewSDKError(err)
@@ -184,12 +185,12 @@ func (sdk mgSDK) Disconnect(conn Connection, domainID, token string) errors.SDKE
url := fmt.Sprintf("%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, disconnectEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) ConnectClients(channelID string, clientIDs, connTypes []string, domainID, token string) errors.SDKError {
func (sdk mgSDK) ConnectClients(ctx context.Context, channelID string, clientIDs, connTypes []string, domainID, token string) errors.SDKError {
conn := Connection{
ClientIDs: clientIDs,
Types: connTypes,
@@ -200,12 +201,12 @@ func (sdk mgSDK) ConnectClients(channelID string, clientIDs, connTypes []string,
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, channelID, connectEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
return sdkerr
}
func (sdk mgSDK) DisconnectClients(channelID string, clientIDs, connTypes []string, domainID, token string) errors.SDKError {
func (sdk mgSDK) DisconnectClients(ctx context.Context, channelID string, clientIDs, connTypes []string, domainID, token string) errors.SDKError {
conn := Connection{
ClientIDs: clientIDs,
Types: connTypes,
@@ -216,32 +217,32 @@ func (sdk mgSDK) DisconnectClients(channelID string, clientIDs, connTypes []stri
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, channelID, disconnectEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) EnableChannel(id, domainID, token string) (Channel, errors.SDKError) {
return sdk.changeChannelStatus(id, enableEndpoint, domainID, token)
func (sdk mgSDK) EnableChannel(ctx context.Context, id, domainID, token string) (Channel, errors.SDKError) {
return sdk.changeChannelStatus(ctx, id, enableEndpoint, domainID, token)
}
func (sdk mgSDK) DisableChannel(id, domainID, token string) (Channel, errors.SDKError) {
return sdk.changeChannelStatus(id, disableEndpoint, domainID, token)
func (sdk mgSDK) DisableChannel(ctx context.Context, id, domainID, token string) (Channel, errors.SDKError) {
return sdk.changeChannelStatus(ctx, id, disableEndpoint, domainID, token)
}
func (sdk mgSDK) DeleteChannel(id, domainID, token string) errors.SDKError {
func (sdk mgSDK) DeleteChannel(ctx context.Context, id, domainID, token string) errors.SDKError {
if id == "" {
return errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, id)
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) changeChannelStatus(id, status, domainID, token string) (Channel, errors.SDKError) {
func (sdk mgSDK) changeChannelStatus(ctx context.Context, id, status, domainID, token string) (Channel, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, id, status)
_, body, err := sdk.processRequest(http.MethodPost, url, token, nil, nil, http.StatusOK)
_, body, err := sdk.processRequest(ctx, http.MethodPost, url, token, nil, nil, http.StatusOK)
if err != nil {
return Channel{}, err
}
@@ -253,7 +254,7 @@ func (sdk mgSDK) changeChannelStatus(id, status, domainID, token string) (Channe
return c, nil
}
func (sdk mgSDK) SetChannelParent(id, domainID, groupID, token string) errors.SDKError {
func (sdk mgSDK) SetChannelParent(ctx context.Context, id, domainID, groupID, token string) errors.SDKError {
scpg := parentGroupReq{ParentGroupID: groupID}
data, err := json.Marshal(scpg)
if err != nil {
@@ -261,12 +262,12 @@ func (sdk mgSDK) SetChannelParent(id, domainID, groupID, token string) errors.SD
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, id, parentEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusOK)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusOK)
return sdkerr
}
func (sdk mgSDK) RemoveChannelParent(id, domainID, groupID, token string) errors.SDKError {
func (sdk mgSDK) RemoveChannelParent(ctx context.Context, id, domainID, groupID, token string) errors.SDKError {
rcpg := parentGroupReq{ParentGroupID: groupID}
data, err := json.Marshal(rcpg)
if err != nil {
@@ -274,11 +275,11 @@ func (sdk mgSDK) RemoveChannelParent(id, domainID, groupID, token string) errors
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.channelsURL, domainID, channelsEndpoint, id, parentEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) ListChannelMembers(channelID, domainID string, pm PageMetadata, token string) (EntityMembersPage, errors.SDKError) {
return sdk.listEntityMembers(sdk.channelsURL, domainID, channelsEndpoint, channelID, token, pm)
func (sdk mgSDK) ListChannelMembers(ctx context.Context, channelID, domainID string, pm PageMetadata, token string) (EntityMembersPage, errors.SDKError) {
return sdk.listEntityMembers(ctx, sdk.channelsURL, domainID, channelsEndpoint, channelID, token, pm)
}
pkg/sdk/channels_test.go
+17 -16
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@@ -213,7 +214,7 @@ func TestCreateChannel(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("CreateChannels", mock.Anything, tc.session, []channels.Channel{tc.createChannelReq}).Return(tc.svcRes, []roles.RoleProvision{}, tc.svcErr)
resp, err := mgsdk.CreateChannel(tc.channelReq, tc.domainID, tc.token)
resp, err := mgsdk.CreateChannel(context.Background(), tc.channelReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -333,7 +334,7 @@ func TestCreateChannels(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("CreateChannels", mock.Anything, tc.session, tc.createChannelsReq).Return(tc.svcRes, []roles.RoleProvision{}, tc.svcErr)
resp, err := mgsdk.CreateChannels(tc.channelsReq, tc.domainID, tc.token)
resp, err := mgsdk.CreateChannels(context.Background(), tc.channelsReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
svcCall.Unset()
@@ -604,7 +605,7 @@ func TestListChannels(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("ListChannels", mock.Anything, tc.session, tc.channelsPageMeta).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Channels(pm, tc.domainID, tc.token)
resp, err := mgsdk.Channels(context.Background(), pm, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -743,9 +744,9 @@ func TestViewChannel(t *testing.T) {
switch tc.withRoles {
case true:
resp, err = mgsdkRoles.Channel(tc.channelID, tc.domainID, tc.token)
resp, err = mgsdkRoles.Channel(context.Background(), tc.channelID, tc.domainID, tc.token)
default:
resp, err = mgsdk.Channel(tc.channelID, tc.domainID, tc.token)
resp, err = mgsdk.Channel(context.Background(), tc.channelID, tc.domainID, tc.token)
}
assert.Equal(t, tc.err, err)
@@ -1021,7 +1022,7 @@ func TestUpdateChannel(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("UpdateChannel", mock.Anything, tc.session, tc.updateChannelReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateChannel(tc.channelReq, tc.domainID, tc.token)
resp, err := mgsdk.UpdateChannel(context.Background(), tc.channelReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1172,7 +1173,7 @@ func TestUpdateChannelTags(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("UpdateChannelTags", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateChannelTags(tc.updateChannelReq, tc.domainID, tc.token)
resp, err := mgsdk.UpdateChannelTags(context.Background(), tc.updateChannelReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1279,7 +1280,7 @@ func TestEnableChannel(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("EnableChannel", mock.Anything, tc.session, tc.channelID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.EnableChannel(tc.channelID, tc.domainID, tc.token)
resp, err := mgsdk.EnableChannel(context.Background(), tc.channelID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1389,7 +1390,7 @@ func TestDisableChannel(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("DisableChannel", mock.Anything, tc.session, tc.channelID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.DisableChannel(tc.channelID, tc.domainID, tc.token)
resp, err := mgsdk.DisableChannel(context.Background(), tc.channelID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1469,7 +1470,7 @@ func TestDeleteChannel(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("RemoveChannel", mock.Anything, tc.session, tc.channelID).Return(tc.svcErr)
err := mgsdk.DeleteChannel(tc.channelID, tc.domainID, tc.token)
err := mgsdk.DeleteChannel(context.Background(), tc.channelID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveChannel", mock.Anything, tc.session, tc.channelID)
@@ -1588,7 +1589,7 @@ func TestConnect(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("Connect", mock.Anything, tc.session, tc.connection.ChannelIDs, tc.connection.ClientIDs, connTypes).Return(tc.svcErr)
err := mgsdk.Connect(tc.connection, tc.domainID, tc.token)
err := mgsdk.Connect(context.Background(), tc.connection, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "Connect", mock.Anything, tc.session, tc.connection.ChannelIDs, tc.connection.ClientIDs, connTypes)
@@ -1707,7 +1708,7 @@ func TestDisconnect(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("Disconnect", mock.Anything, tc.session, tc.disconnect.ChannelIDs, tc.disconnect.ClientIDs, connTypes).Return(tc.svcErr)
err := mgsdk.Disconnect(tc.disconnect, tc.domainID, tc.token)
err := mgsdk.Disconnect(context.Background(), tc.disconnect, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "Disconnect", mock.Anything, tc.session, tc.disconnect.ChannelIDs, tc.disconnect.ClientIDs, connTypes)
@@ -1812,7 +1813,7 @@ func TestConnectClients(t *testing.T) {
assert.Nil(t, err, fmt.Sprintf("error parsing connection type %s", tc.connType))
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("Connect", mock.Anything, tc.session, []string{tc.channelID}, []string{tc.clientID}, []connections.ConnType{connType}).Return(tc.svcErr)
err = mgsdk.ConnectClients(tc.channelID, []string{tc.clientID}, []string{tc.connType}, tc.domainID, tc.token)
err = mgsdk.ConnectClients(context.Background(), tc.channelID, []string{tc.clientID}, []string{tc.connType}, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "Connect", mock.Anything, tc.session, []string{tc.channelID}, []string{tc.clientID}, []connections.ConnType{connType})
@@ -1915,7 +1916,7 @@ func TestDisconnectClients(t *testing.T) {
assert.Nil(t, err, fmt.Sprintf("error parsing connection type %s", tc.connType))
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("Disconnect", mock.Anything, tc.session, []string{tc.channelID}, []string{tc.clientID}, []connections.ConnType{connType}).Return(tc.svcErr)
err = mgsdk.DisconnectClients(tc.channelID, []string{tc.clientID}, []string{tc.connType}, tc.domainID, tc.token)
err = mgsdk.DisconnectClients(context.Background(), tc.channelID, []string{tc.clientID}, []string{tc.connType}, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "Disconnect", mock.Anything, tc.session, []string{tc.channelID}, []string{tc.clientID}, []connections.ConnType{connType})
@@ -2010,7 +2011,7 @@ func TestSetChannelParent(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("SetParentGroup", mock.Anything, tc.session, tc.parentID, tc.channelID).Return(tc.svcErr)
err := mgsdk.SetChannelParent(tc.channelID, tc.domainID, tc.parentID, tc.token)
err := mgsdk.SetChannelParent(context.Background(), tc.channelID, tc.domainID, tc.parentID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "SetParentGroup", mock.Anything, tc.session, tc.parentID, tc.channelID)
@@ -2096,7 +2097,7 @@ func TestRemoveChannelParent(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("RemoveParentGroup", mock.Anything, tc.session, tc.channelID).Return(tc.svcErr)
err := mgsdk.RemoveChannelParent(tc.channelID, tc.domainID, tc.parentID, tc.token)
err := mgsdk.RemoveChannelParent(context.Background(), tc.channelID, tc.domainID, tc.parentID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveParentGroup", mock.Anything, tc.session, tc.channelID)
pkg/sdk/clients.go
+57 -56
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -46,7 +47,7 @@ type ClientCredentials struct {
Secret string `json:"secret,omitempty"`
}
func (sdk mgSDK) CreateClient(client Client, domainID, token string) (Client, errors.SDKError) {
func (sdk mgSDK) CreateClient(ctx context.Context, client Client, domainID, token string) (Client, errors.SDKError) {
data, err := json.Marshal(client)
if err != nil {
return Client{}, errors.NewSDKError(err)
@@ -54,7 +55,7 @@ func (sdk mgSDK) CreateClient(client Client, domainID, token string) (Client, er
url := fmt.Sprintf("%s/%s/%s", sdk.clientsURL, domainID, clientsEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
if sdkerr != nil {
return Client{}, sdkerr
}
@@ -67,7 +68,7 @@ func (sdk mgSDK) CreateClient(client Client, domainID, token string) (Client, er
return client, nil
}
func (sdk mgSDK) CreateClients(clients []Client, domainID, token string) ([]Client, errors.SDKError) {
func (sdk mgSDK) CreateClients(ctx context.Context, clients []Client, domainID, token string) ([]Client, errors.SDKError) {
data, err := json.Marshal(clients)
if err != nil {
return []Client{}, errors.NewSDKError(err)
@@ -75,7 +76,7 @@ func (sdk mgSDK) CreateClients(clients []Client, domainID, token string) ([]Clie
url := fmt.Sprintf("%s/%s/%s/%s", sdk.clientsURL, domainID, clientsEndpoint, "bulk")
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return []Client{}, sdkerr
}
@@ -88,14 +89,14 @@ func (sdk mgSDK) CreateClients(clients []Client, domainID, token string) ([]Clie
return ctr.Clients, nil
}
func (sdk mgSDK) Clients(pm PageMetadata, domainID, token string) (ClientsPage, errors.SDKError) {
func (sdk mgSDK) Clients(ctx context.Context, pm PageMetadata, domainID, token string) (ClientsPage, errors.SDKError) {
endpoint := fmt.Sprintf("%s/%s", domainID, clientsEndpoint)
url, err := sdk.withQueryParams(sdk.clientsURL, endpoint, pm)
if err != nil {
return ClientsPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return ClientsPage{}, sdkerr
}
@@ -108,13 +109,13 @@ func (sdk mgSDK) Clients(pm PageMetadata, domainID, token string) (ClientsPage,
return cp, nil
}
func (sdk mgSDK) Client(id, domainID, token string) (Client, errors.SDKError) {
func (sdk mgSDK) Client(ctx context.Context, id, domainID, token string) (Client, errors.SDKError) {
if id == "" {
return Client{}, errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s/%s", sdk.clientsURL, domainID, clientsEndpoint, id)
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return Client{}, sdkerr
}
@@ -127,7 +128,7 @@ func (sdk mgSDK) Client(id, domainID, token string) (Client, errors.SDKError) {
return t, nil
}
func (sdk mgSDK) UpdateClient(t Client, domainID, token string) (Client, errors.SDKError) {
func (sdk mgSDK) UpdateClient(ctx context.Context, t Client, domainID, token string) (Client, errors.SDKError) {
if t.ID == "" {
return Client{}, errors.NewSDKError(apiutil.ErrMissingID)
}
@@ -138,7 +139,7 @@ func (sdk mgSDK) UpdateClient(t Client, domainID, token string) (Client, errors.
return Client{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return Client{}, sdkerr
}
@@ -151,7 +152,7 @@ func (sdk mgSDK) UpdateClient(t Client, domainID, token string) (Client, errors.
return t, nil
}
func (sdk mgSDK) UpdateClientTags(t Client, domainID, token string) (Client, errors.SDKError) {
func (sdk mgSDK) UpdateClientTags(ctx context.Context, t Client, domainID, token string) (Client, errors.SDKError) {
data, err := json.Marshal(t)
if err != nil {
return Client{}, errors.NewSDKError(err)
@@ -159,7 +160,7 @@ func (sdk mgSDK) UpdateClientTags(t Client, domainID, token string) (Client, err
url := fmt.Sprintf("%s/%s/%s/%s/tags", sdk.clientsURL, domainID, clientsEndpoint, t.ID)
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return Client{}, sdkerr
}
@@ -172,7 +173,7 @@ func (sdk mgSDK) UpdateClientTags(t Client, domainID, token string) (Client, err
return t, nil
}
func (sdk mgSDK) UpdateClientSecret(id, secret, domainID, token string) (Client, errors.SDKError) {
func (sdk mgSDK) UpdateClientSecret(ctx context.Context, id, secret, domainID, token string) (Client, errors.SDKError) {
ucsr := updateClientSecretReq{Secret: secret}
data, err := json.Marshal(ucsr)
@@ -182,7 +183,7 @@ func (sdk mgSDK) UpdateClientSecret(id, secret, domainID, token string) (Client,
url := fmt.Sprintf("%s/%s/%s/%s/secret", sdk.clientsURL, domainID, clientsEndpoint, id)
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return Client{}, sdkerr
}
@@ -195,18 +196,18 @@ func (sdk mgSDK) UpdateClientSecret(id, secret, domainID, token string) (Client,
return t, nil
}
func (sdk mgSDK) EnableClient(id, domainID, token string) (Client, errors.SDKError) {
return sdk.changeClientStatus(id, enableEndpoint, domainID, token)
func (sdk mgSDK) EnableClient(ctx context.Context, id, domainID, token string) (Client, errors.SDKError) {
return sdk.changeClientStatus(ctx, id, enableEndpoint, domainID, token)
}
func (sdk mgSDK) DisableClient(id, domainID, token string) (Client, errors.SDKError) {
return sdk.changeClientStatus(id, disableEndpoint, domainID, token)
func (sdk mgSDK) DisableClient(ctx context.Context, id, domainID, token string) (Client, errors.SDKError) {
return sdk.changeClientStatus(ctx, id, disableEndpoint, domainID, token)
}
func (sdk mgSDK) changeClientStatus(id, status, domainID, token string) (Client, errors.SDKError) {
func (sdk mgSDK) changeClientStatus(ctx context.Context, id, status, domainID, token string) (Client, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.clientsURL, domainID, clientsEndpoint, id, status)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return Client{}, sdkerr
}
@@ -219,7 +220,7 @@ func (sdk mgSDK) changeClientStatus(id, status, domainID, token string) (Client,
return t, nil
}
func (sdk mgSDK) SetClientParent(id, domainID, groupID, token string) errors.SDKError {
func (sdk mgSDK) SetClientParent(ctx context.Context, id, domainID, groupID, token string) errors.SDKError {
scpg := parentGroupReq{ParentGroupID: groupID}
data, err := json.Marshal(scpg)
if err != nil {
@@ -227,12 +228,12 @@ func (sdk mgSDK) SetClientParent(id, domainID, groupID, token string) errors.SDK
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.clientsURL, domainID, clientsEndpoint, id, parentEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusOK)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusOK)
return sdkerr
}
func (sdk mgSDK) RemoveClientParent(id, domainID, groupID, token string) errors.SDKError {
func (sdk mgSDK) RemoveClientParent(ctx context.Context, id, domainID, groupID, token string) errors.SDKError {
rcpg := parentGroupReq{ParentGroupID: groupID}
data, err := json.Marshal(rcpg)
if err != nil {
@@ -240,76 +241,76 @@ func (sdk mgSDK) RemoveClientParent(id, domainID, groupID, token string) errors.
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.clientsURL, domainID, clientsEndpoint, id, parentEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) DeleteClient(id, domainID, token string) errors.SDKError {
func (sdk mgSDK) DeleteClient(ctx context.Context, id, domainID, token string) errors.SDKError {
if id == "" {
return errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s/%s", sdk.clientsURL, domainID, clientsEndpoint, id)
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) CreateClientRole(id, domainID string, rq RoleReq, token string) (Role, errors.SDKError) {
return sdk.createRole(sdk.clientsURL, clientsEndpoint, id, domainID, rq, token)
func (sdk mgSDK) CreateClientRole(ctx context.Context, id, domainID string, rq RoleReq, token string) (Role, errors.SDKError) {
return sdk.createRole(ctx, sdk.clientsURL, clientsEndpoint, id, domainID, rq, token)
}
func (sdk mgSDK) ClientRoles(id, domainID string, pm PageMetadata, token string) (RolesPage, errors.SDKError) {
return sdk.listRoles(sdk.clientsURL, clientsEndpoint, id, domainID, pm, token)
func (sdk mgSDK) ClientRoles(ctx context.Context, id, domainID string, pm PageMetadata, token string) (RolesPage, errors.SDKError) {
return sdk.listRoles(ctx, sdk.clientsURL, clientsEndpoint, id, domainID, pm, token)
}
func (sdk mgSDK) ClientRole(id, roleID, domainID, token string) (Role, errors.SDKError) {
return sdk.viewRole(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) ClientRole(ctx context.Context, id, roleID, domainID, token string) (Role, errors.SDKError) {
return sdk.viewRole(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) UpdateClientRole(id, roleID, newName, domainID string, token string) (Role, errors.SDKError) {
return sdk.updateRole(sdk.clientsURL, clientsEndpoint, id, roleID, newName, domainID, token)
func (sdk mgSDK) UpdateClientRole(ctx context.Context, id, roleID, newName, domainID string, token string) (Role, errors.SDKError) {
return sdk.updateRole(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, newName, domainID, token)
}
func (sdk mgSDK) DeleteClientRole(id, roleID, domainID, token string) errors.SDKError {
return sdk.deleteRole(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) DeleteClientRole(ctx context.Context, id, roleID, domainID, token string) errors.SDKError {
return sdk.deleteRole(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) AddClientRoleActions(id, roleID, domainID string, actions []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleActions(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, actions, token)
func (sdk mgSDK) AddClientRoleActions(ctx context.Context, id, roleID, domainID string, actions []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleActions(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, actions, token)
}
func (sdk mgSDK) ClientRoleActions(id, roleID, domainID string, token string) ([]string, errors.SDKError) {
return sdk.listRoleActions(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) ClientRoleActions(ctx context.Context, id, roleID, domainID string, token string) ([]string, errors.SDKError) {
return sdk.listRoleActions(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) RemoveClientRoleActions(id, roleID, domainID string, actions []string, token string) errors.SDKError {
return sdk.removeRoleActions(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, actions, token)
func (sdk mgSDK) RemoveClientRoleActions(ctx context.Context, id, roleID, domainID string, actions []string, token string) errors.SDKError {
return sdk.removeRoleActions(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, actions, token)
}
func (sdk mgSDK) RemoveAllClientRoleActions(id, roleID, domainID, token string) errors.SDKError {
return sdk.removeAllRoleActions(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) RemoveAllClientRoleActions(ctx context.Context, id, roleID, domainID, token string) errors.SDKError {
return sdk.removeAllRoleActions(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) AddClientRoleMembers(id, roleID, domainID string, members []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleMembers(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, members, token)
func (sdk mgSDK) AddClientRoleMembers(ctx context.Context, id, roleID, domainID string, members []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleMembers(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, members, token)
}
func (sdk mgSDK) ClientRoleMembers(id, roleID, domainID string, pm PageMetadata, token string) (RoleMembersPage, errors.SDKError) {
return sdk.listRoleMembers(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, pm, token)
func (sdk mgSDK) ClientRoleMembers(ctx context.Context, id, roleID, domainID string, pm PageMetadata, token string) (RoleMembersPage, errors.SDKError) {
return sdk.listRoleMembers(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, pm, token)
}
func (sdk mgSDK) RemoveClientRoleMembers(id, roleID, domainID string, members []string, token string) errors.SDKError {
return sdk.removeRoleMembers(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, members, token)
func (sdk mgSDK) RemoveClientRoleMembers(ctx context.Context, id, roleID, domainID string, members []string, token string) errors.SDKError {
return sdk.removeRoleMembers(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, members, token)
}
func (sdk mgSDK) RemoveAllClientRoleMembers(id, roleID, domainID, token string) errors.SDKError {
return sdk.removeAllRoleMembers(sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) RemoveAllClientRoleMembers(ctx context.Context, id, roleID, domainID, token string) errors.SDKError {
return sdk.removeAllRoleMembers(ctx, sdk.clientsURL, clientsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) AvailableClientRoleActions(domainID, token string) ([]string, errors.SDKError) {
return sdk.listAvailableRoleActions(sdk.clientsURL, clientsEndpoint, domainID, token)
func (sdk mgSDK) AvailableClientRoleActions(ctx context.Context, domainID, token string) ([]string, errors.SDKError) {
return sdk.listAvailableRoleActions(ctx, sdk.clientsURL, clientsEndpoint, domainID, token)
}
func (sdk mgSDK) ListClientMembers(clientID, domainID string, pm PageMetadata, token string) (EntityMembersPage, errors.SDKError) {
return sdk.listEntityMembers(sdk.clientsURL, domainID, clientsEndpoint, clientID, token, pm)
func (sdk mgSDK) ListClientMembers(ctx context.Context, clientID, domainID string, pm PageMetadata, token string) (EntityMembersPage, errors.SDKError) {
return sdk.listEntityMembers(ctx, sdk.clientsURL, domainID, clientsEndpoint, clientID, token, pm)
}
pkg/sdk/clients_test.go
+28 -27
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@@ -194,7 +195,7 @@ func TestCreateClient(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("CreateClients", mock.Anything, tc.session, []clients.Client{tc.svcReq}).Return(tc.svcRes, []roles.RoleProvision{}, tc.svcErr)
resp, err := mgsdk.CreateClient(tc.createClientReq, tc.domainID, tc.token)
resp, err := mgsdk.CreateClient(context.Background(), tc.createClientReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -305,7 +306,7 @@ func TestCreateClients(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("CreateClients", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, []roles.RoleProvision{}, tc.svcErr)
resp, err := mgsdk.CreateClients(tc.createClientsRequest, tc.domainID, tc.token)
resp, err := mgsdk.CreateClients(context.Background(), tc.createClientsRequest, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -572,7 +573,7 @@ func TestListClients(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("ListClients", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Clients(tc.pageMeta, tc.domainID, tc.token)
resp, err := mgsdk.Clients(context.Background(), tc.pageMeta, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -712,9 +713,9 @@ func TestViewClient(t *testing.T) {
var err error
switch tc.withRoles {
case true:
resp, err = mgsdkRoles.Client(tc.clientID, tc.domainID, tc.token)
resp, err = mgsdkRoles.Client(context.Background(), tc.clientID, tc.domainID, tc.token)
default:
resp, err = mgsdk.Client(tc.clientID, tc.domainID, tc.token)
resp, err = mgsdk.Client(context.Background(), tc.clientID, tc.domainID, tc.token)
}
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
@@ -876,7 +877,7 @@ func TestUpdateClient(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("Update", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateClient(tc.updateClientReq, tc.domainID, tc.token)
resp, err := mgsdk.UpdateClient(context.Background(), tc.updateClientReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1028,7 +1029,7 @@ func TestUpdateClientTags(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("UpdateTags", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateClientTags(tc.updateClientReq, tc.domainID, tc.token)
resp, err := mgsdk.UpdateClientTags(context.Background(), tc.updateClientReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1160,7 +1161,7 @@ func TestUpdateClientSecret(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("UpdateSecret", mock.Anything, tc.session, tc.clientID, tc.newSecret).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateClientSecret(tc.clientID, tc.newSecret, tc.domainID, tc.token)
resp, err := mgsdk.UpdateClientSecret(context.Background(), tc.clientID, tc.newSecret, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1263,7 +1264,7 @@ func TestEnableClient(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("Enable", mock.Anything, tc.session, tc.clientID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.EnableClient(tc.clientID, tc.domainID, tc.token)
resp, err := mgsdk.EnableClient(context.Background(), tc.clientID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1366,7 +1367,7 @@ func TestDisableClient(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("Disable", mock.Anything, tc.session, tc.clientID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.DisableClient(tc.clientID, tc.domainID, tc.token)
resp, err := mgsdk.DisableClient(context.Background(), tc.clientID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1448,7 +1449,7 @@ func TestDeleteClient(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authenticateErr)
svcCall := tsvc.On("Delete", mock.Anything, tc.session, tc.clientID).Return(tc.svcErr)
err := mgsdk.DeleteClient(tc.clientID, tc.domainID, tc.token)
err := mgsdk.DeleteClient(context.Background(), tc.clientID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "Delete", mock.Anything, tc.session, tc.clientID)
@@ -1543,7 +1544,7 @@ func TestSetClientParent(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("SetParentGroup", mock.Anything, tc.session, tc.parentID, tc.clientID).Return(tc.svcErr)
err := mgsdk.SetClientParent(tc.clientID, tc.domainID, tc.parentID, tc.token)
err := mgsdk.SetClientParent(context.Background(), tc.clientID, tc.domainID, tc.parentID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "SetParentGroup", mock.Anything, tc.session, tc.parentID, tc.clientID)
@@ -1629,7 +1630,7 @@ func TestRemoveClientParent(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RemoveParentGroup", mock.Anything, tc.session, tc.clientID).Return(tc.svcErr)
err := mgsdk.RemoveClientParent(tc.clientID, tc.domainID, tc.parentID, tc.token)
err := mgsdk.RemoveClientParent(context.Background(), tc.clientID, tc.domainID, tc.parentID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveParentGroup", mock.Anything, tc.session, tc.clientID)
@@ -1763,7 +1764,7 @@ func TestCreateClientRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("AddRole", mock.Anything, tc.session, tc.clientID, tc.roleReq.RoleName, tc.roleReq.OptionalActions, tc.roleReq.OptionalMembers).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.CreateClientRole(tc.clientID, tc.domainID, tc.roleReq, tc.token)
resp, err := mgsdk.CreateClientRole(context.Background(), tc.clientID, tc.domainID, tc.roleReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1894,7 +1895,7 @@ func TestListClientRoles(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RetrieveAllRoles", mock.Anything, tc.session, tc.clientID, tc.pageMeta.Limit, tc.pageMeta.Offset).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.ClientRoles(tc.clientID, tc.domainID, tc.pageMeta, tc.token)
resp, err := mgsdk.ClientRoles(context.Background(), tc.clientID, tc.domainID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2011,7 +2012,7 @@ func TestViewClientRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RetrieveRole", mock.Anything, tc.session, tc.clientID, tc.roleID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.ClientRole(tc.clientID, tc.roleID, tc.domainID, tc.token)
resp, err := mgsdk.ClientRole(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2129,7 +2130,7 @@ func TestUpdateClientRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("UpdateRoleName", mock.Anything, tc.session, tc.clientID, tc.roleID, tc.newRoleName).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateClientRole(tc.clientID, tc.roleID, tc.newRoleName, tc.domainID, tc.token)
resp, err := mgsdk.UpdateClientRole(context.Background(), tc.clientID, tc.roleID, tc.newRoleName, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2225,7 +2226,7 @@ func TestDeleteClientRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RemoveRole", mock.Anything, tc.session, tc.clientID, tc.roleID).Return(tc.svcErr)
err := mgsdk.DeleteClientRole(tc.clientID, tc.roleID, tc.domainID, tc.token)
err := mgsdk.DeleteClientRole(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveRole", mock.Anything, tc.session, tc.clientID, tc.roleID)
@@ -2348,7 +2349,7 @@ func TestAddClientRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleAddActions", mock.Anything, tc.session, tc.clientID, tc.roleID, tc.actions).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AddClientRoleActions(tc.clientID, tc.roleID, tc.domainID, tc.actions, tc.token)
resp, err := mgsdk.AddClientRoleActions(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.actions, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2458,7 +2459,7 @@ func TestListClientRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleListActions", mock.Anything, tc.session, tc.clientID, tc.roleID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.ClientRoleActions(tc.clientID, tc.roleID, tc.domainID, tc.token)
resp, err := mgsdk.ClientRoleActions(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2572,7 +2573,7 @@ func TestRemoveClientRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveActions", mock.Anything, tc.session, tc.clientID, tc.roleID, tc.actions).Return(tc.svcErr)
err := mgsdk.RemoveClientRoleActions(tc.clientID, tc.roleID, tc.domainID, tc.actions, tc.token)
err := mgsdk.RemoveClientRoleActions(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.actions, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveActions", mock.Anything, tc.session, tc.clientID, tc.roleID, tc.actions)
@@ -2676,7 +2677,7 @@ func TestRemoveAllClientRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveAllActions", mock.Anything, tc.session, tc.clientID, tc.roleID).Return(tc.svcErr)
err := mgsdk.RemoveAllClientRoleActions(tc.clientID, tc.roleID, tc.domainID, tc.token)
err := mgsdk.RemoveAllClientRoleActions(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveAllActions", mock.Anything, tc.session, tc.clientID, tc.roleID)
@@ -2799,7 +2800,7 @@ func TestAddClientRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleAddMembers", mock.Anything, tc.session, tc.clientID, tc.roleID, tc.members).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AddClientRoleMembers(tc.clientID, tc.roleID, tc.domainID, tc.members, tc.token)
resp, err := mgsdk.AddClientRoleMembers(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.members, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2948,7 +2949,7 @@ func TestListClientRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleListMembers", mock.Anything, tc.session, tc.clientID, tc.roleID, tc.pageMeta.Limit, tc.pageMeta.Offset).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.ClientRoleMembers(tc.clientID, tc.roleID, tc.domainID, tc.pageMeta, tc.token)
resp, err := mgsdk.ClientRoleMembers(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -3062,7 +3063,7 @@ func TestRemoveClientRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveMembers", mock.Anything, tc.session, tc.clientID, tc.roleID, tc.members).Return(tc.svcErr)
err := mgsdk.RemoveClientRoleMembers(tc.clientID, tc.roleID, tc.domainID, tc.members, tc.token)
err := mgsdk.RemoveClientRoleMembers(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.members, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveMembers", mock.Anything, tc.session, tc.clientID, tc.roleID, tc.members)
@@ -3166,7 +3167,7 @@ func TestRemoveAllClientRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveAllMembers", mock.Anything, tc.session, tc.clientID, tc.roleID).Return(tc.svcErr)
err := mgsdk.RemoveAllClientRoleMembers(tc.clientID, tc.roleID, tc.domainID, tc.token)
err := mgsdk.RemoveAllClientRoleMembers(context.Background(), tc.clientID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveAllMembers", mock.Anything, tc.session, tc.clientID, tc.roleID)
@@ -3236,7 +3237,7 @@ func TestListAvailableClientRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("ListAvailableActions", mock.Anything, tc.session).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AvailableClientRoleActions(tc.domainID, tc.token)
resp, err := mgsdk.AvailableClientRoleActions(context.Background(), tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
pkg/sdk/domains.go
+47 -46
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -36,7 +37,7 @@ type Domain struct {
Roles []roles.MemberRoleActions `json:"roles,omitempty"`
}
func (sdk mgSDK) CreateDomain(domain Domain, token string) (Domain, errors.SDKError) {
func (sdk mgSDK) CreateDomain(ctx context.Context, domain Domain, token string) (Domain, errors.SDKError) {
data, err := json.Marshal(domain)
if err != nil {
return Domain{}, errors.NewSDKError(err)
@@ -44,7 +45,7 @@ func (sdk mgSDK) CreateDomain(domain Domain, token string) (Domain, errors.SDKEr
url := fmt.Sprintf("%s/%s", sdk.domainsURL, domainsEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
if sdkerr != nil {
return Domain{}, sdkerr
}
@@ -56,13 +57,13 @@ func (sdk mgSDK) CreateDomain(domain Domain, token string) (Domain, errors.SDKEr
return d, nil
}
func (sdk mgSDK) Domains(pm PageMetadata, token string) (DomainsPage, errors.SDKError) {
func (sdk mgSDK) Domains(ctx context.Context, pm PageMetadata, token string) (DomainsPage, errors.SDKError) {
url, err := sdk.withQueryParams(sdk.domainsURL, domainsEndpoint, pm)
if err != nil {
return DomainsPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return DomainsPage{}, sdkerr
}
@@ -75,13 +76,13 @@ func (sdk mgSDK) Domains(pm PageMetadata, token string) (DomainsPage, errors.SDK
return dp, nil
}
func (sdk mgSDK) Domain(domainID, token string) (Domain, errors.SDKError) {
func (sdk mgSDK) Domain(ctx context.Context, domainID, token string) (Domain, errors.SDKError) {
if domainID == "" {
return Domain{}, errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s", sdk.domainsURL, domainsEndpoint, domainID)
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return Domain{}, sdkerr
}
@@ -94,7 +95,7 @@ func (sdk mgSDK) Domain(domainID, token string) (Domain, errors.SDKError) {
return domain, nil
}
func (sdk mgSDK) UpdateDomain(domain Domain, token string) (Domain, errors.SDKError) {
func (sdk mgSDK) UpdateDomain(ctx context.Context, domain Domain, token string) (Domain, errors.SDKError) {
if domain.ID == "" {
return Domain{}, errors.NewSDKError(apiutil.ErrMissingID)
}
@@ -105,7 +106,7 @@ func (sdk mgSDK) UpdateDomain(domain Domain, token string) (Domain, errors.SDKEr
return Domain{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return Domain{}, sdkerr
}
@@ -117,80 +118,80 @@ func (sdk mgSDK) UpdateDomain(domain Domain, token string) (Domain, errors.SDKEr
return d, nil
}
func (sdk mgSDK) EnableDomain(domainID, token string) errors.SDKError {
return sdk.changeDomainStatus(token, domainID, enableEndpoint)
func (sdk mgSDK) EnableDomain(ctx context.Context, domainID, token string) errors.SDKError {
return sdk.changeDomainStatus(ctx, token, domainID, enableEndpoint)
}
func (sdk mgSDK) DisableDomain(domainID, token string) errors.SDKError {
return sdk.changeDomainStatus(token, domainID, disableEndpoint)
func (sdk mgSDK) DisableDomain(ctx context.Context, domainID, token string) errors.SDKError {
return sdk.changeDomainStatus(ctx, token, domainID, disableEndpoint)
}
func (sdk mgSDK) FreezeDomain(domainID, token string) errors.SDKError {
return sdk.changeDomainStatus(token, domainID, freezeEndpoint)
func (sdk mgSDK) FreezeDomain(ctx context.Context, domainID, token string) errors.SDKError {
return sdk.changeDomainStatus(ctx, token, domainID, freezeEndpoint)
}
func (sdk mgSDK) changeDomainStatus(token, id, status string) errors.SDKError {
func (sdk mgSDK) changeDomainStatus(ctx context.Context, token, id, status string) errors.SDKError {
url := fmt.Sprintf("%s/%s/%s/%s", sdk.domainsURL, domainsEndpoint, id, status)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, nil, nil, http.StatusOK)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, nil, nil, http.StatusOK)
return sdkerr
}
func (sdk mgSDK) CreateDomainRole(id string, rq RoleReq, token string) (Role, errors.SDKError) {
return sdk.createRole(sdk.domainsURL, domainsEndpoint, id, "", rq, token)
func (sdk mgSDK) CreateDomainRole(ctx context.Context, id string, rq RoleReq, token string) (Role, errors.SDKError) {
return sdk.createRole(ctx, sdk.domainsURL, domainsEndpoint, id, "", rq, token)
}
func (sdk mgSDK) DomainRoles(id string, pm PageMetadata, token string) (RolesPage, errors.SDKError) {
return sdk.listRoles(sdk.domainsURL, domainsEndpoint, id, "", pm, token)
func (sdk mgSDK) DomainRoles(ctx context.Context, id string, pm PageMetadata, token string) (RolesPage, errors.SDKError) {
return sdk.listRoles(ctx, sdk.domainsURL, domainsEndpoint, id, "", pm, token)
}
func (sdk mgSDK) DomainRole(id, roleID, token string) (Role, errors.SDKError) {
return sdk.viewRole(sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
func (sdk mgSDK) DomainRole(ctx context.Context, id, roleID, token string) (Role, errors.SDKError) {
return sdk.viewRole(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
}
func (sdk mgSDK) UpdateDomainRole(id, roleID, newName string, token string) (Role, errors.SDKError) {
return sdk.updateRole(sdk.domainsURL, domainsEndpoint, id, roleID, newName, "", token)
func (sdk mgSDK) UpdateDomainRole(ctx context.Context, id, roleID, newName string, token string) (Role, errors.SDKError) {
return sdk.updateRole(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, newName, "", token)
}
func (sdk mgSDK) DeleteDomainRole(id, roleID, token string) errors.SDKError {
return sdk.deleteRole(sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
func (sdk mgSDK) DeleteDomainRole(ctx context.Context, id, roleID, token string) errors.SDKError {
return sdk.deleteRole(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
}
func (sdk mgSDK) AddDomainRoleActions(id, roleID string, actions []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleActions(sdk.domainsURL, domainsEndpoint, id, roleID, "", actions, token)
func (sdk mgSDK) AddDomainRoleActions(ctx context.Context, id, roleID string, actions []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleActions(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", actions, token)
}
func (sdk mgSDK) DomainRoleActions(id, roleID string, token string) ([]string, errors.SDKError) {
return sdk.listRoleActions(sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
func (sdk mgSDK) DomainRoleActions(ctx context.Context, id, roleID string, token string) ([]string, errors.SDKError) {
return sdk.listRoleActions(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
}
func (sdk mgSDK) RemoveDomainRoleActions(id, roleID string, actions []string, token string) errors.SDKError {
return sdk.removeRoleActions(sdk.domainsURL, domainsEndpoint, id, roleID, "", actions, token)
func (sdk mgSDK) RemoveDomainRoleActions(ctx context.Context, id, roleID string, actions []string, token string) errors.SDKError {
return sdk.removeRoleActions(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", actions, token)
}
func (sdk mgSDK) RemoveAllDomainRoleActions(id, roleID, token string) errors.SDKError {
return sdk.removeAllRoleActions(sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
func (sdk mgSDK) RemoveAllDomainRoleActions(ctx context.Context, id, roleID, token string) errors.SDKError {
return sdk.removeAllRoleActions(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
}
func (sdk mgSDK) AddDomainRoleMembers(id, roleID string, members []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleMembers(sdk.domainsURL, domainsEndpoint, id, roleID, "", members, token)
func (sdk mgSDK) AddDomainRoleMembers(ctx context.Context, id, roleID string, members []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleMembers(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", members, token)
}
func (sdk mgSDK) DomainRoleMembers(id, roleID string, pm PageMetadata, token string) (RoleMembersPage, errors.SDKError) {
return sdk.listRoleMembers(sdk.domainsURL, domainsEndpoint, id, roleID, "", pm, token)
func (sdk mgSDK) DomainRoleMembers(ctx context.Context, id, roleID string, pm PageMetadata, token string) (RoleMembersPage, errors.SDKError) {
return sdk.listRoleMembers(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", pm, token)
}
func (sdk mgSDK) RemoveDomainRoleMembers(id, roleID string, members []string, token string) errors.SDKError {
return sdk.removeRoleMembers(sdk.domainsURL, domainsEndpoint, id, roleID, "", members, token)
func (sdk mgSDK) RemoveDomainRoleMembers(ctx context.Context, id, roleID string, members []string, token string) errors.SDKError {
return sdk.removeRoleMembers(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", members, token)
}
func (sdk mgSDK) RemoveAllDomainRoleMembers(id, roleID, token string) errors.SDKError {
return sdk.removeAllRoleMembers(sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
func (sdk mgSDK) RemoveAllDomainRoleMembers(ctx context.Context, id, roleID, token string) errors.SDKError {
return sdk.removeAllRoleMembers(ctx, sdk.domainsURL, domainsEndpoint, id, roleID, "", token)
}
func (sdk mgSDK) AvailableDomainRoleActions(token string) ([]string, errors.SDKError) {
return sdk.listAvailableRoleActions(sdk.domainsURL, domainsEndpoint, "", token)
func (sdk mgSDK) AvailableDomainRoleActions(ctx context.Context, token string) ([]string, errors.SDKError) {
return sdk.listAvailableRoleActions(ctx, sdk.domainsURL, domainsEndpoint, "", token)
}
func (sdk mgSDK) ListDomainMembers(domainID string, pm PageMetadata, token string) (EntityMembersPage, errors.SDKError) {
return sdk.listEntityMembers(sdk.domainsURL, domainID, domainsEndpoint, domainID, token, pm)
func (sdk mgSDK) ListDomainMembers(ctx context.Context, domainID string, pm PageMetadata, token string) (EntityMembersPage, errors.SDKError) {
return sdk.listEntityMembers(ctx, sdk.domainsURL, domainID, domainsEndpoint, domainID, token, pm)
}
pkg/sdk/domains_test.go
+23 -22
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@@ -173,7 +174,7 @@ func TestCreateDomain(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authnErr)
svcCall := svc.On("CreateDomain", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, []roles.RoleProvision{}, tc.svcErr)
resp, err := mgsdk.CreateDomain(tc.domain, tc.token)
resp, err := mgsdk.CreateDomain(context.Background(), tc.domain, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -321,7 +322,7 @@ func TestUpdateDomain(t *testing.T) {
}
authCall := authn.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authnErr)
svcCall := svc.On("UpdateDomain", mock.Anything, tc.session, tc.domainID, mock.Anything).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateDomain(tc.domain, tc.token)
resp, err := mgsdk.UpdateDomain(context.Background(), tc.domain, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -453,9 +454,9 @@ func TestViewDomain(t *testing.T) {
switch tc.withRoles {
case true:
resp, err = mgsdkRoles.Domain(tc.domainID, tc.token)
resp, err = mgsdkRoles.Domain(context.Background(), tc.domainID, tc.token)
default:
resp, err = mgsdk.Domain(tc.domainID, tc.token)
resp, err = mgsdk.Domain(context.Background(), tc.domainID, tc.token)
}
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
@@ -600,7 +601,7 @@ func TestListDomians(t *testing.T) {
}
authCall := authn.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authnErr)
svcCall := svc.On("ListDomains", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Domains(tc.pageMeta, tc.token)
resp, err := mgsdk.Domains(context.Background(), tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -674,7 +675,7 @@ func TestEnableDomain(t *testing.T) {
}
authCall := authn.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authnErr)
svcCall := svc.On("EnableDomain", mock.Anything, tc.session, tc.domainID).Return(tc.svcRes, tc.svcErr)
err := mgsdk.EnableDomain(tc.domainID, tc.token)
err := mgsdk.EnableDomain(context.Background(), tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "EnableDomain", mock.Anything, tc.session, tc.domainID)
@@ -747,7 +748,7 @@ func TestDisableDomain(t *testing.T) {
}
authCall := authn.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authnErr)
svcCall := svc.On("DisableDomain", mock.Anything, tc.session, tc.domainID).Return(tc.svcRes, tc.svcErr)
err := mgsdk.DisableDomain(tc.domainID, tc.token)
err := mgsdk.DisableDomain(context.Background(), tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "DisableDomain", mock.Anything, tc.session, tc.domainID)
@@ -820,7 +821,7 @@ func TestFreezeDomain(t *testing.T) {
}
authCall := authn.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authnErr)
svcCall := svc.On("FreezeDomain", mock.Anything, tc.session, tc.domainID).Return(tc.svcRes, tc.svcErr)
err := mgsdk.FreezeDomain(tc.domainID, tc.token)
err := mgsdk.FreezeDomain(context.Background(), tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "FreezeDomain", mock.Anything, tc.session, tc.domainID)
@@ -947,7 +948,7 @@ func TestCreateDomainRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("AddRole", mock.Anything, tc.session, tc.domainID, tc.roleReq.RoleName, tc.roleReq.OptionalActions, tc.roleReq.OptionalMembers).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.CreateDomainRole(tc.domainID, tc.roleReq, tc.token)
resp, err := mgsdk.CreateDomainRole(context.Background(), tc.domainID, tc.roleReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1072,7 +1073,7 @@ func TestListDomainRoles(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RetrieveAllRoles", mock.Anything, tc.session, tc.domainID, tc.pageMeta.Limit, tc.pageMeta.Offset).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.DomainRoles(tc.domainID, tc.pageMeta, tc.token)
resp, err := mgsdk.DomainRoles(context.Background(), tc.domainID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1181,7 +1182,7 @@ func TestViewClietRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RetrieveRole", mock.Anything, tc.session, tc.domainID, tc.roleID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.DomainRole(tc.domainID, tc.roleID, tc.token)
resp, err := mgsdk.DomainRole(context.Background(), tc.domainID, tc.roleID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1293,7 +1294,7 @@ func TestUpdateDomainRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("UpdateRoleName", mock.Anything, tc.session, tc.domainID, tc.roleID, tc.newRoleName).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateDomainRole(tc.domainID, tc.roleID, tc.newRoleName, tc.token)
resp, err := mgsdk.UpdateDomainRole(context.Background(), tc.domainID, tc.roleID, tc.newRoleName, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1381,7 +1382,7 @@ func TestDeleteDomainRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RemoveRole", mock.Anything, tc.session, tc.domainID, tc.roleID).Return(tc.svcErr)
err := mgsdk.DeleteDomainRole(tc.domainID, tc.roleID, tc.token)
err := mgsdk.DeleteDomainRole(context.Background(), tc.domainID, tc.roleID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveRole", mock.Anything, tc.session, tc.domainID, tc.roleID)
@@ -1496,7 +1497,7 @@ func TestAddDomainRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleAddActions", mock.Anything, tc.session, tc.domainID, tc.roleID, tc.actions).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AddDomainRoleActions(tc.domainID, tc.roleID, tc.actions, tc.token)
resp, err := mgsdk.AddDomainRoleActions(context.Background(), tc.domainID, tc.roleID, tc.actions, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1598,7 +1599,7 @@ func TestListDomainRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleListActions", mock.Anything, tc.session, tc.domainID, tc.roleID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.DomainRoleActions(tc.domainID, tc.roleID, tc.token)
resp, err := mgsdk.DomainRoleActions(context.Background(), tc.domainID, tc.roleID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1704,7 +1705,7 @@ func TestRemoveDomainRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveActions", mock.Anything, tc.session, tc.domainID, tc.roleID, tc.actions).Return(tc.svcErr)
err := mgsdk.RemoveDomainRoleActions(tc.domainID, tc.roleID, tc.actions, tc.token)
err := mgsdk.RemoveDomainRoleActions(context.Background(), tc.domainID, tc.roleID, tc.actions, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveActions", mock.Anything, tc.session, tc.domainID, tc.roleID, tc.actions)
@@ -1800,7 +1801,7 @@ func TestRemoveAllDomainRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveAllActions", mock.Anything, tc.session, tc.domainID, tc.roleID).Return(tc.svcErr)
err := mgsdk.RemoveAllDomainRoleActions(tc.domainID, tc.roleID, tc.token)
err := mgsdk.RemoveAllDomainRoleActions(context.Background(), tc.domainID, tc.roleID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveAllActions", mock.Anything, tc.session, tc.domainID, tc.roleID)
@@ -1915,7 +1916,7 @@ func TestAddDomainRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleAddMembers", mock.Anything, tc.session, tc.domainID, tc.roleID, tc.members).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AddDomainRoleMembers(tc.domainID, tc.roleID, tc.members, tc.token)
resp, err := mgsdk.AddDomainRoleMembers(context.Background(), tc.domainID, tc.roleID, tc.members, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2056,7 +2057,7 @@ func TestListDomainRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleListMembers", mock.Anything, tc.session, tc.domainID, tc.roleID, tc.pageMeta.Limit, tc.pageMeta.Offset).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.DomainRoleMembers(tc.domainID, tc.roleID, tc.pageMeta, tc.token)
resp, err := mgsdk.DomainRoleMembers(context.Background(), tc.domainID, tc.roleID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2162,7 +2163,7 @@ func TestRemoveDomainRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveMembers", mock.Anything, tc.session, tc.domainID, tc.roleID, tc.members).Return(tc.svcErr)
err := mgsdk.RemoveDomainRoleMembers(tc.domainID, tc.roleID, tc.members, tc.token)
err := mgsdk.RemoveDomainRoleMembers(context.Background(), tc.domainID, tc.roleID, tc.members, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveMembers", mock.Anything, tc.session, tc.domainID, tc.roleID, tc.members)
@@ -2258,7 +2259,7 @@ func TestRemoveAllDomainRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveAllMembers", mock.Anything, tc.session, tc.domainID, tc.roleID).Return(tc.svcErr)
err := mgsdk.RemoveAllDomainRoleMembers(tc.domainID, tc.roleID, tc.token)
err := mgsdk.RemoveAllDomainRoleMembers(context.Background(), tc.domainID, tc.roleID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveAllMembers", mock.Anything, tc.session, tc.domainID, tc.roleID)
@@ -2319,7 +2320,7 @@ func TestListAvailableDomainRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("ListAvailableActions", mock.Anything, tc.session).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AvailableDomainRoleActions(tc.token)
resp, err := mgsdk.AvailableDomainRoleActions(context.Background(), tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
pkg/sdk/groups.go
+61 -60
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -50,14 +51,14 @@ type Group struct {
Roles []roles.MemberRoleActions `json:"roles,omitempty"`
}
func (sdk mgSDK) CreateGroup(g Group, domainID, token string) (Group, errors.SDKError) {
func (sdk mgSDK) CreateGroup(ctx context.Context, g Group, domainID, token string) (Group, errors.SDKError) {
data, err := json.Marshal(g)
if err != nil {
return Group{}, errors.NewSDKError(err)
}
url := fmt.Sprintf("%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
if sdkerr != nil {
return Group{}, sdkerr
}
@@ -70,14 +71,14 @@ func (sdk mgSDK) CreateGroup(g Group, domainID, token string) (Group, errors.SDK
return g, nil
}
func (sdk mgSDK) Groups(pm PageMetadata, domainID, token string) (GroupsPage, errors.SDKError) {
func (sdk mgSDK) Groups(ctx context.Context, pm PageMetadata, domainID, token string) (GroupsPage, errors.SDKError) {
endpoint := fmt.Sprintf("%s/%s", domainID, groupsEndpoint)
url, err := sdk.withQueryParams(sdk.groupsURL, endpoint, pm)
if err != nil {
return GroupsPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return GroupsPage{}, sdkerr
}
@@ -90,14 +91,14 @@ func (sdk mgSDK) Groups(pm PageMetadata, domainID, token string) (GroupsPage, er
return gp, nil
}
func (sdk mgSDK) Group(id, domainID, token string) (Group, errors.SDKError) {
func (sdk mgSDK) Group(ctx context.Context, id, domainID, token string) (Group, errors.SDKError) {
if id == "" {
return Group{}, errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, id)
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return Group{}, sdkerr
}
@@ -110,7 +111,7 @@ func (sdk mgSDK) Group(id, domainID, token string) (Group, errors.SDKError) {
return t, nil
}
func (sdk mgSDK) UpdateGroup(g Group, domainID, token string) (Group, errors.SDKError) {
func (sdk mgSDK) UpdateGroup(ctx context.Context, g Group, domainID, token string) (Group, errors.SDKError) {
data, err := json.Marshal(g)
if err != nil {
return Group{}, errors.NewSDKError(err)
@@ -121,7 +122,7 @@ func (sdk mgSDK) UpdateGroup(g Group, domainID, token string) (Group, errors.SDK
}
url := fmt.Sprintf("%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, g.ID)
_, body, sdkerr := sdk.processRequest(http.MethodPut, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPut, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return Group{}, sdkerr
}
@@ -134,7 +135,7 @@ func (sdk mgSDK) UpdateGroup(g Group, domainID, token string) (Group, errors.SDK
return g, nil
}
func (sdk mgSDK) SetGroupParent(id, domainID, groupID, token string) errors.SDKError {
func (sdk mgSDK) SetGroupParent(ctx context.Context, id, domainID, groupID, token string) errors.SDKError {
scpg := groupParentReq{ParentID: groupID}
data, err := json.Marshal(scpg)
if err != nil {
@@ -142,12 +143,12 @@ func (sdk mgSDK) SetGroupParent(id, domainID, groupID, token string) errors.SDKE
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, id, parentEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusOK)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusOK)
return sdkerr
}
func (sdk mgSDK) RemoveGroupParent(id, domainID, groupID, token string) errors.SDKError {
func (sdk mgSDK) RemoveGroupParent(ctx context.Context, id, domainID, groupID, token string) errors.SDKError {
rcpg := groupParentReq{ParentID: groupID}
data, err := json.Marshal(rcpg)
if err != nil {
@@ -155,12 +156,12 @@ func (sdk mgSDK) RemoveGroupParent(id, domainID, groupID, token string) errors.S
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, id, parentEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) AddChildren(id, domainID string, groupIDs []string, token string) errors.SDKError {
func (sdk mgSDK) AddChildren(ctx context.Context, id, domainID string, groupIDs []string, token string) errors.SDKError {
acg := childrenGroupsReq{ChildrenIDs: groupIDs}
data, err := json.Marshal(acg)
if err != nil {
@@ -168,12 +169,12 @@ func (sdk mgSDK) AddChildren(id, domainID string, groupIDs []string, token strin
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, id, childrenEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusOK)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusOK)
return sdkerr
}
func (sdk mgSDK) RemoveChildren(id, domainID string, groupIDs []string, token string) errors.SDKError {
func (sdk mgSDK) RemoveChildren(ctx context.Context, id, domainID string, groupIDs []string, token string) errors.SDKError {
rcg := childrenGroupsReq{ChildrenIDs: groupIDs}
data, err := json.Marshal(rcg)
if err != nil {
@@ -181,26 +182,26 @@ func (sdk mgSDK) RemoveChildren(id, domainID string, groupIDs []string, token st
}
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, id, childrenEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) RemoveAllChildren(id, domainID, token string) errors.SDKError {
func (sdk mgSDK) RemoveAllChildren(ctx context.Context, id, domainID, token string) errors.SDKError {
url := fmt.Sprintf("%s/%s/%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, id, childrenEndpoint, "all")
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) Children(id, domainID string, pm PageMetadata, token string) (GroupsPage, errors.SDKError) {
func (sdk mgSDK) Children(ctx context.Context, id, domainID string, pm PageMetadata, token string) (GroupsPage, errors.SDKError) {
endpoint := fmt.Sprintf("%s/%s/%s/%s", domainID, groupsEndpoint, id, childrenEndpoint)
url, err := sdk.withQueryParams(sdk.groupsURL, endpoint, pm)
if err != nil {
return GroupsPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return GroupsPage{}, sdkerr
}
@@ -213,18 +214,18 @@ func (sdk mgSDK) Children(id, domainID string, pm PageMetadata, token string) (G
return gp, nil
}
func (sdk mgSDK) EnableGroup(id, domainID, token string) (Group, errors.SDKError) {
return sdk.changeGroupStatus(id, enableEndpoint, domainID, token)
func (sdk mgSDK) EnableGroup(ctx context.Context, id, domainID, token string) (Group, errors.SDKError) {
return sdk.changeGroupStatus(ctx, id, enableEndpoint, domainID, token)
}
func (sdk mgSDK) DisableGroup(id, domainID, token string) (Group, errors.SDKError) {
return sdk.changeGroupStatus(id, disableEndpoint, domainID, token)
func (sdk mgSDK) DisableGroup(ctx context.Context, id, domainID, token string) (Group, errors.SDKError) {
return sdk.changeGroupStatus(ctx, id, disableEndpoint, domainID, token)
}
func (sdk mgSDK) changeGroupStatus(id, status, domainID, token string) (Group, errors.SDKError) {
func (sdk mgSDK) changeGroupStatus(ctx context.Context, id, status, domainID, token string) (Group, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, id, status)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return Group{}, sdkerr
}
@@ -236,23 +237,23 @@ func (sdk mgSDK) changeGroupStatus(id, status, domainID, token string) (Group, e
return g, nil
}
func (sdk mgSDK) DeleteGroup(id, domainID, token string) errors.SDKError {
func (sdk mgSDK) DeleteGroup(ctx context.Context, id, domainID, token string) errors.SDKError {
if id == "" {
return errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s/%s", sdk.groupsURL, domainID, groupsEndpoint, id)
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) Hierarchy(id, domainID string, pm PageMetadata, token string) (GroupsHierarchyPage, errors.SDKError) {
func (sdk mgSDK) Hierarchy(ctx context.Context, id, domainID string, pm PageMetadata, token string) (GroupsHierarchyPage, errors.SDKError) {
endpoint := fmt.Sprintf("%s/%s/%s/hierarchy", domainID, groupsEndpoint, id)
url, err := sdk.withQueryParams(sdk.groupsURL, endpoint, pm)
if err != nil {
return GroupsHierarchyPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return GroupsHierarchyPage{}, sdkerr
}
@@ -265,62 +266,62 @@ func (sdk mgSDK) Hierarchy(id, domainID string, pm PageMetadata, token string) (
return hp, nil
}
func (sdk mgSDK) CreateGroupRole(id, domainID string, rq RoleReq, token string) (Role, errors.SDKError) {
return sdk.createRole(sdk.groupsURL, groupsEndpoint, id, domainID, rq, token)
func (sdk mgSDK) CreateGroupRole(ctx context.Context, id, domainID string, rq RoleReq, token string) (Role, errors.SDKError) {
return sdk.createRole(ctx, sdk.groupsURL, groupsEndpoint, id, domainID, rq, token)
}
func (sdk mgSDK) GroupRoles(id, domainID string, pm PageMetadata, token string) (RolesPage, errors.SDKError) {
return sdk.listRoles(sdk.groupsURL, groupsEndpoint, id, domainID, pm, token)
func (sdk mgSDK) GroupRoles(ctx context.Context, id, domainID string, pm PageMetadata, token string) (RolesPage, errors.SDKError) {
return sdk.listRoles(ctx, sdk.groupsURL, groupsEndpoint, id, domainID, pm, token)
}
func (sdk mgSDK) GroupRole(id, roleID, domainID, token string) (Role, errors.SDKError) {
return sdk.viewRole(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) GroupRole(ctx context.Context, id, roleID, domainID, token string) (Role, errors.SDKError) {
return sdk.viewRole(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) UpdateGroupRole(id, roleID, newName, domainID string, token string) (Role, errors.SDKError) {
return sdk.updateRole(sdk.groupsURL, groupsEndpoint, id, roleID, newName, domainID, token)
func (sdk mgSDK) UpdateGroupRole(ctx context.Context, id, roleID, newName, domainID string, token string) (Role, errors.SDKError) {
return sdk.updateRole(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, newName, domainID, token)
}
func (sdk mgSDK) DeleteGroupRole(id, roleID, domainID, token string) errors.SDKError {
return sdk.deleteRole(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) DeleteGroupRole(ctx context.Context, id, roleID, domainID, token string) errors.SDKError {
return sdk.deleteRole(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) AddGroupRoleActions(id, roleID, domainID string, actions []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleActions(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, actions, token)
func (sdk mgSDK) AddGroupRoleActions(ctx context.Context, id, roleID, domainID string, actions []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleActions(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, actions, token)
}
func (sdk mgSDK) GroupRoleActions(id, roleID, domainID string, token string) ([]string, errors.SDKError) {
return sdk.listRoleActions(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) GroupRoleActions(ctx context.Context, id, roleID, domainID string, token string) ([]string, errors.SDKError) {
return sdk.listRoleActions(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) RemoveGroupRoleActions(id, roleID, domainID string, actions []string, token string) errors.SDKError {
return sdk.removeRoleActions(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, actions, token)
func (sdk mgSDK) RemoveGroupRoleActions(ctx context.Context, id, roleID, domainID string, actions []string, token string) errors.SDKError {
return sdk.removeRoleActions(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, actions, token)
}
func (sdk mgSDK) RemoveAllGroupRoleActions(id, roleID, domainID, token string) errors.SDKError {
return sdk.removeAllRoleActions(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) RemoveAllGroupRoleActions(ctx context.Context, id, roleID, domainID, token string) errors.SDKError {
return sdk.removeAllRoleActions(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) AddGroupRoleMembers(id, roleID, domainID string, members []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleMembers(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, members, token)
func (sdk mgSDK) AddGroupRoleMembers(ctx context.Context, id, roleID, domainID string, members []string, token string) ([]string, errors.SDKError) {
return sdk.addRoleMembers(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, members, token)
}
func (sdk mgSDK) GroupRoleMembers(id, roleID, domainID string, pm PageMetadata, token string) (RoleMembersPage, errors.SDKError) {
return sdk.listRoleMembers(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, pm, token)
func (sdk mgSDK) GroupRoleMembers(ctx context.Context, id, roleID, domainID string, pm PageMetadata, token string) (RoleMembersPage, errors.SDKError) {
return sdk.listRoleMembers(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, pm, token)
}
func (sdk mgSDK) RemoveGroupRoleMembers(id, roleID, domainID string, members []string, token string) errors.SDKError {
return sdk.removeRoleMembers(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, members, token)
func (sdk mgSDK) RemoveGroupRoleMembers(ctx context.Context, id, roleID, domainID string, members []string, token string) errors.SDKError {
return sdk.removeRoleMembers(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, members, token)
}
func (sdk mgSDK) RemoveAllGroupRoleMembers(id, roleID, domainID, token string) errors.SDKError {
return sdk.removeAllRoleMembers(sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
func (sdk mgSDK) RemoveAllGroupRoleMembers(ctx context.Context, id, roleID, domainID, token string) errors.SDKError {
return sdk.removeAllRoleMembers(ctx, sdk.groupsURL, groupsEndpoint, id, roleID, domainID, token)
}
func (sdk mgSDK) AvailableGroupRoleActions(domainID, token string) ([]string, errors.SDKError) {
return sdk.listAvailableRoleActions(sdk.groupsURL, groupsEndpoint, domainID, token)
func (sdk mgSDK) AvailableGroupRoleActions(ctx context.Context, domainID, token string) ([]string, errors.SDKError) {
return sdk.listAvailableRoleActions(ctx, sdk.groupsURL, groupsEndpoint, domainID, token)
}
func (sdk mgSDK) ListGroupMembers(groupID, domainID string, pm PageMetadata, token string) (EntityMembersPage, errors.SDKError) {
return sdk.listEntityMembers(sdk.groupsURL, domainID, groupsEndpoint, groupID, token, pm)
func (sdk mgSDK) ListGroupMembers(ctx context.Context, groupID, domainID string, pm PageMetadata, token string) (EntityMembersPage, errors.SDKError) {
return sdk.listEntityMembers(ctx, sdk.groupsURL, domainID, groupsEndpoint, groupID, token, pm)
}
pkg/sdk/groups_test.go
+30 -29
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@@ -266,7 +267,7 @@ func TestCreateGroup(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("CreateGroup", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, []roles.RoleProvision{}, tc.svcErr)
resp, err := mgsdk.CreateGroup(tc.groupReq, tc.domainID, tc.token)
resp, err := mgsdk.CreateGroup(context.Background(), tc.groupReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -501,7 +502,7 @@ func TestListGroups(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("ListGroups", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Groups(tc.pageMeta, tc.domainID, tc.token)
resp, err := mgsdk.Groups(context.Background(), tc.pageMeta, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -640,9 +641,9 @@ func TestViewGroup(t *testing.T) {
switch tc.withRoles {
case true:
resp, err = mgsdkRoles.Group(tc.groupID, tc.domainID, tc.token)
resp, err = mgsdkRoles.Group(context.Background(), tc.groupID, tc.domainID, tc.token)
default:
resp, err = mgsdk.Group(tc.groupID, tc.domainID, tc.token)
resp, err = mgsdk.Group(context.Background(), tc.groupID, tc.domainID, tc.token)
}
assert.Equal(t, tc.err, err)
@@ -836,7 +837,7 @@ func TestUpdateGroup(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("UpdateGroup", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateGroup(tc.groupReq, tc.domainID, tc.token)
resp, err := mgsdk.UpdateGroup(context.Background(), tc.groupReq, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -947,7 +948,7 @@ func TestEnableGroup(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("EnableGroup", mock.Anything, tc.session, tc.groupID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.EnableGroup(tc.groupID, tc.domainID, tc.token)
resp, err := mgsdk.EnableGroup(context.Background(), tc.groupID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1058,7 +1059,7 @@ func TestDisableGroup(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("DisableGroup", mock.Anything, tc.session, tc.groupID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.DisableGroup(tc.groupID, tc.domainID, tc.token)
resp, err := mgsdk.DisableGroup(context.Background(), tc.groupID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1138,7 +1139,7 @@ func TestDeleteGroup(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("DeleteGroup", mock.Anything, tc.session, tc.groupID).Return(tc.svcErr)
err := mgsdk.DeleteGroup(tc.groupID, tc.domainID, tc.token)
err := mgsdk.DeleteGroup(context.Background(), tc.groupID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "DeleteGroup", mock.Anything, tc.session, tc.groupID)
@@ -1234,7 +1235,7 @@ func TestSetGroupParent(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("AddParentGroup", mock.Anything, tc.session, tc.groupID, tc.parentID).Return(tc.svcErr)
err := mgsdk.SetGroupParent(tc.groupID, tc.domainID, tc.parentID, tc.token)
err := mgsdk.SetGroupParent(context.Background(), tc.groupID, tc.domainID, tc.parentID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "AddParentGroup", mock.Anything, tc.session, tc.groupID, tc.parentID)
@@ -1321,7 +1322,7 @@ func TestRemoveGroupParent(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RemoveParentGroup", mock.Anything, tc.session, tc.groupID).Return(tc.svcErr)
err := mgsdk.RemoveGroupParent(tc.groupID, tc.domainID, tc.parentID, tc.token)
err := mgsdk.RemoveGroupParent(context.Background(), tc.groupID, tc.domainID, tc.parentID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveParentGroup", mock.Anything, tc.session, tc.groupID)
@@ -1417,7 +1418,7 @@ func TestAddChildrenGroups(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("AddChildrenGroups", mock.Anything, tc.session, tc.groupID, tc.childrenIDs).Return(tc.svcErr)
err := mgsdk.AddChildren(tc.groupID, tc.domainID, tc.childrenIDs, tc.token)
err := mgsdk.AddChildren(context.Background(), tc.groupID, tc.domainID, tc.childrenIDs, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "AddChildrenGroups", mock.Anything, tc.session, tc.groupID, tc.childrenIDs)
@@ -1513,7 +1514,7 @@ func TestRemoveChildrenGroups(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RemoveChildrenGroups", mock.Anything, tc.session, tc.groupID, tc.childrenIDs).Return(tc.svcErr)
err := mgsdk.RemoveChildren(tc.groupID, tc.domainID, tc.childrenIDs, tc.token)
err := mgsdk.RemoveChildren(context.Background(), tc.groupID, tc.domainID, tc.childrenIDs, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveChildrenGroups", mock.Anything, tc.session, tc.groupID, tc.childrenIDs)
@@ -1593,7 +1594,7 @@ func TestRemoveAllChildrenGroups(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RemoveAllChildrenGroups", mock.Anything, tc.session, tc.groupID).Return(tc.svcErr)
err := mgsdk.RemoveAllChildren(tc.groupID, tc.domainID, tc.token)
err := mgsdk.RemoveAllChildren(context.Background(), tc.groupID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveAllChildrenGroups", mock.Anything, tc.session, tc.groupID)
@@ -1846,7 +1847,7 @@ func TestListChildrenGroups(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("ListChildrenGroups", mock.Anything, tc.session, tc.childID, int64(1), int64(0), mock.Anything).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Children(tc.childID, tc.domainID, tc.pageMeta, tc.token)
resp, err := mgsdk.Children(context.Background(), tc.childID, tc.domainID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2022,7 +2023,7 @@ func TestHierarchy(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := gsvc.On("RetrieveGroupHierarchy", mock.Anything, tc.session, tc.groupID, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Hierarchy(tc.groupID, tc.domainID, tc.pageMeta, tc.token)
resp, err := mgsdk.Hierarchy(context.Background(), tc.groupID, tc.domainID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2158,7 +2159,7 @@ func TestCreateGroupRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("AddRole", mock.Anything, tc.session, tc.groupID, tc.roleReq.RoleName, tc.roleReq.OptionalActions, tc.roleReq.OptionalMembers).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.CreateGroupRole(tc.groupID, tc.domainID, tc.roleReq, tc.token)
resp, err := mgsdk.CreateGroupRole(context.Background(), tc.groupID, tc.domainID, tc.roleReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2290,7 +2291,7 @@ func TestListGroupRoles(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RetrieveAllRoles", mock.Anything, tc.session, tc.groupID, tc.pageMeta.Limit, tc.pageMeta.Offset).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.GroupRoles(tc.groupID, tc.domainID, tc.pageMeta, tc.token)
resp, err := mgsdk.GroupRoles(context.Background(), tc.groupID, tc.domainID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2407,7 +2408,7 @@ func TestViewGroupRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RetrieveRole", mock.Anything, tc.session, tc.groupID, tc.roleID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.GroupRole(tc.groupID, tc.roleID, tc.domainID, tc.token)
resp, err := mgsdk.GroupRole(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2526,7 +2527,7 @@ func TestUpdateGroupRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("UpdateRoleName", mock.Anything, tc.session, tc.groupID, tc.roleID, tc.newRoleName).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateGroupRole(tc.groupID, tc.roleID, tc.newRoleName, tc.domainID, tc.token)
resp, err := mgsdk.UpdateGroupRole(context.Background(), tc.groupID, tc.roleID, tc.newRoleName, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2623,7 +2624,7 @@ func TestDeleteGroupRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RemoveRole", mock.Anything, tc.session, tc.groupID, tc.roleID).Return(tc.svcErr)
err := mgsdk.DeleteGroupRole(tc.groupID, tc.roleID, tc.domainID, tc.token)
err := mgsdk.DeleteGroupRole(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RemoveRole", mock.Anything, tc.session, tc.groupID, tc.roleID)
@@ -2747,7 +2748,7 @@ func TestAddGroupRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleAddActions", mock.Anything, tc.session, tc.groupID, tc.roleID, tc.actions).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AddGroupRoleActions(tc.groupID, tc.roleID, tc.domainID, tc.actions, tc.token)
resp, err := mgsdk.AddGroupRoleActions(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.actions, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2858,7 +2859,7 @@ func TestListGroupRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleListActions", mock.Anything, tc.session, tc.groupID, tc.roleID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.GroupRoleActions(tc.groupID, tc.roleID, tc.domainID, tc.token)
resp, err := mgsdk.GroupRoleActions(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2973,7 +2974,7 @@ func TestRemoveGroupRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveActions", mock.Anything, tc.session, tc.groupID, tc.roleID, tc.actions).Return(tc.svcErr)
err := mgsdk.RemoveGroupRoleActions(tc.groupID, tc.roleID, tc.domainID, tc.actions, tc.token)
err := mgsdk.RemoveGroupRoleActions(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.actions, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveActions", mock.Anything, tc.session, tc.groupID, tc.roleID, tc.actions)
@@ -3078,7 +3079,7 @@ func TestRemoveAllGroupRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveAllActions", mock.Anything, tc.session, tc.groupID, tc.roleID).Return(tc.svcErr)
err := mgsdk.RemoveAllGroupRoleActions(tc.groupID, tc.roleID, tc.domainID, tc.token)
err := mgsdk.RemoveAllGroupRoleActions(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveAllActions", mock.Anything, tc.session, tc.groupID, tc.roleID)
@@ -3202,7 +3203,7 @@ func TestAddGroupRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleAddMembers", mock.Anything, tc.session, tc.groupID, tc.roleID, tc.members).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AddGroupRoleMembers(tc.groupID, tc.roleID, tc.domainID, tc.members, tc.token)
resp, err := mgsdk.AddGroupRoleMembers(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.members, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -3352,7 +3353,7 @@ func TestListGroupRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleListMembers", mock.Anything, tc.session, tc.groupID, tc.roleID, tc.pageMeta.Limit, tc.pageMeta.Offset).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.GroupRoleMembers(tc.groupID, tc.roleID, tc.domainID, tc.pageMeta, tc.token)
resp, err := mgsdk.GroupRoleMembers(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -3467,7 +3468,7 @@ func TestRemoveGroupRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveMembers", mock.Anything, tc.session, tc.groupID, tc.roleID, tc.members).Return(tc.svcErr)
err := mgsdk.RemoveGroupRoleMembers(tc.groupID, tc.roleID, tc.domainID, tc.members, tc.token)
err := mgsdk.RemoveGroupRoleMembers(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.members, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveMembers", mock.Anything, tc.session, tc.groupID, tc.roleID, tc.members)
@@ -3572,7 +3573,7 @@ func TestRemoveAllGroupRoleMembers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("RoleRemoveAllMembers", mock.Anything, tc.session, tc.groupID, tc.roleID).Return(tc.svcErr)
err := mgsdk.RemoveAllGroupRoleMembers(tc.groupID, tc.roleID, tc.domainID, tc.token)
err := mgsdk.RemoveAllGroupRoleMembers(context.Background(), tc.groupID, tc.roleID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RoleRemoveAllMembers", mock.Anything, tc.session, tc.groupID, tc.roleID)
@@ -3642,7 +3643,7 @@ func TestListAvailableGroupRoleActions(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := csvc.On("ListAvailableActions", mock.Anything, tc.session).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.AvailableGroupRoleActions(tc.domainID, tc.token)
resp, err := mgsdk.AvailableGroupRoleActions(context.Background(), tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
pkg/sdk/invitations.go
+13 -12
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"net/http"
"time"
@@ -37,7 +38,7 @@ type InvitationPage struct {
Invitations []Invitation `json:"invitations"`
}
func (sdk mgSDK) SendInvitation(invitation Invitation, token string) (err error) {
func (sdk mgSDK) SendInvitation(ctx context.Context, invitation Invitation, token string) (err error) {
data, err := json.Marshal(invitation)
if err != nil {
return errors.NewSDKError(err)
@@ -45,15 +46,15 @@ func (sdk mgSDK) SendInvitation(invitation Invitation, token string) (err error)
url := sdk.domainsURL + "/" + domainsEndpoint + "/" + invitation.DomainID + "/" + invitationsEndpoint
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
return sdkerr
}
func (sdk mgSDK) Invitation(userID, domainID, token string) (invitation Invitation, err error) {
func (sdk mgSDK) Invitation(ctx context.Context, userID, domainID, token string) (invitation Invitation, err error) {
url := sdk.domainsURL + "/" + domainsEndpoint + "/" + domainID + "/" + invitationsEndpoint + "/" + userID
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return Invitation{}, sdkerr
}
@@ -65,13 +66,13 @@ func (sdk mgSDK) Invitation(userID, domainID, token string) (invitation Invitati
return invitation, nil
}
func (sdk mgSDK) Invitations(pm PageMetadata, token string) (invitations InvitationPage, err error) {
func (sdk mgSDK) Invitations(ctx context.Context, pm PageMetadata, token string) (invitations InvitationPage, err error) {
url, err := sdk.withQueryParams(sdk.domainsURL, invitationsEndpoint, pm)
if err != nil {
return InvitationPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return InvitationPage{}, sdkerr
}
@@ -84,7 +85,7 @@ func (sdk mgSDK) Invitations(pm PageMetadata, token string) (invitations Invitat
return invPage, nil
}
func (sdk mgSDK) AcceptInvitation(domainID, token string) (err error) {
func (sdk mgSDK) AcceptInvitation(ctx context.Context, domainID, token string) (err error) {
req := struct {
DomainID string `json:"domain_id"`
}{
@@ -97,12 +98,12 @@ func (sdk mgSDK) AcceptInvitation(domainID, token string) (err error) {
url := sdk.domainsURL + "/" + invitationsEndpoint + "/" + acceptEndpoint
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) RejectInvitation(domainID, token string) (err error) {
func (sdk mgSDK) RejectInvitation(ctx context.Context, domainID, token string) (err error) {
req := struct {
DomainID string `json:"domain_id"`
}{
@@ -115,15 +116,15 @@ func (sdk mgSDK) RejectInvitation(domainID, token string) (err error) {
url := sdk.domainsURL + "/" + invitationsEndpoint + "/" + rejectEndpoint
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) DeleteInvitation(userID, domainID, token string) (err error) {
func (sdk mgSDK) DeleteInvitation(ctx context.Context, userID, domainID, token string) (err error) {
url := sdk.domainsURL + "/" + domainsEndpoint + "/" + domainID + "/" + invitationsEndpoint + "/" + userID
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
pkg/sdk/invitations_test.go
+7 -6
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"testing"
@@ -126,7 +127,7 @@ func TestSendInvitation(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("SendInvitation", mock.Anything, tc.session, tc.svcReq).Return(tc.svcErr)
err := mgsdk.SendInvitation(tc.sendInvitationReq, tc.token)
err := mgsdk.SendInvitation(context.Background(), tc.sendInvitationReq, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "SendInvitation", mock.Anything, tc.session, tc.svcReq)
@@ -217,7 +218,7 @@ func TestViewInvitation(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("ViewInvitation", mock.Anything, tc.session, tc.userID, tc.domainID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Invitation(tc.userID, tc.domainID, tc.token)
resp, err := mgsdk.Invitation(context.Background(), tc.userID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -319,7 +320,7 @@ func TestListInvitation(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("ListInvitations", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Invitations(tc.pageMeta, tc.token)
resp, err := mgsdk.Invitations(context.Background(), tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -386,7 +387,7 @@ func TestAcceptInvitation(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("AcceptInvitation", mock.Anything, tc.session, tc.domainID).Return(tc.svcErr)
err := mgsdk.AcceptInvitation(tc.domainID, tc.token)
err := mgsdk.AcceptInvitation(context.Background(), tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "AcceptInvitation", mock.Anything, tc.session, tc.domainID)
@@ -452,7 +453,7 @@ func TestRejectInvitation(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("RejectInvitation", mock.Anything, tc.session, tc.domainID).Return(tc.svcErr)
err := mgsdk.RejectInvitation(tc.domainID, tc.token)
err := mgsdk.RejectInvitation(context.Background(), tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "RejectInvitation", mock.Anything, tc.session, tc.domainID)
@@ -531,7 +532,7 @@ func TestDeleteInvitation(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("DeleteInvitation", mock.Anything, tc.session, tc.inviteeUserID, tc.domainID).Return(tc.svcErr)
err := mgsdk.DeleteInvitation(tc.inviteeUserID, tc.domainID, tc.token)
err := mgsdk.DeleteInvitation(context.Background(), tc.inviteeUserID, tc.domainID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "DeleteInvitation", mock.Anything, tc.session, tc.inviteeUserID, tc.domainID)
pkg/sdk/journal.go
+3 -2
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -30,7 +31,7 @@ type JournalsPage struct {
Journals []Journal `json:"journals"`
}
func (sdk mgSDK) Journal(entityType, entityID, domainID string, pm PageMetadata, token string) (journals JournalsPage, err error) {
func (sdk mgSDK) Journal(ctx context.Context, entityType, entityID, domainID string, pm PageMetadata, token string) (journals JournalsPage, err error) {
if entityID == "" {
return JournalsPage{}, errors.NewSDKError(apiutil.ErrMissingID)
}
@@ -48,7 +49,7 @@ func (sdk mgSDK) Journal(entityType, entityID, domainID string, pm PageMetadata,
return JournalsPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return JournalsPage{}, sdkerr
}
pkg/sdk/journal_test.go
+2 -1
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@@ -333,7 +334,7 @@ func TestRetrieveJournal(t *testing.T) {
}
authCall := authn.On("Authenticate", mock.Anything, mock.Anything).Return(tc.session, tc.authnErr)
svcCall := svc.On("RetrieveAll", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Journal(tc.entityType, tc.entityID, tc.domainID, tc.pageMeta, tc.token)
resp, err := mgsdk.Journal(context.Background(), tc.entityType, tc.entityID, tc.domainID, tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
pkg/sdk/message.go
+3 -2
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"fmt"
"net/http"
"strings"
@@ -14,7 +15,7 @@ import (
const channelParts = 2
func (sdk mgSDK) SendMessage(chanName, msg, key string) errors.SDKError {
func (sdk mgSDK) SendMessage(ctx context.Context, chanName, msg, key string) errors.SDKError {
chanNameParts := strings.SplitN(chanName, ".", channelParts)
chanID := chanNameParts[0]
subtopicPart := ""
@@ -24,7 +25,7 @@ func (sdk mgSDK) SendMessage(chanName, msg, key string) errors.SDKError {
reqURL := fmt.Sprintf("%s/ch/%s/msg%s", sdk.httpAdapterURL, chanID, subtopicPart)
_, _, err := sdk.processRequest(http.MethodPost, reqURL, ClientPrefix+key, []byte(msg), nil, http.StatusAccepted)
_, _, err := sdk.processRequest(ctx, http.MethodPost, reqURL, ClientPrefix+key, []byte(msg), nil, http.StatusAccepted)
return err
}
pkg/sdk/message_test.go
+2 -1
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@@ -147,7 +148,7 @@ func TestSendMessage(t *testing.T) {
authzCall := clientsGRPCClient.On("Authenticate", mock.Anything, mock.Anything).Return(tc.authRes, tc.authErr)
authnCall := channelsGRPCClient.On("Authorize", mock.Anything, mock.Anything).Return(&grpcChannelsV1.AuthzRes{Authorized: true}, nil)
svcCall := pub.On("Publish", mock.Anything, channelID, mock.Anything).Return(tc.svcErr)
err := mgsdk.SendMessage(tc.chanName, tc.msg, tc.clientKey)
err := mgsdk.SendMessage(context.Background(), tc.chanName, tc.msg, tc.clientKey)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "Publish", mock.Anything, channelID, mock.Anything)
pkg/sdk/mocks/sdk.go
+1583 -1457
View File
File diff suppressed because it is too large Load Diff
pkg/sdk/roles.go
+31 -30
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -11,7 +12,7 @@ import (
"github.com/absmach/supermq/pkg/errors"
)
func (sdk mgSDK) createRole(entityURL, entityEndpoint, id, domainID string, rq RoleReq, token string) (Role, errors.SDKError) {
func (sdk mgSDK) createRole(ctx context.Context, entityURL, entityEndpoint, id, domainID string, rq RoleReq, token string) (Role, errors.SDKError) {
data, err := json.Marshal(rq)
if err != nil {
return Role{}, errors.NewSDKError(err)
@@ -21,7 +22,7 @@ func (sdk mgSDK) createRole(entityURL, entityEndpoint, id, domainID string, rq R
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint)
}
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
if sdkerr != nil {
return Role{}, sdkerr
}
@@ -34,7 +35,7 @@ func (sdk mgSDK) createRole(entityURL, entityEndpoint, id, domainID string, rq R
return role, nil
}
func (sdk mgSDK) listRoles(entityURL, entityEndpoint, id, domainID string, pm PageMetadata, token string) (RolesPage, errors.SDKError) {
func (sdk mgSDK) listRoles(ctx context.Context, entityURL, entityEndpoint, id, domainID string, pm PageMetadata, token string) (RolesPage, errors.SDKError) {
endpoint := fmt.Sprintf("%s/%s/%s/%s", domainID, entityEndpoint, id, rolesEndpoint)
if entityEndpoint == domainsEndpoint {
endpoint = fmt.Sprintf("%s/%s/%s", entityEndpoint, id, rolesEndpoint)
@@ -44,7 +45,7 @@ func (sdk mgSDK) listRoles(entityURL, entityEndpoint, id, domainID string, pm Pa
return RolesPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return RolesPage{}, sdkerr
}
@@ -57,12 +58,12 @@ func (sdk mgSDK) listRoles(entityURL, entityEndpoint, id, domainID string, pm Pa
return rp, nil
}
func (sdk mgSDK) viewRole(entityURL, entityEndpoint, id, roleID, domainID, token string) (Role, errors.SDKError) {
func (sdk mgSDK) viewRole(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID, token string) (Role, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s/%s/%s", entityURL, domainID, entityEndpoint, id, rolesEndpoint, roleID)
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return Role{}, sdkerr
}
@@ -75,7 +76,7 @@ func (sdk mgSDK) viewRole(entityURL, entityEndpoint, id, roleID, domainID, token
return role, nil
}
func (sdk mgSDK) updateRole(entityURL, entityEndpoint, id, roleID, newName, domainID string, token string) (Role, errors.SDKError) {
func (sdk mgSDK) updateRole(ctx context.Context, entityURL, entityEndpoint, id, roleID, newName, domainID string, token string) (Role, errors.SDKError) {
ucr := updateRoleNameReq{Name: newName}
data, err := json.Marshal(ucr)
if err != nil {
@@ -86,7 +87,7 @@ func (sdk mgSDK) updateRole(entityURL, entityEndpoint, id, roleID, newName, doma
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID)
}
_, body, sdkerr := sdk.processRequest(http.MethodPut, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPut, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return Role{}, sdkerr
}
@@ -99,17 +100,17 @@ func (sdk mgSDK) updateRole(entityURL, entityEndpoint, id, roleID, newName, doma
return role, nil
}
func (sdk mgSDK) deleteRole(entityURL, entityEndpoint, id, roleID, domainID, token string) errors.SDKError {
func (sdk mgSDK) deleteRole(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID, token string) errors.SDKError {
url := fmt.Sprintf("%s/%s/%s/%s/%s/%s", entityURL, domainID, entityEndpoint, id, rolesEndpoint, roleID)
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID)
}
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) addRoleActions(entityURL, entityEndpoint, id, roleID, domainID string, actions []string, token string) ([]string, errors.SDKError) {
func (sdk mgSDK) addRoleActions(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID string, actions []string, token string) ([]string, errors.SDKError) {
acra := roleActionsReq{Actions: actions}
data, err := json.Marshal(acra)
if err != nil {
@@ -120,7 +121,7 @@ func (sdk mgSDK) addRoleActions(entityURL, entityEndpoint, id, roleID, domainID
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID, actionsEndpoint)
}
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return []string{}, sdkerr
}
@@ -133,12 +134,12 @@ func (sdk mgSDK) addRoleActions(entityURL, entityEndpoint, id, roleID, domainID
return res.Actions, nil
}
func (sdk mgSDK) listRoleActions(entityURL, entityEndpoint, id, roleID, domainID string, token string) ([]string, errors.SDKError) {
func (sdk mgSDK) listRoleActions(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID string, token string) ([]string, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s", entityURL, domainID, entityEndpoint, id, rolesEndpoint, roleID, actionsEndpoint)
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID, actionsEndpoint)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return nil, sdkerr
}
@@ -151,7 +152,7 @@ func (sdk mgSDK) listRoleActions(entityURL, entityEndpoint, id, roleID, domainID
return res.Actions, nil
}
func (sdk mgSDK) removeRoleActions(entityURL, entityEndpoint, id, roleID, domainID string, actions []string, token string) errors.SDKError {
func (sdk mgSDK) removeRoleActions(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID string, actions []string, token string) errors.SDKError {
rcra := roleActionsReq{Actions: actions}
data, err := json.Marshal(rcra)
if err != nil {
@@ -162,22 +163,22 @@ func (sdk mgSDK) removeRoleActions(entityURL, entityEndpoint, id, roleID, domain
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID, actionsEndpoint, "delete")
}
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) removeAllRoleActions(entityURL, entityEndpoint, id, roleID, domainID, token string) errors.SDKError {
func (sdk mgSDK) removeAllRoleActions(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID, token string) errors.SDKError {
url := fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s/%s", entityURL, domainID, entityEndpoint, id, rolesEndpoint, roleID, actionsEndpoint, "delete-all")
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID, actionsEndpoint, "delete-all")
}
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) addRoleMembers(entityURL, entityEndpoint, id, roleID, domainID string, members []string, token string) ([]string, errors.SDKError) {
func (sdk mgSDK) addRoleMembers(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID string, members []string, token string) ([]string, errors.SDKError) {
acrm := roleMembersReq{Members: members}
data, err := json.Marshal(acrm)
if err != nil {
@@ -188,7 +189,7 @@ func (sdk mgSDK) addRoleMembers(entityURL, entityEndpoint, id, roleID, domainID
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID, membersEndpoint)
}
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return []string{}, sdkerr
}
@@ -201,7 +202,7 @@ func (sdk mgSDK) addRoleMembers(entityURL, entityEndpoint, id, roleID, domainID
return res.Members, nil
}
func (sdk mgSDK) listRoleMembers(entityURL, entityEndpoint, id, roleID, domainID string, pm PageMetadata, token string) (RoleMembersPage, errors.SDKError) {
func (sdk mgSDK) listRoleMembers(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID string, pm PageMetadata, token string) (RoleMembersPage, errors.SDKError) {
endpoint := fmt.Sprintf("%s/%s/%s/%s/%s/%s", domainID, entityEndpoint, id, rolesEndpoint, roleID, membersEndpoint)
if entityEndpoint == domainsEndpoint {
endpoint = fmt.Sprintf("%s/%s/%s/%s/%s", entityEndpoint, id, rolesEndpoint, roleID, membersEndpoint)
@@ -210,7 +211,7 @@ func (sdk mgSDK) listRoleMembers(entityURL, entityEndpoint, id, roleID, domainID
if err != nil {
return RoleMembersPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return RoleMembersPage{}, sdkerr
}
@@ -223,7 +224,7 @@ func (sdk mgSDK) listRoleMembers(entityURL, entityEndpoint, id, roleID, domainID
return res, nil
}
func (sdk mgSDK) removeRoleMembers(entityURL, entityEndpoint, id, roleID, domainID string, members []string, token string) errors.SDKError {
func (sdk mgSDK) removeRoleMembers(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID string, members []string, token string) errors.SDKError {
rcrm := roleMembersReq{Members: members}
data, err := json.Marshal(rcrm)
if err != nil {
@@ -234,27 +235,27 @@ func (sdk mgSDK) removeRoleMembers(entityURL, entityEndpoint, id, roleID, domain
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID, membersEndpoint, "delete")
}
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) removeAllRoleMembers(entityURL, entityEndpoint, id, roleID, domainID, token string) errors.SDKError {
func (sdk mgSDK) removeAllRoleMembers(ctx context.Context, entityURL, entityEndpoint, id, roleID, domainID, token string) errors.SDKError {
url := fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s/%s", entityURL, domainID, entityEndpoint, id, rolesEndpoint, roleID, membersEndpoint, "delete-all")
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s/%s/%s/%s", entityURL, entityEndpoint, id, rolesEndpoint, roleID, membersEndpoint, "delete-all")
}
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
func (sdk mgSDK) listAvailableRoleActions(entityURL, entityEndpoint, domainID, token string) ([]string, errors.SDKError) {
func (sdk mgSDK) listAvailableRoleActions(ctx context.Context, entityURL, entityEndpoint, domainID, token string) ([]string, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s/%s", entityURL, domainID, entityEndpoint, rolesEndpoint, "available-actions")
if entityEndpoint == domainsEndpoint {
url = fmt.Sprintf("%s/%s/%s/%s", entityURL, entityEndpoint, rolesEndpoint, "available-actions")
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return nil, sdkerr
}
@@ -267,7 +268,7 @@ func (sdk mgSDK) listAvailableRoleActions(entityURL, entityEndpoint, domainID, t
return res.AvailableActions, nil
}
func (sdk mgSDK) listEntityMembers(entityURL, domainID, entityEndpoint, id, token string, pm PageMetadata) (EntityMembersPage, errors.SDKError) {
func (sdk mgSDK) listEntityMembers(ctx context.Context, entityURL, domainID, entityEndpoint, id, token string, pm PageMetadata) (EntityMembersPage, errors.SDKError) {
ep := fmt.Sprintf("%s/%s/%s/%s/%s", domainID, entityEndpoint, id, rolesEndpoint, membersEndpoint)
if entityEndpoint == domainsEndpoint {
ep = fmt.Sprintf("%s/%s/%s/%s", entityEndpoint, id, rolesEndpoint, membersEndpoint)
@@ -277,7 +278,7 @@ func (sdk mgSDK) listEntityMembers(entityURL, domainID, entityEndpoint, id, toke
return EntityMembersPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return EntityMembersPage{}, sdkerr
}
pkg/sdk/sdk.go
+133 -133
View File
File diff suppressed because it is too large Load Diff
pkg/sdk/tokens.go
+5 -4
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -24,7 +25,7 @@ type Login struct {
Password string `json:"password"`
}
func (sdk mgSDK) CreateToken(lt Login) (Token, errors.SDKError) {
func (sdk mgSDK) CreateToken(ctx context.Context, lt Login) (Token, errors.SDKError) {
data, err := json.Marshal(lt)
if err != nil {
return Token{}, errors.NewSDKError(err)
@@ -32,7 +33,7 @@ func (sdk mgSDK) CreateToken(lt Login) (Token, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s", sdk.usersURL, usersEndpoint, issueTokenEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, "", data, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, "", data, nil, http.StatusCreated)
if sdkerr != nil {
return Token{}, sdkerr
}
@@ -44,10 +45,10 @@ func (sdk mgSDK) CreateToken(lt Login) (Token, errors.SDKError) {
return token, nil
}
func (sdk mgSDK) RefreshToken(token string) (Token, errors.SDKError) {
func (sdk mgSDK) RefreshToken(ctx context.Context, token string) (Token, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s", sdk.usersURL, usersEndpoint, refreshTokenEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, nil, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, nil, nil, http.StatusCreated)
if sdkerr != nil {
return Token{}, sdkerr
}
pkg/sdk/tokens_test.go
+3 -2
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"net/http"
"testing"
@@ -101,7 +102,7 @@ func TestIssueToken(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
svcCall := svc.On("IssueToken", mock.Anything, tc.login.Username, tc.login.Password).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.CreateToken(tc.login)
resp, err := mgsdk.CreateToken(context.Background(), tc.login)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -163,7 +164,7 @@ func TestRefreshToken(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
authCall := auth.On("Authenticate", mock.Anything, mock.Anything).Return(smqauthn.Session{DomainUserID: validID, UserID: validID, DomainID: validID}, tc.identifyErr)
svcCall := svc.On("RefreshToken", mock.Anything, smqauthn.Session{DomainUserID: validID, UserID: validID, DomainID: validID}, tc.token).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.RefreshToken(tc.token)
resp, err := mgsdk.RefreshToken(context.Background(), tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
pkg/sdk/users.go
+37 -36
View File
@@ -4,6 +4,7 @@
package sdk
import (
"context"
"encoding/json"
"fmt"
"net/http"
@@ -39,7 +40,7 @@ type User struct {
ProfilePicture string `json:"profile_picture,omitempty"`
}
func (sdk mgSDK) CreateUser(user User, token string) (User, errors.SDKError) {
func (sdk mgSDK) CreateUser(ctx context.Context, user User, token string) (User, errors.SDKError) {
data, err := json.Marshal(user)
if err != nil {
return User{}, errors.NewSDKError(err)
@@ -47,7 +48,7 @@ func (sdk mgSDK) CreateUser(user User, token string) (User, errors.SDKError) {
url := fmt.Sprintf("%s/%s", sdk.usersURL, usersEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, data, nil, http.StatusCreated)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, data, nil, http.StatusCreated)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -60,13 +61,13 @@ func (sdk mgSDK) CreateUser(user User, token string) (User, errors.SDKError) {
return user, nil
}
func (sdk mgSDK) Users(pm PageMetadata, token string) (UsersPage, errors.SDKError) {
func (sdk mgSDK) Users(ctx context.Context, pm PageMetadata, token string) (UsersPage, errors.SDKError) {
url, err := sdk.withQueryParams(sdk.usersURL, usersEndpoint, pm)
if err != nil {
return UsersPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return UsersPage{}, sdkerr
}
@@ -79,13 +80,13 @@ func (sdk mgSDK) Users(pm PageMetadata, token string) (UsersPage, errors.SDKErro
return cp, nil
}
func (sdk mgSDK) User(id, token string) (User, errors.SDKError) {
func (sdk mgSDK) User(ctx context.Context, id, token string) (User, errors.SDKError) {
if id == "" {
return User{}, errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s", sdk.usersURL, usersEndpoint, id)
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -98,10 +99,10 @@ func (sdk mgSDK) User(id, token string) (User, errors.SDKError) {
return user, nil
}
func (sdk mgSDK) UserProfile(token string) (User, errors.SDKError) {
func (sdk mgSDK) UserProfile(ctx context.Context, token string) (User, errors.SDKError) {
url := fmt.Sprintf("%s/%s/profile", sdk.usersURL, usersEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -114,7 +115,7 @@ func (sdk mgSDK) UserProfile(token string) (User, errors.SDKError) {
return user, nil
}
func (sdk mgSDK) UpdateUser(user User, token string) (User, errors.SDKError) {
func (sdk mgSDK) UpdateUser(ctx context.Context, user User, token string) (User, errors.SDKError) {
if user.ID == "" {
return User{}, errors.NewSDKError(apiutil.ErrMissingID)
}
@@ -125,7 +126,7 @@ func (sdk mgSDK) UpdateUser(user User, token string) (User, errors.SDKError) {
return User{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -138,7 +139,7 @@ func (sdk mgSDK) UpdateUser(user User, token string) (User, errors.SDKError) {
return user, nil
}
func (sdk mgSDK) UpdateUserTags(user User, token string) (User, errors.SDKError) {
func (sdk mgSDK) UpdateUserTags(ctx context.Context, user User, token string) (User, errors.SDKError) {
data, err := json.Marshal(user)
if err != nil {
return User{}, errors.NewSDKError(err)
@@ -146,7 +147,7 @@ func (sdk mgSDK) UpdateUserTags(user User, token string) (User, errors.SDKError)
url := fmt.Sprintf("%s/%s/%s/tags", sdk.usersURL, usersEndpoint, user.ID)
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -159,7 +160,7 @@ func (sdk mgSDK) UpdateUserTags(user User, token string) (User, errors.SDKError)
return user, nil
}
func (sdk mgSDK) UpdateUserEmail(user User, token string) (User, errors.SDKError) {
func (sdk mgSDK) UpdateUserEmail(ctx context.Context, user User, token string) (User, errors.SDKError) {
ucir := updateUserEmailReq{token: token, id: user.ID, Email: user.Email}
data, err := json.Marshal(ucir)
@@ -169,7 +170,7 @@ func (sdk mgSDK) UpdateUserEmail(user User, token string) (User, errors.SDKError
url := fmt.Sprintf("%s/%s/%s/email", sdk.usersURL, usersEndpoint, user.ID)
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -182,7 +183,7 @@ func (sdk mgSDK) UpdateUserEmail(user User, token string) (User, errors.SDKError
return user, nil
}
func (sdk mgSDK) ResetPasswordRequest(email string) errors.SDKError {
func (sdk mgSDK) ResetPasswordRequest(ctx context.Context, email string) errors.SDKError {
rpr := resetPasswordRequestreq{Email: email}
data, err := json.Marshal(rpr)
@@ -194,12 +195,12 @@ func (sdk mgSDK) ResetPasswordRequest(email string) errors.SDKError {
header := make(map[string]string)
header["Referer"] = sdk.HostURL
_, _, sdkerr := sdk.processRequest(http.MethodPost, url, "", data, header, http.StatusCreated)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, "", data, header, http.StatusCreated)
return sdkerr
}
func (sdk mgSDK) ResetPassword(password, confPass, token string) errors.SDKError {
func (sdk mgSDK) ResetPassword(ctx context.Context, password, confPass, token string) errors.SDKError {
rpr := resetPasswordReq{Token: token, Password: password, ConfPass: confPass}
data, err := json.Marshal(rpr)
@@ -208,12 +209,12 @@ func (sdk mgSDK) ResetPassword(password, confPass, token string) errors.SDKError
}
url := fmt.Sprintf("%s/%s/reset", sdk.usersURL, PasswordResetEndpoint)
_, _, sdkerr := sdk.processRequest(http.MethodPut, url, token, data, nil, http.StatusCreated)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodPut, url, token, data, nil, http.StatusCreated)
return sdkerr
}
func (sdk mgSDK) UpdatePassword(oldPass, newPass, token string) (User, errors.SDKError) {
func (sdk mgSDK) UpdatePassword(ctx context.Context, oldPass, newPass, token string) (User, errors.SDKError) {
ucsr := updateUserSecretReq{OldSecret: oldPass, NewSecret: newPass}
data, err := json.Marshal(ucsr)
@@ -223,7 +224,7 @@ func (sdk mgSDK) UpdatePassword(oldPass, newPass, token string) (User, errors.SD
url := fmt.Sprintf("%s/%s/secret", sdk.usersURL, usersEndpoint)
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -236,7 +237,7 @@ func (sdk mgSDK) UpdatePassword(oldPass, newPass, token string) (User, errors.SD
return user, nil
}
func (sdk mgSDK) UpdateUserRole(user User, token string) (User, errors.SDKError) {
func (sdk mgSDK) UpdateUserRole(ctx context.Context, user User, token string) (User, errors.SDKError) {
data, err := json.Marshal(user)
if err != nil {
return User{}, errors.NewSDKError(err)
@@ -244,7 +245,7 @@ func (sdk mgSDK) UpdateUserRole(user User, token string) (User, errors.SDKError)
url := fmt.Sprintf("%s/%s/%s/role", sdk.usersURL, usersEndpoint, user.ID)
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -257,7 +258,7 @@ func (sdk mgSDK) UpdateUserRole(user User, token string) (User, errors.SDKError)
return user, nil
}
func (sdk mgSDK) UpdateUsername(user User, token string) (User, errors.SDKError) {
func (sdk mgSDK) UpdateUsername(ctx context.Context, user User, token string) (User, errors.SDKError) {
uur := UpdateUsernameReq{id: user.ID, Username: user.Credentials.Username}
data, err := json.Marshal(uur)
if err != nil {
@@ -266,7 +267,7 @@ func (sdk mgSDK) UpdateUsername(user User, token string) (User, errors.SDKError)
url := fmt.Sprintf("%s/%s/%s/username", sdk.usersURL, usersEndpoint, user.ID)
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -279,7 +280,7 @@ func (sdk mgSDK) UpdateUsername(user User, token string) (User, errors.SDKError)
return user, nil
}
func (sdk mgSDK) UpdateProfilePicture(user User, token string) (User, errors.SDKError) {
func (sdk mgSDK) UpdateProfilePicture(ctx context.Context, user User, token string) (User, errors.SDKError) {
data, err := json.Marshal(user)
if err != nil {
return User{}, errors.NewSDKError(err)
@@ -287,7 +288,7 @@ func (sdk mgSDK) UpdateProfilePicture(user User, token string) (User, errors.SDK
url := fmt.Sprintf("%s/%s/%s/picture", sdk.usersURL, usersEndpoint, user.ID)
_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPatch, url, token, data, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -300,13 +301,13 @@ func (sdk mgSDK) UpdateProfilePicture(user User, token string) (User, errors.SDK
return user, nil
}
func (sdk mgSDK) SearchUsers(pm PageMetadata, token string) (UsersPage, errors.SDKError) {
func (sdk mgSDK) SearchUsers(ctx context.Context, pm PageMetadata, token string) (UsersPage, errors.SDKError) {
url, err := sdk.withQueryParams(sdk.usersURL, fmt.Sprintf("%s/search", usersEndpoint), pm)
if err != nil {
return UsersPage{}, errors.NewSDKError(err)
}
_, body, sdkerr := sdk.processRequest(http.MethodGet, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodGet, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return UsersPage{}, sdkerr
}
@@ -319,18 +320,18 @@ func (sdk mgSDK) SearchUsers(pm PageMetadata, token string) (UsersPage, errors.S
return cp, nil
}
func (sdk mgSDK) EnableUser(id, token string) (User, errors.SDKError) {
return sdk.changeUserStatus(token, id, enableEndpoint)
func (sdk mgSDK) EnableUser(ctx context.Context, id, token string) (User, errors.SDKError) {
return sdk.changeUserStatus(ctx, token, id, enableEndpoint)
}
func (sdk mgSDK) DisableUser(id, token string) (User, errors.SDKError) {
return sdk.changeUserStatus(token, id, disableEndpoint)
func (sdk mgSDK) DisableUser(ctx context.Context, id, token string) (User, errors.SDKError) {
return sdk.changeUserStatus(ctx, token, id, disableEndpoint)
}
func (sdk mgSDK) changeUserStatus(token, id, status string) (User, errors.SDKError) {
func (sdk mgSDK) changeUserStatus(ctx context.Context, token, id, status string) (User, errors.SDKError) {
url := fmt.Sprintf("%s/%s/%s/%s", sdk.usersURL, usersEndpoint, id, status)
_, body, sdkerr := sdk.processRequest(http.MethodPost, url, token, nil, nil, http.StatusOK)
_, body, sdkerr := sdk.processRequest(ctx, http.MethodPost, url, token, nil, nil, http.StatusOK)
if sdkerr != nil {
return User{}, sdkerr
}
@@ -343,11 +344,11 @@ func (sdk mgSDK) changeUserStatus(token, id, status string) (User, errors.SDKErr
return user, nil
}
func (sdk mgSDK) DeleteUser(id, token string) errors.SDKError {
func (sdk mgSDK) DeleteUser(ctx context.Context, id, token string) errors.SDKError {
if id == "" {
return errors.NewSDKError(apiutil.ErrMissingID)
}
url := fmt.Sprintf("%s/%s/%s", sdk.usersURL, usersEndpoint, id)
_, _, sdkerr := sdk.processRequest(http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
_, _, sdkerr := sdk.processRequest(ctx, http.MethodDelete, url, token, nil, nil, http.StatusNoContent)
return sdkerr
}
pkg/sdk/users_test.go
+18 -17
View File
@@ -4,6 +4,7 @@
package sdk_test
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
@@ -259,7 +260,7 @@ func TestCreateUser(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
svcCall := svc.On("Register", mock.Anything, smqauthn.Session{}, tc.svcReq, true).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.CreateUser(tc.createSdkUserReq, tc.token)
resp, err := mgsdk.CreateUser(context.Background(), tc.createSdkUserReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -563,7 +564,7 @@ func TestListUsers(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("ListUsers", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.Users(tc.pageMeta, tc.token)
resp, err := mgsdk.Users(context.Background(), tc.pageMeta, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -694,7 +695,7 @@ func TestSearchUsers(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(smqauthn.Session{DomainUserID: validID, UserID: validID, DomainID: domainID}, tc.authenticateErr)
svcCall := svc.On("SearchUsers", mock.Anything, mock.Anything).Return(tc.searchreturn, tc.err)
page, err := mgsdk.SearchUsers(tc.page, tc.token)
page, err := mgsdk.SearchUsers(context.Background(), tc.page, tc.token)
assert.Equal(t, tc.err, err, fmt.Sprintf("%s: expected error %v, got %v", tc.desc, tc.err, err))
assert.Equal(t, tc.response, page.Users, fmt.Sprintf("%s: expected %v got %v\n", tc.desc, tc.response, page.Users))
svcCall.Unset()
@@ -793,7 +794,7 @@ func TestViewUser(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("View", mock.Anything, tc.session, tc.userID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.User(tc.userID, tc.token)
resp, err := mgsdk.User(context.Background(), tc.userID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -872,7 +873,7 @@ func TestUserProfile(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("ViewProfile", mock.Anything, tc.session).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UserProfile(tc.token)
resp, err := mgsdk.UserProfile(context.Background(), tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1036,7 +1037,7 @@ func TestUpdateUser(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("Update", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateUser(tc.updateUserReq, tc.token)
resp, err := mgsdk.UpdateUser(context.Background(), tc.updateUserReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1194,7 +1195,7 @@ func TestUpdateUserTags(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("UpdateTags", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateUserTags(tc.updateUserReq, tc.token)
resp, err := mgsdk.UpdateUserTags(context.Background(), tc.updateUserReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1342,7 +1343,7 @@ func TestUpdateUserEmail(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("UpdateEmail", mock.Anything, tc.session, tc.updateUserReq.ID, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateUserEmail(tc.updateUserReq, tc.token)
resp, err := mgsdk.UpdateUserEmail(context.Background(), tc.updateUserReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1407,7 +1408,7 @@ func TestResetPasswordRequest(t *testing.T) {
t.Run(tc.desc, func(t *testing.T) {
svcCall := svc.On("GenerateResetToken", mock.Anything, tc.email, defHost).Return(tc.svcErr)
svcCall1 := svc.On("SendPasswordReset", mock.Anything, mock.Anything, tc.email, user.Credentials.Username, tc.issueRes.AccessToken).Return(nil)
err := mgsdk.ResetPasswordRequest(tc.email)
err := mgsdk.ResetPasswordRequest(context.Background(), tc.email)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "GenerateResetToken", mock.Anything, tc.email, defHost)
@@ -1509,7 +1510,7 @@ func TestResetPassword(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("ResetSecret", mock.Anything, tc.session, tc.newPassword).Return(tc.svcErr)
err := mgsdk.ResetPassword(tc.newPassword, tc.confPassword, tc.token)
err := mgsdk.ResetPassword(context.Background(), tc.newPassword, tc.confPassword, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "ResetSecret", mock.Anything, tc.session, tc.newPassword)
@@ -1640,7 +1641,7 @@ func TestUpdatePassword(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("UpdateSecret", mock.Anything, tc.session, tc.oldPassword, tc.newPassword).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdatePassword(tc.oldPassword, tc.newPassword, tc.token)
resp, err := mgsdk.UpdatePassword(context.Background(), tc.oldPassword, tc.newPassword, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1798,7 +1799,7 @@ func TestUpdateUserRole(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("UpdateRole", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateUserRole(tc.updateUserReq, tc.token)
resp, err := mgsdk.UpdateUserRole(context.Background(), tc.updateUserReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -1962,7 +1963,7 @@ func TestUpdateUsername(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("UpdateUsername", mock.Anything, tc.session, tc.svcReq.ID, tc.svcReq.Credentials.Username).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateUsername(tc.updateUserReq, tc.token)
resp, err := mgsdk.UpdateUsername(context.Background(), tc.updateUserReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2124,7 +2125,7 @@ func TestUpdateProfilePicture(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("UpdateProfilePicture", mock.Anything, tc.session, tc.svcReq).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.UpdateProfilePicture(tc.updateUserReq, tc.token)
resp, err := mgsdk.UpdateProfilePicture(context.Background(), tc.updateUserReq, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2197,7 +2198,7 @@ func TestEnableUser(t *testing.T) {
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("Enable", mock.Anything, tc.session, tc.userID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.EnableUser(tc.userID, tc.token)
resp, err := mgsdk.EnableUser(context.Background(), tc.userID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2302,7 +2303,7 @@ func TestDisableUser(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("Disable", mock.Anything, tc.session, tc.userID).Return(tc.svcRes, tc.svcErr)
resp, err := mgsdk.DisableUser(tc.userID, tc.token)
resp, err := mgsdk.DisableUser(context.Background(), tc.userID, tc.token)
assert.Equal(t, tc.err, err)
assert.Equal(t, tc.response, resp)
if tc.err == nil {
@@ -2376,7 +2377,7 @@ func TestDeleteUser(t *testing.T) {
}
authCall := auth.On("Authenticate", mock.Anything, tc.token).Return(tc.session, tc.authenticateErr)
svcCall := svc.On("Delete", mock.Anything, tc.session, tc.userID).Return(tc.svcErr)
err := mgsdk.DeleteUser(tc.userID, tc.token)
err := mgsdk.DeleteUser(context.Background(), tc.userID, tc.token)
assert.Equal(t, tc.err, err)
if tc.err == nil {
ok := svcCall.Parent.AssertCalled(t, "Delete", mock.Anything, tc.session, tc.userID)