From be157a8a5ad9f931a107ab39db2ab30b7f4cbd00 Mon Sep 17 00:00:00 2001 From: Huang Huang Date: Sun, 27 Mar 2022 14:36:24 +0800 Subject: [PATCH 1/2] ASFF: no longer include timestamp in the finding ID (#1127) --- check/controls.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check/controls.go b/check/controls.go index f84acf7..78261ba 100644 --- a/check/controls.go +++ b/check/controls.go @@ -249,7 +249,7 @@ func (controls *Controls) ASFF() ([]*securityhub.AwsSecurityFinding, error) { AwsAccountId: aws.String(a), Confidence: aws.Int64(100), GeneratorId: aws.String(fmt.Sprintf("%s/cis-kubernetes-benchmark/%s/%s", arn, controls.Version, check.ID)), - Id: aws.String(fmt.Sprintf("%s%sEKSnodeID+%s%s", arn, a, check.ID, tf)), + Id: aws.String(fmt.Sprintf("%s%sEKSnodeID+%s", arn, a, check.ID)), CreatedAt: aws.String(tf), Description: aws.String(check.Text), ProductArn: aws.String(arn), From 70a544e916efacb7ecdb7f77dd3c74d17321af3e Mon Sep 17 00:00:00 2001 From: Luis Serra <74016165+luis-serra-ki@users.noreply.github.com> Date: Mon, 28 Mar 2022 15:40:04 +0100 Subject: [PATCH 2/2] chore(message): fix wrong PGSQL_DBNAME error message (#1128) --- cmd/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/database.go b/cmd/database.go index 6732ede..17d202d 100644 --- a/cmd/database.go +++ b/cmd/database.go @@ -38,7 +38,7 @@ func getPsqlConnInfo() (PsqlConnInfo, error) { if value := viper.GetString("PGSQL_DBNAME"); value != "" { dbName = value } else { - return PsqlConnInfo{}, fmt.Errorf("%s_PGSQL_USER env var is required", envVarsPrefix) + return PsqlConnInfo{}, fmt.Errorf("%s_PGSQL_DBNAME env var is required", envVarsPrefix) } var sslMode string