-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: move datapipe status state from in-memory to postgres (#653)
- Loading branch information
1 parent
924acb4
commit 9b52371
Showing
14 changed files
with
226 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Copyright 2024 Specter Ops, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| //go:build serial_integration | ||
| // +build serial_integration | ||
|
|
||
| package v2_test | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/specterops/bloodhound/src/api/v2/integration" | ||
| "github.com/specterops/bloodhound/src/model" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestGetDatapipeStatus(t *testing.T) { | ||
| testCtx := integration.NewFOSSContext(t) | ||
|
|
||
| testCtx.WaitForDatapipeIdle(90 * time.Second) | ||
|
|
||
| datapipeStatus, err := testCtx.AdminClient().GetDatapipeStatus() | ||
| require.Nil(t, err) | ||
| require.Equal(t, datapipeStatus.Status, model.DatapipeStatusIdle) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // Copyright 2024 Specter Ops, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package database | ||
|
|
||
| import ( | ||
| "context" | ||
| "database/sql" | ||
| "time" | ||
|
|
||
| "github.com/specterops/bloodhound/src/model" | ||
| ) | ||
|
|
||
| func (s *BloodhoundDB) SetDatapipeStatus(ctx context.Context, status model.DatapipeStatus, updateAnalysisTime bool) error { | ||
|
|
||
| updateSql := "UPDATE datapipe_status SET status = ?, updated_at = ?" | ||
| now := time.Now().UTC() | ||
|
|
||
| if updateAnalysisTime { | ||
| updateSql += ", last_complete_analysis_at = ?;" | ||
| return s.db.WithContext(ctx).Exec(updateSql, status, now, now).Error | ||
| } else { | ||
| updateSql += ";" | ||
| return s.db.WithContext(ctx).Exec(updateSql, status, now).Error | ||
| } | ||
|
|
||
| } | ||
|
|
||
| func (s *BloodhoundDB) GetDatapipeStatus(ctx context.Context) (model.DatapipeStatusWrapper, error) { | ||
| var datapipeStatus model.DatapipeStatusWrapper | ||
|
|
||
| if tx := s.db.WithContext(ctx).Raw("SELECT status, updated_at, last_complete_analysis_at FROM datapipe_status LIMIT 1;").Scan(&datapipeStatus); tx.RowsAffected == 0 { | ||
| return datapipeStatus, sql.ErrNoRows | ||
| } | ||
|
|
||
| return datapipeStatus, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Copyright 2024 Specter Ops, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package database_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/specterops/bloodhound/src/model" | ||
| "github.com/specterops/bloodhound/src/test/integration" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestDatapipeStatus(t *testing.T) { | ||
| var ( | ||
| testCtx = context.Background() | ||
| db = integration.SetupDB(t) | ||
| ) | ||
|
|
||
| status, err := db.GetDatapipeStatus(testCtx) | ||
| require.Nil(t, err) | ||
| require.Equal(t, model.DatapipeStatusIdle, status.Status) | ||
|
|
||
| err = db.SetDatapipeStatus(testCtx, model.DatapipeStatusAnalyzing, false) | ||
| require.Nil(t, err) | ||
|
|
||
| status, err = db.GetDatapipeStatus(testCtx) | ||
| require.Nil(t, err) | ||
| require.Equal(t, model.DatapipeStatusAnalyzing, status.Status) | ||
|
|
||
| // when `SetDatapipeStatus` is called with `true` for the `updateAnalysisTime` parameter, assert that the time is no longer null | ||
| require.True(t, status.LastCompleteAnalysisAt.IsZero()) | ||
| err = db.SetDatapipeStatus(testCtx, model.DatapipeStatusAnalyzing, true) | ||
| require.Nil(t, err) | ||
| status, err = db.GetDatapipeStatus(testCtx) | ||
| require.Nil(t, err) | ||
| require.True(t, !status.LastCompleteAnalysisAt.IsZero()) | ||
|
|
||
| } |
Oops, something went wrong.