Skip to content

Commit 76e0511

Browse files
kylecarbskylecarbs
committed
Fix nil type
1 parent bb5b347 commit 76e0511

File tree

7 files changed

+31
-34
lines changed

7 files changed

+31
-34
lines changed

‎coderd/database/dump.sql

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000061_replicas.up.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS replicas (
2121
database_latency int NOT NULL,
2222
-- Version is the Coder version of the replica.
2323
version text NOT NULL,
24-
error text
24+
error text NOT NULL DEFAULT ''
2525
);
2626

2727
-- Associates a provisioner daemon with a replica.

‎coderd/database/models.go

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎enterprise/coderd/replicas.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func convertReplica(replica database.Replica) codersdk.Replica {
3131
CreatedAt: replica.CreatedAt,
3232
RelayAddress: replica.RelayAddress,
3333
RegionID: replica.RegionID,
34-
Error: replica.Error.String,
34+
Error: replica.Error,
3535
DatabaseLatency: replica.DatabaseLatency,
3636
}
3737
}

‎enterprise/replicasync/replicasync.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,9 @@ func (m *Manager) syncReplicas(ctx context.Context) error {
271271
}(peer)
272272
}
273273
wg.Wait()
274-
replicaError := sql.NullString{}
274+
replicaError := ""
275275
if len(failed) > 0 {
276-
replicaError = sql.NullString{
277-
Valid: true,
278-
String: fmt.Sprintf("Failed to dial peers: %s", strings.Join(failed, ", ")),
279-
}
276+
replicaError = fmt.Sprintf("Failed to dial peers: %s", strings.Join(failed, ", "))
280277
}
281278

282279
databaseLatency, err := m.db.Ping(ctx)
@@ -301,7 +298,7 @@ func (m *Manager) syncReplicas(ctx context.Context) error {
301298
}
302299
m.mutex.Lock()
303300
defer m.mutex.Unlock()
304-
if m.self.Error.String != replica.Error.String {
301+
if m.self.Error != replica.Error {
305302
// Publish an update occurred!
306303
err = m.pubsub.Publish(PubsubEvent, []byte(m.self.ID.String()))
307304
if err != nil {

‎enterprise/replicasync/replicasync_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func TestReplica(t *testing.T) {
8484
require.NoError(t, err)
8585
require.Len(t, server.Regional(), 1)
8686
require.Equal(t, peer.ID, server.Regional()[0].ID)
87-
require.False(t, server.Self().Error.Valid)
87+
require.Empty(t, server.Self().Error)
8888
_ = server.Close()
8989
})
9090
t.Run("ConnectsToPeerReplicaTLS", func(t *testing.T) {
@@ -125,7 +125,7 @@ func TestReplica(t *testing.T) {
125125
require.NoError(t, err)
126126
require.Len(t, server.Regional(), 1)
127127
require.Equal(t, peer.ID, server.Regional()[0].ID)
128-
require.False(t, server.Self().Error.Valid)
128+
require.Empty(t, server.Self().Error)
129129
_ = server.Close()
130130
})
131131
t.Run("ConnectsToFakePeerWithError", func(t *testing.T) {
@@ -148,8 +148,8 @@ func TestReplica(t *testing.T) {
148148
require.NoError(t, err)
149149
require.Len(t, server.Regional(), 1)
150150
require.Equal(t, peer.ID, server.Regional()[0].ID)
151-
require.True(t, server.Self().Error.Valid)
152-
require.Contains(t, server.Self().Error.String, "Failed to dial peers")
151+
require.NotEmpty(t, server.Self().Error)
152+
require.Contains(t, server.Self().Error, "Failed to dial peers")
153153
_ = server.Close()
154154
})
155155
t.Run("RefreshOnPublish", func(t *testing.T) {

0 commit comments

Comments
 (0)