Skip to content
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.

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

feat: store generated changeset into ingestion log #172

Merged
merged 9 commits into from
Sep 20, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
add unit tests
leoparente committed Sep 19, 2024
commit 0875b9bcce2df016b1a50e3f28fef1783d4c82b8
2 changes: 1 addition & 1 deletion diode-server/reconciler/ingestion_processor.go
Original file line number Diff line number Diff line change
@@ -346,7 +346,7 @@ func (p *IngestionProcessor) reconcileEntity(ctx context.Context, ingestEntity c

resp, err := p.nbClient.ApplyChangeSet(ctx, req)
if err != nil {
return nil, err
return cs, err
}

p.logger.Debug("apply change set response", "response", resp)
57 changes: 45 additions & 12 deletions diode-server/reconciler/ingestion_processor_internal_test.go
leoparente marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -212,12 +212,14 @@ func TestReconcileEntity(t *testing.T) {

func TestHandleStreamMessage(t *testing.T) {
tests := []struct {
name string
validMsg bool
entities []*diodepb.Entity
mockChangeSet *changeset.ChangeSet
reconcilerError bool
expectedError bool
name string
validMsg bool
entities []*diodepb.Entity
mockChangeSet *changeset.ChangeSet
changeSetResponse *netboxdiodeplugin.ChangeSetResponse
changeSetError error
reconcilerError bool
expectedError bool
}{
{
name: "successful processing",
@@ -231,8 +233,9 @@ func TestHandleStreamMessage(t *testing.T) {
},
},
},
reconcilerError: false,
expectedError: false,
changeSetResponse: &netboxdiodeplugin.ChangeSetResponse{},
reconcilerError: false,
expectedError: false,
},
{
name: "unmarshal error",
@@ -257,8 +260,9 @@ func TestHandleStreamMessage(t *testing.T) {
},
},
},
reconcilerError: true,
expectedError: false,
changeSetResponse: &netboxdiodeplugin.ChangeSetResponse{},
reconcilerError: true,
expectedError: false,
},
{
name: "no entities",
@@ -268,11 +272,35 @@ func TestHandleStreamMessage(t *testing.T) {
Entity: nil,
},
},
changeSetResponse: &netboxdiodeplugin.ChangeSetResponse{},
reconcilerError: false,
expectedError: false,
},
{
name: "change set available",
validMsg: true,
entities: []*diodepb.Entity{
{
Entity: &diodepb.Entity_Site{
Site: &diodepb.Site{
Name: "test-site-name",
},
},
},
},
mockChangeSet: &changeset.ChangeSet{
ChangeSetID: "cs123",
ChangeSet: []changeset.Change{},
},
changeSetResponse: &netboxdiodeplugin.ChangeSetResponse{
ChangeSetID: "cs123",
Result: "changed",
},
reconcilerError: false,
expectedError: false,
},
{
name: "change set available",
name: "change set apply error",
validMsg: true,
entities: []*diodepb.Entity{
{
@@ -287,6 +315,11 @@ func TestHandleStreamMessage(t *testing.T) {
ChangeSetID: "cs123",
ChangeSet: []changeset.Change{},
},
changeSetResponse: &netboxdiodeplugin.ChangeSetResponse{
ChangeSetID: "cs123",
Result: "changed",
},
changeSetError: errors.New("apply error"),
reconcilerError: false,
expectedError: false,
},
@@ -341,7 +374,7 @@ func TestHandleStreamMessage(t *testing.T) {
Site: nil,
}}, nil)
}
mockNbClient.On("ApplyChangeSet", ctx, mock.Anything).Return(&netboxdiodeplugin.ChangeSetResponse{}, nil)
mockNbClient.On("ApplyChangeSet", ctx, mock.Anything).Return(tt.changeSetResponse, tt.changeSetError)
if tt.entities[0].Entity != nil {
mockRedisClient.On("Do", ctx, "JSON.SET", mock.Anything, "$", mock.Anything).Return(redis.NewCmd(ctx))
}