Skip to content

Commit

Permalink
Revert "Add a pending remediation status and support tracking opened …
Browse files Browse the repository at this point in the history
…PRs" (#2862)

Revert "Add a pending remediation status and support tracking opened PRs (#2833)"

This reverts commit f330d61.
  • Loading branch information
rdimitrov authored Mar 29, 2024
1 parent 5d9064f commit be7bbf3
Show file tree
Hide file tree
Showing 19 changed files with 313 additions and 574 deletions.
4 changes: 1 addition & 3 deletions cmd/cli/app/profile/table_render.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func getEvalStatusText(status string) string {

// Gets a friendly status text with an emoji
func getRemediationStatusText(status string) string {
// remediation statuses can be 'success', 'failure', 'error', 'skipped', 'pending' or 'not supported'
// remediation statuses can be 'success', 'failure', 'error', 'skipped', 'not supported'
switch strings.ToLower(status) {
case successStatus:
return "Success"
Expand All @@ -199,8 +199,6 @@ func getRemediationStatusText(status string) string {
return "Error"
case skippedStatus:
return "Skipped" // visually empty as we didn't have to remediate
case pendingStatus:
return "Pending"
case notAvailableStatus:
return "Not Available"
default:
Expand Down
17 changes: 0 additions & 17 deletions database/migrations/000041_remediate_metadata.down.sql

This file was deleted.

17 changes: 0 additions & 17 deletions database/migrations/000041_remediate_metadata.up.sql

This file was deleted.

12 changes: 4 additions & 8 deletions database/query/profile_status.sql
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@ INSERT INTO rule_details_remediate (
rule_eval_id,
status,
details,
metadata,
last_updated
)
VALUES ($1, $2, $3, sqlc.arg(metadata)::jsonb, NOW())
VALUES ($1, $2, $3, NOW())
ON CONFLICT(rule_eval_id)
DO UPDATE SET
status = $2,
details = $3,
metadata = sqlc.arg(metadata)::jsonb,
last_updated = NOW()
WHERE rule_details_remediate.rule_eval_id = $1
RETURNING id;
Expand All @@ -52,9 +50,9 @@ INSERT INTO rule_details_alert (
VALUES ($1, $2, $3, sqlc.arg(metadata)::jsonb, NOW())
ON CONFLICT(rule_eval_id)
DO UPDATE SET
status = $2,
details = $3,
metadata = sqlc.arg(metadata)::jsonb,
status = CASE WHEN $2 != 'skipped' THEN $2 ELSE rule_details_alert.status END,
details = CASE WHEN $2 != 'skipped' THEN $3 ELSE rule_details_alert.details END,
metadata = CASE WHEN $2 != 'skipped' THEN sqlc.arg(metadata)::jsonb ELSE rule_details_alert.metadata END,
last_updated = NOW()
WHERE rule_details_alert.rule_eval_id = $1
RETURNING id;
Expand Down Expand Up @@ -98,7 +96,6 @@ WITH
rule_eval_id,
status AS rem_status,
details AS rem_details,
metadata AS rem_metadata,
last_updated AS rem_last_updated
FROM rule_details_remediate
),
Expand All @@ -118,7 +115,6 @@ SELECT
ed.eval_details,
rd.rem_status,
rd.rem_details,
rd.rem_metadata,
rd.rem_last_updated,
ad.alert_status,
ad.alert_details,
Expand Down
2 changes: 0 additions & 2 deletions internal/db/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 5 additions & 17 deletions internal/db/profile_status.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 2 additions & 18 deletions internal/db/profiles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"time"

"github.com/google/uuid"
"github.com/sqlc-dev/pqtype"
"github.com/stretchr/testify/require"

"github.com/stacklok/minder/internal/util/rand"
Expand All @@ -29,10 +28,6 @@ func createRandomProfile(t *testing.T, prov Provider, projectID uuid.UUID, label
ActionType: "on",
Valid: true,
},
Alert: NullActionType{
ActionType: "on",
Valid: true,
},
Labels: labels,
}

Expand Down Expand Up @@ -114,7 +109,7 @@ func upsertEvalStatus(

func upsertRemediationStatus(
t *testing.T, profileID uuid.UUID, repoID uuid.UUID, ruleTypeID uuid.UUID,
remStatus RemediationStatusTypes, details string, metadata json.RawMessage,
remStatus RemediationStatusTypes, details string,
) {
t.Helper()

Expand All @@ -134,7 +129,6 @@ func upsertRemediationStatus(
RuleEvalID: id,
Status: remStatus,
Details: details,
Metadata: metadata,
})
require.NoError(t, err)
}
Expand Down Expand Up @@ -651,10 +645,8 @@ func compareRows(t *testing.T, a, b *ListRuleEvaluationsByProfileIdRow) {
require.Equal(t, a.EvalDetails, b.EvalDetails)
require.Equal(t, a.RemStatus, b.RemStatus)
require.Equal(t, a.RemDetails, b.RemDetails)
require.Equal(t, a.RemMetadata, b.RemMetadata)
require.Equal(t, a.AlertStatus, b.AlertStatus)
require.Equal(t, a.AlertDetails, b.AlertDetails)
require.Equal(t, a.AlertMetadata, b.AlertMetadata)
require.Equal(t, a.Entity, b.Entity)
}

Expand Down Expand Up @@ -788,7 +780,7 @@ func TestListRuleEvaluations(t *testing.T) {
EvalStatusTypesFailure, "this rule failed")
upsertRemediationStatus(
t, profile.ID, randomEntities.repo.ID, randomEntities.ruleType1.ID,
RemediationStatusTypesSuccess, "this rule was remediated", json.RawMessage(`{"pr_number": "56"}`))
RemediationStatusTypesSuccess, "this rule was remediated")
upsertAlertStatus(
t, profile.ID, randomEntities.repo.ID, randomEntities.ruleType1.ID,
AlertStatusTypesOn, "we alerted about this rule", json.RawMessage(`{"ghsa_id": "GHSA-xxxx-xxxx-xxxx"}`))
Expand All @@ -814,10 +806,6 @@ func TestListRuleEvaluations(t *testing.T) {
String: "this rule was remediated",
Valid: true,
},
RemMetadata: pqtype.NullRawMessage{
RawMessage: json.RawMessage(`{"pr_number": "56"}`),
Valid: true,
},
AlertStatus: NullAlertStatusTypes{
AlertStatusTypes: AlertStatusTypesOn,
Valid: true,
Expand All @@ -826,10 +814,6 @@ func TestListRuleEvaluations(t *testing.T) {
String: "we alerted about this rule",
Valid: true,
},
AlertMetadata: pqtype.NullRawMessage{
RawMessage: json.RawMessage(`{"ghsa_id": "GHSA-xxxx-xxxx-xxxx"}`),
Valid: true,
},
Entity: EntitiesRepository,
},
},
Expand Down
Loading

0 comments on commit be7bbf3

Please sign in to comment.