modules/mu/clouds/aws/database.rb in cloud-mu-3.0.0 vs modules/mu/clouds/aws/database.rb in cloud-mu-3.0.1
- old
+ new
@@ -926,11 +926,11 @@
# Apply engine-specific master username constraints
if config["engine"].match(/^oracle/)
basename[0..29].gsub(/[^a-z0-9]/i, "")
elsif config["engine"].match(/^sqlserver/)
basename[0..127].gsub(/[^a-z0-9]/i, "")
- elsif config["engine"].match(/^mysql/)
+ elsif config["engine"].match(/^(mysql|maria)/)
basename[0..15].gsub(/[^a-z0-9]/i, "")
elsif config["engine"].match(/^aurora/)
basename[0..15].gsub(/[^a-z0-9]/i, "")
else
basename.gsub(/[^a-z0-9]/i, "")
@@ -1601,10 +1601,10 @@
end
db["license_model"] ||=
if ["postgres", "postgresql", "aurora-postgresql"].include?(db["engine"])
"postgresql-license"
- elsif db["engine"] == "mysql"
+ elsif ["mysql", "mariadb"].include?(db["engine"])
"general-public-license"
else
"license-included"
end