Merge pull request #31 from petlitskiy/forward-to-cloudwatch

Fix to migration 3.4.4 to newer (absent EngineMode enforce the Cluste…
theonestack · Jun 25, 2024 · d1232cf · d1232cf
2 parents ee3ff73 + d2fbeda
commit d1232cf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/aurora-mysql.cfhighlander.rb b/aurora-mysql.cfhighlander.rb
@@ -34,6 +34,8 @@
 
     ComponentParam 'NamespaceId' if defined? service_discovery
 
-    ComponentParam 'EnableReplicaAutoScaling', 'false', isGlobal: true
+    ComponentParam 'EnableReplicaAutoScaling', 'false'
+
+    ComponentParam 'EnableCloudwatchLogsExports', defined?(log_exports) ? log_exports : ''
   end
 end
diff --git a/aurora-mysql.cfndsl.rb b/aurora-mysql.cfndsl.rb
@@ -6,6 +6,7 @@
   Condition("UseSnapshotID", FnNot(FnEquals(Ref(:SnapshotID), '')))
   Condition("EnablePerformanceInsights", FnEquals(Ref(:EnablePerformanceInsights), 'true'))
   Condition("EnableReplicaAutoScaling", FnAnd([FnEquals(Ref(:EnableReplicaAutoScaling), 'true'), FnEquals(Ref(:EnableReader), 'true')]))
+  Condition("EnableCloudwatchLogsExports", FnNot(FnEquals(Ref(:EnableCloudwatchLogsExports), '')))
 
   tags = []
   tags << { Key: 'Environment', Value: Ref(:EnvironmentName) }
@@ -77,6 +78,9 @@
   RDS_DBCluster(:DBCluster) {
     Engine external_parameters[:engine]
     EngineVersion engine_version unless engine_version.nil?
+
+    EngineMode external_parameters[:engine_mode]
+
     PreferredMaintenanceWindow maintenance_window unless maintenance_window.nil?
     if engine_mode == 'serverless'
       EnableHttpEndpoint Ref(:EnableHttpEndpoint)
@@ -95,6 +99,16 @@
     StorageEncrypted storage_encrypted
     KmsKeyId Ref('KmsKeyId') if kms
     Tags tags + [{ Key: 'Name', Value: FnJoin('-', [ Ref(:EnvironmentName), external_parameters[:component_name], 'cluster' ])}]
+
+    if !external_parameters[:log_exports].nil?
+      if (external_parameters[:log_exports].is_a?(Array) and external_parameters[:log_exports].size > 0)
+        EnableCloudwatchLogsExports FnIf('EnableCloudwatchLogsExports', external_parameters[:log_exports], Ref('AWS::NoValue'))
+      end
+      if (external_parameters[:log_exports].is_a?(Hash) and external_parameters[:log_exports].keys[0].start_with?('Ref') and external_parameters[:log_exports].keys.size < 2)
+        EnableCloudwatchLogsExports FnIf('EnableCloudwatchLogsExports', FnSplit(',',external_parameters[:log_exports]), Ref('AWS::NoValue'))
+      end
+    end
+
   }
 
   if engine_mode == 'serverless'