Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 1, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9847ba4
Update mockery version in generated files to v2.53.2
SammyOina Mar 31, 2025
c94d911
NOISSUE - Update mockery calls in service tests to use mock.Anything …
SammyOina Apr 1, 2025
c7138f4
Update mockery calls in tests to include additional parameters for im…
SammyOina Apr 1, 2025
0058af0
fix mocks
SammyOina Apr 1, 2025
35d6d96
Update mockery calls in domain tests to include additional parameters…
SammyOina Apr 1, 2025
cd7200d
Update go.mod to add a new line for improved module organization
SammyOina Apr 1, 2025
1046d21
Update mockery calls in tests to include additional parameters for im…
SammyOina Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions certs/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions certs/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions cli/certs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ 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
}
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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions cli/certs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions cli/channels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
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
Expand Down Expand Up @@ -63,7 +63,7 @@
}

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
Expand All @@ -72,7 +72,7 @@
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
Expand All @@ -92,7 +92,7 @@
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
}
Expand All @@ -115,7 +115,7 @@
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
Expand All @@ -134,7 +134,7 @@
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
Expand All @@ -153,7 +153,7 @@
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
Expand All @@ -177,7 +177,7 @@
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])

Check warning on line 180 in cli/channels.go

View check run for this annotation

Codecov / codecov/patch

cli/channels.go#L180 

Added line #L180 was not covered by tests
if err != nil {
logErrorCmd(*cmd, err)
return
Expand Down
14 changes: 7 additions & 7 deletions cli/channels_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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...)...)

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading
Loading