From 8285fdde630077bc40a612cd45730f6e5666954e Mon Sep 17 00:00:00 2001
From: max-huneshagen <max.huneshagen@skyscanner.net>
Date: Tue, 14 Nov 2023 10:08:40 +0100
Subject: [PATCH] make templates valid cloud formations (except for aurora one)
---
.../rules/StorageEncryptedRule/aurora_engine_used.yml | 4 +---
.../rules/StorageEncryptedRule/encrypted_db_resource.yml | 2 +-
.../StorageEncryptedRule/missing_storage_encrypted_flag.yml | 2 +-
.../rules/StorageEncryptedRule/no_db_resource.yml | 2 +-
.../StorageEncryptedRule/two_resources_not_encrypted.yml | 4 ++--
5 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tests/test_templates/rules/StorageEncryptedRule/aurora_engine_used.yml b/tests/test_templates/rules/StorageEncryptedRule/aurora_engine_used.yml
index ab74cd33..b7ad4815 100644
--- a/tests/test_templates/rules/StorageEncryptedRule/aurora_engine_used.yml
+++ b/tests/test_templates/rules/StorageEncryptedRule/aurora_engine_used.yml
@@ -2,15 +2,13 @@ Resources:
DBMaster:
Type: AWS::RDS::DBInstance
Properties:
- AllocatedStorage: "100"
AllowMajorVersionUpgrade: false
AutoMinorVersionUpgrade: true
- BackupRetentionPeriod: 14
DBInstanceIdentifier: !Sub ${AWS::StackName}-master
DBName: "some-name"
Engine: aurora-postgresql
EngineVersion: "13.2"
- KmsKeyId: !GetAtt RDSKMSKey.Arn
+ KmsKeyId: "some-kms-key"
MultiAZ: true
StorageEncrypted: false
Tags:
diff --git a/tests/test_templates/rules/StorageEncryptedRule/encrypted_db_resource.yml b/tests/test_templates/rules/StorageEncryptedRule/encrypted_db_resource.yml
index c89b7b63..8efac523 100644
--- a/tests/test_templates/rules/StorageEncryptedRule/encrypted_db_resource.yml
+++ b/tests/test_templates/rules/StorageEncryptedRule/encrypted_db_resource.yml
@@ -10,7 +10,7 @@ Resources:
DBName: "some-name"
Engine: mysql
EngineVersion: "13.2"
- KmsKeyId: !GetAtt RDSKMSKey.Arn
+ KmsKeyId: "some-kms-key"
MultiAZ: true
StorageEncrypted: true
Tags:
diff --git a/tests/test_templates/rules/StorageEncryptedRule/missing_storage_encrypted_flag.yml b/tests/test_templates/rules/StorageEncryptedRule/missing_storage_encrypted_flag.yml
index 2cb78a3f..850e1c09 100644
--- a/tests/test_templates/rules/StorageEncryptedRule/missing_storage_encrypted_flag.yml
+++ b/tests/test_templates/rules/StorageEncryptedRule/missing_storage_encrypted_flag.yml
@@ -10,7 +10,7 @@ Resources:
DBName: "some-name"
Engine: mysql
EngineVersion: "13.2"
- KmsKeyId: !GetAtt RDSKMSKey.Arn
+ KmsKeyId: "some-kms-key"
MultiAZ: true
Tags:
- Key: Name
diff --git a/tests/test_templates/rules/StorageEncryptedRule/no_db_resource.yml b/tests/test_templates/rules/StorageEncryptedRule/no_db_resource.yml
index 9ff0384e..2055a06e 100644
--- a/tests/test_templates/rules/StorageEncryptedRule/no_db_resource.yml
+++ b/tests/test_templates/rules/StorageEncryptedRule/no_db_resource.yml
@@ -9,7 +9,7 @@ Resources:
DatabaseName: "some-name"
Engine: mysql
EngineVersion: "13.2"
- KmsKeyId: !GetAtt RDSKMSKey.Arn
+ KmsKeyId: "some-kms-key"
StorageEncrypted: false
Tags:
- Key: Name
diff --git a/tests/test_templates/rules/StorageEncryptedRule/two_resources_not_encrypted.yml b/tests/test_templates/rules/StorageEncryptedRule/two_resources_not_encrypted.yml
index 36438d11..a9b4eea1 100644
--- a/tests/test_templates/rules/StorageEncryptedRule/two_resources_not_encrypted.yml
+++ b/tests/test_templates/rules/StorageEncryptedRule/two_resources_not_encrypted.yml
@@ -10,7 +10,7 @@ Resources:
DBName: "some-name"
Engine: mysql
EngineVersion: "13.2"
- KmsKeyId: !GetAtt RDSKMSKey.Arn
+ KmsKeyId: "some-kms-key"
MultiAZ: true
StorageEncrypted: false
Tags:
@@ -27,7 +27,7 @@ Resources:
DBName: "some-name-backup"
Engine: mysql
EngineVersion: "13.2"
- KmsKeyId: !GetAtt RDSKMSKey.Arn
+ KmsKeyId: "some-kms-key"
MultiAZ: true
StorageEncrypted: false
Tags: