Skip to content

Commit 13e8668

Browse files
Merge pull request #28 from hellofresh/patch/fix-golangci-lint
Avoid GoLangCI Lint excluding rules by default
2 parents 282629e + 211b2dd commit 13e8668

File tree

10 files changed

+43
-16
lines changed

10 files changed

+43
-16
lines changed

.golangci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,16 @@ linters:
2424
- varcheck
2525
- vet
2626
- vetshadow
27+
28+
issues:
29+
exclude-use-default: false
30+
exclude-rules:
31+
- path: _test\.go
32+
linters:
33+
- errcheck
34+
35+
# Ignore the streamEvents.Close errcheck warning since we do not want to introduce a logger for repositories just yet
36+
- path: aggregate/repository.go
37+
text: "Error return value of \\`streamEvents.Close\\` is not checked"
38+
linters:
39+
- errcheck

driver/inmemory/internal/generate_matcher/main.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"flag"
5+
"fmt"
56
"os"
67
"path/filepath"
78
"reflect"
@@ -196,11 +197,16 @@ func main() {
196197
panic(err)
197198
}
198199

200+
/* #nosec G302 */
199201
f, err := os.OpenFile(matcherPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
200202
if err != nil {
201203
panic(err)
202204
}
203-
defer f.Close()
205+
defer func() {
206+
if err := f.Close(); err != nil {
207+
fmt.Printf("failed to close file: %s\n", err)
208+
}
209+
}()
204210

205211
err = tmpl.Execute(f, struct {
206212
Types []reflect.Kind

driver/inmemory/matcher.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ func (c *metadataConstraint) Matches(val interface{}) (bool, error) {
119119
func (e IncompatibleMatcherError) Error() string {
120120
msg := bytes.NewBufferString("goengine: incompatible metadata.Matcher")
121121
for _, err := range e {
122-
msg.WriteRune('\n')
123-
msg.WriteString(err.Error())
122+
_, _ = msg.WriteRune('\n')
123+
_, _ = msg.WriteString(err.Error())
124124
}
125125

126126
return msg.String()

driver/sql/postgres/eventstore.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func (e *EventStore) AppendToWithExecer(ctx context.Context, conn driverSQL.Exec
207207

208208
result, err := conn.ExecContext(
209209
ctx,
210-
/* #nosec */
210+
/* #nosec G201 */
211211
fmt.Sprintf(
212212
"INSERT INTO %s (%s) VALUES %s",
213213
tableName,
@@ -254,17 +254,17 @@ func (e *EventStore) prepareInsertValues(streamEvents []goengine.Message, lenCol
254254
for i := 0; i < placeholderCount; i++ {
255255
if m := i % lenCols; m == 0 {
256256
if i != 0 {
257-
placeholders.WriteString("),")
257+
_, _ = placeholders.WriteString("),")
258258
}
259-
placeholders.WriteRune('(')
259+
_, _ = placeholders.WriteRune('(')
260260
} else {
261-
placeholders.WriteRune(',')
261+
_, _ = placeholders.WriteRune(',')
262262
}
263263

264-
placeholders.WriteRune('$')
265-
placeholders.WriteString(strconv.Itoa(i + 1))
264+
_, _ = placeholders.WriteRune('$')
265+
_, _ = placeholders.WriteString(strconv.Itoa(i + 1))
266266
}
267-
placeholders.WriteString(")")
267+
_, _ = placeholders.WriteString(")")
268268
e.preparedInsertPlaceholder[messageCount] = placeholders.String()
269269

270270
return e.preparedInsertPlaceholder[messageCount]

driver/sql/postgres/projector_aggregate_storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func newAggregateProjectionStorage(
6161
projectionTableStr := QuoteString(projectionTable)
6262
eventStoreTableQuoted := QuoteIdentifier(eventStoreTable)
6363

64-
/* #nosec */
64+
/* #nosec G201 */
6565
return &aggregateProjectionStorage{
6666
projectionStateEncoder: projectionStateEncoder,
6767
logger: logger,

driver/sql/postgres/projector_stream_storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func newStreamProjectionStorage(
5656
projectionTableQuoted := QuoteIdentifier(projectionTable)
5757
projectionTableStr := QuoteString(projectionTable)
5858

59-
/* #nosec */
59+
/* #nosec G201 */
6060
return &streamProjectionStorage{
6161
projectionName: projectionName,
6262
projectionStateEncoder: projectionStateEncoder,

metadata/metadata.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ func (v *valueData) MarshalJSON() ([]byte, error) {
9898
return json.Marshal(v.AsMap())
9999
}
100100

101+
// UnmarshalJSON unmarshals the provided json into a Metadata instance
101102
func UnmarshalJSON(json []byte) (Metadata, error) {
102103
in := jlexer.Lexer{Data: json}
103104
metadata := New()

mocks/mocks.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ import (
2222

2323
var _ goengine.Message = &DummyMessage{}
2424

25+
// DummyMessage a simple goengine.Message implementation used for testing
2526
type DummyMessage struct {
2627
uuid goengine.UUID
2728
payload interface{}
2829
metadata metadata.Metadata
2930
createdAt time.Time
3031
}
3132

33+
// NewDummyMessage returns a new DummyMessage
3234
func NewDummyMessage(id goengine.UUID, payload interface{}, meta metadata.Metadata, time time.Time) *DummyMessage {
3335
return &DummyMessage{
3436
id,
@@ -38,22 +40,27 @@ func NewDummyMessage(id goengine.UUID, payload interface{}, meta metadata.Metada
3840
}
3941
}
4042

43+
// UUID returns the identifier of this message
4144
func (d *DummyMessage) UUID() goengine.UUID {
4245
return d.uuid
4346
}
4447

48+
// CreatedAt returns the created time of the message
4549
func (d *DummyMessage) CreatedAt() time.Time {
4650
return d.createdAt
4751
}
4852

53+
// Payload returns the payload of the message
4954
func (d *DummyMessage) Payload() interface{} {
5055
return d.payload
5156
}
5257

58+
// Metadata return the message metadata
5359
func (d *DummyMessage) Metadata() metadata.Metadata {
5460
return d.metadata
5561
}
5662

63+
// WithMetadata Returns new instance of the message with key and value added to metadata
5764
func (d *DummyMessage) WithMetadata(key string, value interface{}) goengine.Message {
5865
newMessage := *d
5966
newMessage.metadata = metadata.WithValue(d.metadata, key, value)

strategy/json/sql/postgres/sql_schema.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $EXIST$`
3333
// sqlTriggerEventStreamNotify a helper to create the sql on a event store table
3434
func sqlTriggerEventStreamNotifyTemplate(eventStreamName goengine.StreamName, eventStreamTable string) string {
3535
triggerName := fmt.Sprintf("%s_notify", eventStreamTable)
36-
/* #nosec */
36+
/* #nosec G201 */
3737
return fmt.Sprintf(
3838
`DO LANGUAGE plpgsql $EXIST$
3939
BEGIN
@@ -61,7 +61,7 @@ func sqlTriggerEventStreamNotifyTemplate(eventStreamName goengine.StreamName, ev
6161

6262
// StreamProjectorCreateSchema return the sql statement needed for the postgres database in order to use the StreamProjector
6363
func StreamProjectorCreateSchema(projectionTable string, streamName goengine.StreamName, streamTable string) []string {
64-
/* #nosec */
64+
/* #nosec G201 */
6565
return []string{
6666
sqlFuncEventStreamNotify,
6767
sqlTriggerEventStreamNotifyTemplate(streamName, streamTable),
@@ -82,7 +82,7 @@ func StreamProjectorCreateSchema(projectionTable string, streamName goengine.Str
8282

8383
// AggregateProjectorCreateSchema return the sql statement needed for the postgres database in order to use the AggregateProjector
8484
func AggregateProjectorCreateSchema(projectionTable string, streamName goengine.StreamName, streamTable string) []string {
85-
/* #nosec */
85+
/* #nosec G201 */
8686
return []string{
8787
sqlFuncEventStreamNotify,
8888
sqlTriggerEventStreamNotifyTemplate(streamName, streamTable),

test/internal/postgres.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (c *dbController) disableDatabaseAccess(t *testing.T, databaseName string)
8282
// Terminate existing connections
8383
rows, err := c.db.Query("SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = $1", databaseName)
8484
require.NoError(t, err)
85-
defer rows.Close()
85+
require.NoError(t, err, rows.Close())
8686
}
8787

8888
func (c *dbController) enableDatabaseAccess(t *testing.T, databaseName string) {

0 commit comments

Comments
 (0)