From d2e150157977781ec52924d28a5e0c708ea9ae54 Mon Sep 17 00:00:00 2001 From: Eddie Knight Date: Tue, 31 Oct 2023 07:19:58 -0500 Subject: [PATCH] Polished some messages Signed-off-by: Eddie Knight --- strikes/Encryption.go | 4 ++-- strikes/RBAC.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/strikes/Encryption.go b/strikes/Encryption.go index e548b14..19737aa 100644 --- a/strikes/Encryption.go +++ b/strikes/Encryption.go @@ -42,14 +42,14 @@ func (a *Strikes) Encryption() (strikeName string, result raidengine.StrikeResul } result.Passed = true - result.Message = "Completed Successfully" + result.Message = "Storage encryption is enabled" return } func checkIfStorageIsEncryptedMovement(cfg aws.Config) (result raidengine.MovementResult) { result = raidengine.MovementResult{ - Description: "Check if the instance has storage encryption enabled", + Description: "Check whether the instance has storage encryption enabled", Function: utils.CallerPath(0), } diff --git a/strikes/RBAC.go b/strikes/RBAC.go index 1efa632..96cee07 100644 --- a/strikes/RBAC.go +++ b/strikes/RBAC.go @@ -14,7 +14,7 @@ func (a *Strikes) RBAC() (strikeName string, result raidengine.StrikeResult) { strikeName = "RBAC" result = raidengine.StrikeResult{ Passed: false, - Description: "Check if database IAM authentication is enabled on the specified RDS instance", + Description: "Check whether primary RDS instance supports RBAC authentication", DocsURL: "https://www.github.com/krumIO/raid-rds", ControlID: "CCC-Taxonomy-1", Movements: make(map[string]raidengine.MovementResult), @@ -36,20 +36,19 @@ func (a *Strikes) RBAC() (strikeName string, result raidengine.StrikeResult) { iamDatabaseAuthMovement := checkForIAMDatabaseAuthMovement(cfg) result.Movements["CheckForIAMDatabaseAuth"] = iamDatabaseAuthMovement + result.Message = iamDatabaseAuthMovement.Message if !iamDatabaseAuthMovement.Passed { - result.Message = iamDatabaseAuthMovement.Message return } result.Passed = true - result.Message = "Completed Successfully" return } func checkForIAMDatabaseAuthMovement(cfg aws.Config) (result raidengine.MovementResult) { result = raidengine.MovementResult{ - Description: "Check if the instance has IAM Database Authentication enabled", + Description: "Check whether the instance has IAM Database Authentication enabled", Function: utils.CallerPath(0), } @@ -71,5 +70,6 @@ func checkForIAMDatabaseAuthMovement(cfg aws.Config) (result raidengine.Movement // Loop through the instances and print information result.Passed = true + result.Message = "IAM Database Authentication is enabled" return }