Skip to content

Commit 6efde91

Browse files
committed
fix: from review
1 parent e91216b commit 6efde91

File tree

3 files changed

+28
-11
lines changed

3 files changed

+28
-11
lines changed

internal/replication/controller_grpc_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (t ThroughGRPCBackend) CreateExporter(ctx context.Context, configuration le
3030
Config: mapExporterConfiguration(configuration),
3131
})
3232
if err != nil {
33-
if status.Code(err) != codes.InvalidArgument {
33+
if status.Code(err) == codes.InvalidArgument {
3434
return nil, system.NewErrInvalidDriverConfiguration(configuration.Driver, err)
3535
}
3636

internal/storage/system/store.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,22 @@ func (d *DefaultStore) StorePipelineState(ctx context.Context, id string, lastLo
309309
}
310310

311311
func (d *DefaultStore) UpdateExporter(ctx context.Context, exporter ledger.Exporter) error {
312-
_, err := d.db.NewUpdate().
312+
ret, err := d.db.NewUpdate().
313313
Model(&exporter).
314314
Where("id = ?", exporter.ID).
315315
Exec(ctx)
316-
return postgres.ResolveError(err)
316+
if err != nil {
317+
return postgres.ResolveError(err)
318+
}
319+
320+
rowsAffected, err := ret.RowsAffected()
321+
if err != nil {
322+
return err
323+
}
324+
325+
if rowsAffected == 0 {
326+
return postgres.ErrNotFound
327+
}
328+
329+
return nil
317330
}

test/e2e/suite_test.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package test_suite
44

55
import (
66
"context"
7-
"crypto/rand"
87
"crypto/rsa"
98
"encoding/json"
9+
"math/rand"
1010
"net/http"
1111
"net/http/httptest"
1212
"os"
@@ -50,6 +50,15 @@ var (
5050
DBTemplate = "dbtemplate"
5151
)
5252

53+
func init() {
54+
var err error
55+
// Use a static random source to have the same key every time (for parallel testing with ginkgo)
56+
testPrivateKey, err = rsa.GenerateKey(rand.New(rand.NewSource(1)), 2048)
57+
if err != nil {
58+
panic("failed to generate test RSA key: " + err.Error())
59+
}
60+
}
61+
5362
type ParallelExecutionContext struct {
5463
PostgresServer *PostgresServer
5564
NatsServer *natstesting.NatsServer
@@ -63,11 +72,6 @@ var _ = SynchronizedBeforeSuite(func(specContext SpecContext) []byte {
6372
By("Initializing docker pool")
6473
dockerPool.SetValue(docker.NewPool(GinkgoT(), logger))
6574

66-
// Generate RSA key for OIDC mock server
67-
var err error
68-
testPrivateKey, err = rsa.GenerateKey(rand.Reader, 2048)
69-
Expect(err).To(BeNil())
70-
7175
// Initialize mock OIDC server
7276
testIssuerURL.LoadAsync(func() (string, error) {
7377
By("Initializing mock OIDC server")
@@ -159,7 +163,7 @@ var _ = SynchronizedBeforeSuite(func(specContext SpecContext) []byte {
159163

160164
By("Waiting services alive")
161165
By("Waiting PG")
162-
_, err = pgServer.Wait(specContext)
166+
_, err := pgServer.Wait(specContext)
163167
Expect(err).To(BeNil())
164168
By("Waiting nats")
165169
_, err = natsServer.Wait(specContext)
@@ -170,7 +174,7 @@ var _ = SynchronizedBeforeSuite(func(specContext SpecContext) []byte {
170174
By("Waiting mock OIDC server")
171175
_, err = testIssuerURL.Wait(specContext)
172176
Expect(err).To(BeNil())
173-
//Expect(deferred.WaitContext(specContext, pgServer, natsServer, clickhouseServer, mockOIDCServer)).To(BeNil())
177+
174178
By("All services ready.")
175179

176180
data, err := json.Marshal(ParallelExecutionContext{

0 commit comments

Comments
 (0)