Moved aws variables to top level

Signed-off-by: Eddie Knight <[email protected]>
krumIO · Oct 29, 2023 · 77b8fd3 · 77b8fd3
1 parent dab9fc2
commit 77b8fd3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/example-config.yml b/example-config.yml
@@ -1,12 +1,12 @@
 loglevel: Debug
 WriteDirectory: test_output
+AWS:
+  access_key: access
+  secret_key: supersecret
+  session_key: ""
+  region: us-east-1
 raids:
   rds:
-    creds:
-      aws_access_key: access
-      aws_secret_key: supersecret
-      aws_session_key: ""
-      aws_region: us-east-1
     config:
       instance_identifier: unique-id-name
       database: test

diff --git a/strikes/common.go b/strikes/common.go
@@ -48,15 +48,15 @@ func getHostRDSRegion() (string, error) {
 }
 
 func getAWSConfig() (cfg aws.Config, err error) {
-	if viper.IsSet("raids.rds.creds") &&
-		viper.IsSet("raids.rds.creds.aws_access_key") &&
-		viper.IsSet("raids.rds.creds.aws_secret_key") &&
-		viper.IsSet("raids.rds.creds.aws_region") {
-
-		access_key := viper.GetString("raids.rds.creds.aws_access_key")
-		secret_key := viper.GetString("raids.rds.creds.aws_secret_key")
-		session_key := viper.GetString("raids.rds.creds.aws_session_key")
-		region := viper.GetString("raids.rds.creds.aws_region")
+	if viper.IsSet("aws") &&
+		viper.IsSet("aws.access_key") &&
+		viper.IsSet("aws.secret_key") &&
+		viper.IsSet("aws.region") {
+
+		access_key := viper.GetString("aws.access_key")
+		secret_key := viper.GetString("aws.secret_key")
+		session_key := viper.GetString("aws.session_key")
+		region := viper.GetString("aws.region")
 
 		creds := credentials.NewStaticCredentialsProvider(access_key, secret_key, session_key)
 		cfg, err = config.LoadDefaultConfig(context.TODO(), config.WithCredentialsProvider(creds), config.WithRegion(region))