Skip to content

Commit 429960b

Browse files
committed
fix: correct lint issues
1 parent cc842ce commit 429960b

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

internal/authenticator/auto_authenticator_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/snapp-incubator/soteria/internal/config"
1313
"github.com/snapp-incubator/soteria/internal/topics"
1414
"github.com/snapp-incubator/soteria/pkg/acl"
15-
"github.com/stretchr/testify/assert"
15+
"github.com/stretchr/testify/require"
1616
"github.com/stretchr/testify/suite"
1717
"go.uber.org/zap"
1818
)
@@ -219,14 +219,14 @@ func (suite *AutoAuthenticatorTestSuite) TestACL_Driver() {
219219

220220
suite.Run("testing driver subscribe on valid superapp event topic", func() {
221221
ok, err := suite.Authenticator.ACL(acl.Sub, token, validDriverSuperappEventTopic)
222-
suite.NoError(err)
223-
suite.True(ok)
222+
require.NoError(err)
223+
require.True(ok)
224224
})
225225

226226
suite.Run("testing driver subscribe on invalid superapp event topic", func() {
227227
ok, err := suite.Authenticator.ACL(acl.Sub, token, invalidDriverSuperappEventTopic)
228-
suite.Error(err)
229-
suite.False(ok)
228+
require.Error(err)
229+
require.False(ok)
230230
})
231231

232232
suite.Run("testing driver subscribe on valid shared location topic", func() {
@@ -291,7 +291,7 @@ func TestAutoAuthenticator_ValidateTopicBySender(t *testing.T) {
291291
cfg.UseValidator = true
292292

293293
hid, err := topics.NewHashIDManager(cfg.HashIDMap)
294-
assert.NoError(t, err)
294+
require.NoError(t, err)
295295

296296
// nolint: exhaustruct
297297
authenticator := authenticator.AutoAuthenticator{
@@ -304,7 +304,7 @@ func TestAutoAuthenticator_ValidateTopicBySender(t *testing.T) {
304304
t.Parallel()
305305

306306
topicTemplate := authenticator.TopicManager.ParseTopic(validDriverCabEventTopic, topics.DriverIss, "DXKgaNQa7N5Y7bo")
307-
assert.True(t, topicTemplate != nil)
307+
require.NotNil(t, topicTemplate)
308308
})
309309
}
310310

internal/authenticator/manual_authenticator_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/snapp-incubator/soteria/internal/config"
1313
"github.com/snapp-incubator/soteria/internal/topics"
1414
"github.com/snapp-incubator/soteria/pkg/acl"
15-
"github.com/stretchr/testify/assert"
15+
"github.com/stretchr/testify/require"
1616
"github.com/stretchr/testify/suite"
1717
"go.uber.org/zap"
1818
)
@@ -221,14 +221,14 @@ func (suite *ManualAuthenticatorTestSuite) TestACL_Driver() {
221221

222222
suite.Run("testing driver subscribe on valid superapp event topic", func() {
223223
ok, err := suite.Authenticator.ACL(acl.Sub, token, validDriverSuperappEventTopic)
224-
suite.NoError(err)
225-
suite.True(ok)
224+
require.NoError(err)
225+
require.True(ok)
226226
})
227227

228228
suite.Run("testing driver subscribe on invalid superapp event topic", func() {
229229
ok, err := suite.Authenticator.ACL(acl.Sub, token, invalidDriverSuperappEventTopic)
230-
suite.Error(err)
231-
suite.False(ok)
230+
require.Error(err)
231+
require.False(ok)
232232
})
233233

234234
suite.Run("testing driver subscribe on valid shared location topic", func() {
@@ -292,7 +292,7 @@ func TestManualAuthenticator_ValidateTopicBySender(t *testing.T) {
292292
cfg := config.SnappVendor()
293293

294294
hid, err := topics.NewHashIDManager(cfg.HashIDMap)
295-
assert.NoError(t, err)
295+
require.NoError(t, err)
296296

297297
// nolint: exhaustruct
298298
authenticator := authenticator.ManualAuthenticator{
@@ -304,7 +304,7 @@ func TestManualAuthenticator_ValidateTopicBySender(t *testing.T) {
304304
t.Run("testing valid driver cab event", func(t *testing.T) {
305305
t.Parallel()
306306
topicTemplate := authenticator.TopicManager.ParseTopic(validDriverCabEventTopic, topics.DriverIss, "DXKgaNQa7N5Y7bo")
307-
assert.True(t, topicTemplate != nil)
307+
require.NotNil(t, topicTemplate)
308308
})
309309
}
310310

internal/topics/manager.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ package topics
55

66
import (
77
"crypto/md5" //nolint: gosec
8+
"encoding/hex"
89
"fmt"
910
"regexp"
11+
"strconv"
1012
"strings"
1113
"text/template"
1214

@@ -127,7 +129,7 @@ func (t *Manager) ParseTopic(topic, iss, sub string) *Template {
127129
func (t *Manager) EncodeMD5(iss string) string {
128130
hid := md5.Sum([]byte(fmt.Sprintf("%s-%s", EmqCabHashPrefix, iss))) //nolint:gosec
129131

130-
return fmt.Sprintf("%x", hid)
132+
return hex.EncodeToString(hid[:])
131133
}
132134

133135
func (t *Manager) DecodeHashID(sub, iss string) string {
@@ -138,7 +140,7 @@ func (t *Manager) DecodeHashID(sub, iss string) string {
138140
return ""
139141
}
140142

141-
return fmt.Sprintf("%d", id[0])
143+
return strconv.Itoa(id[0])
142144
}
143145

144146
func (t *Manager) IssEntityMapper(iss string) string {

0 commit comments

Comments
 (0)