Add option for RDS parameter group name

convox · Jan 22, 2024 · 6c58f13 · 6c58f13
1 parent fa02053
commit 6c58f13
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/provider/aws/formation/resource/mariadb.json.tmpl b/provider/aws/formation/resource/mariadb.json.tmpl
@@ -3,6 +3,7 @@
   "Conditions": {
     "BlankEncrypted": { "Fn::Equals": [ { "Ref": "Encrypted" }, "" ] },
     "BlankIops": { "Fn::Equals": [ { "Ref": "Iops" }, "0" ] },
+    "BlankParameterGroupName": { "Fn::Equals": [ { "Ref": "ParameterGroupName" }, "" ] },
     "BlankPreferredBackupWindow": { "Fn::Equals": [ { "Ref": "PreferredBackupWindow" }, "" ] }
   },
   "Parameters": {
@@ -43,6 +44,10 @@
       "NoEcho": true,
       "Type": "String"
     },
+    "ParameterGroupName": {
+      "Type" : "String",
+      "Default": ""
+    },
     "PreferredBackupWindow": {
       "Type": "String",
       "Default": ""
@@ -100,12 +105,13 @@
         "DBInstanceClass": { "Ref": "Class" },
         "DBInstanceIdentifier": { "Ref": "AWS::StackName" },
         "DBName": "app",
-        "DBParameterGroupName": { "Fn::Sub": [ "default.mariadb${Base}", {
-          "Base": { "Fn::Join": [ ".", [
-            { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] },
-            { "Fn::Select": [ 1, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }
-          ] ] }
-        } ] },
+        "DBParameterGroupName": { "Fn::If": [ "BlankParameterGroupName", { "Fn::Sub": [ "default.mariadb${Base}", {
+            "Base": { "Fn::Join": [ ".", [
+              { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] },
+              { "Fn::Select": [ 1, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }
+            ] ] }
+          } ] },
+        { "Ref": "ParameterGroupName" } ] },
         "DBSubnetGroupName": { "Ref": "SubnetGroup" },
         "DeletionProtection": { "Ref": "DeletionProtection" },
         "Engine": "mariadb",

diff --git a/provider/aws/formation/resource/mysql.json.tmpl b/provider/aws/formation/resource/mysql.json.tmpl
@@ -3,6 +3,7 @@
   "Conditions": {
     "BlankEncrypted": { "Fn::Equals": [ { "Ref": "Encrypted" }, "" ] },
     "BlankIops": { "Fn::Equals": [ { "Ref": "Iops" }, "0" ] },
+    "BlankParameterGroupName": { "Fn::Equals": [ { "Ref": "ParameterGroupName" }, "" ] },
     "BlankPreferredBackupWindow": { "Fn::Equals": [ { "Ref": "PreferredBackupWindow" }, "" ] }
   },
   "Parameters": {
@@ -43,6 +44,10 @@
       "NoEcho": true,
       "Type": "String"
     },
+    "ParameterGroupName": {
+      "Type" : "String",
+      "Default": ""
+    },
     "PreferredBackupWindow": {
       "Type": "String",
       "Default": ""
@@ -100,12 +105,13 @@
         "DBInstanceClass": { "Ref": "Class" },
         "DBInstanceIdentifier": { "Ref": "AWS::StackName" },
         "DBName": "app",
-        "DBParameterGroupName": { "Fn::Sub": [ "default.mysql${Base}", {
-          "Base": { "Fn::Join": [ ".", [
-            { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] },
-            { "Fn::Select": [ 1, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }
-          ] ] }
-        } ] },
+        "DBParameterGroupName": { "Fn::If": [ "BlankParameterGroupName", { "Fn::Sub": [ "default.mysql${Base}", {
+            "Base": { "Fn::Join": [ ".", [
+              { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] },
+              { "Fn::Select": [ 1, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }
+            ] ] }
+          } ] },
+        { "Ref": "ParameterGroupName" } ] },
         "DBSubnetGroupName": { "Ref": "SubnetGroup" },
         "DeletionProtection": { "Ref": "DeletionProtection" },
         "Engine": "mysql",

diff --git a/provider/aws/formation/resource/postgres.json.tmpl b/provider/aws/formation/resource/postgres.json.tmpl
@@ -4,6 +4,7 @@
     "BlankEncrypted": { "Fn::Equals": [ { "Ref": "Encrypted" }, "" ] },
     "BlankIops": { "Fn::Equals": [ { "Ref": "Iops" }, "0" ] },
     "BlankPreferredBackupWindow": { "Fn::Equals": [ { "Ref": "PreferredBackupWindow" }, "" ] },
+    "BlankParameterGroupName": { "Fn::Equals": [ { "Ref": "ParameterGroupName" }, "" ] },
     "Version9": { "Fn::Equals": [ { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }, "9" ] }
   },
   "Parameters": {
@@ -44,6 +45,10 @@
       "NoEcho": true,
       "Type": "String"
     },
+    "ParameterGroupName": {
+      "Type" : "String",
+      "Default": ""
+    },
     "PreferredBackupWindow": {
       "Type": "String",
       "Default": ""
@@ -101,15 +106,15 @@
         "DBInstanceClass": { "Ref": "Class" },
         "DBInstanceIdentifier": { "Ref": "AWS::StackName" },
         "DBName": "app",
-        "DBParameterGroupName": { "Fn::Sub": [ "default.postgres${Base}", {
-          "Base": { "Fn::If": [ "Version9",
-            { "Fn::Join": [ ".", [
-              { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] },
-              { "Fn::Select": [ 1, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }
-            ] ] },
-            { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }
-          ] }
-        } ] },
+        "DBParameterGroupName": { "Fn::If": [ "BlankParameterGroupName", { "Fn::If": [ "Version9",
+              { "Fn::Join": [ ".", [
+                { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] },
+                { "Fn::Select": [ 1, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }
+              ] ] },
+              { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }
+            ] }
+          } ] },
+        { "Ref": "ParameterGroupName" } ] },
         "DBSubnetGroupName": { "Ref": "SubnetGroup" },
         "DeletionProtection": { "Ref": "DeletionProtection" },
         "Engine": "postgres",