Skip to content

Commit e962bfa

Browse files
beastawakensbeastawakens
committed
[#3462] db: minor version control, fix for snapshot identifier, new AMIs
null
1 parent 0a6cb1d commit e962bfa

File tree

9 files changed

+70
-24
lines changed

9 files changed

+70
-24
lines changed

‎provider/aws/formation/app.json.tmpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@
5252
"Parameters" : {
5353
{{ template "service-params" .Manifest }}
5454

55+
"AutoMinorVersionUpgrade": {
56+
"Type" : "String",
57+
"Default": "true",
58+
"AllowedValues" : [ "true", "false" ]
59+
},
5560
"CircuitBreaker": {
5661
"Type": "String",
5762
"Default": "No",
@@ -224,6 +229,7 @@
224229
{{ range $k, $v := (index $ (printf "ResourceParams%s" (upper .Name) ) ) }}
225230
"{{$k}}": "{{$v}}",
226231
{{ end }}
232+
"AutoMinorVersionUpgrade": { "Ref": "AutoMinorVersionUpgrade" },
227233
"Password": { "Fn::If": [ "BlankResourcePassword",
228234
{ "Fn::Select": [ 2, { "Fn::Split": [ "/", { "Ref": "AWS::StackId" } ] } ] },
229235
{ "Ref": "ResourcePassword" }

‎provider/aws/formation/rack.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -68,27 +68,27 @@
6868
},
6969
"Mappings": {
7070
"RegionConfig": {
71-
"af-south-1": { "Ami": "ami-02d67c60a9a72a4c9", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "098369216593", "Fargate": "Yes" },
72-
"ap-east-1": { "Ami": "ami-0903490e028d75f33", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "754344448648", "Fargate": "Yes" },
73-
"ap-northeast-1": { "Ami": "ami-0ffb5f4e03c892bc5", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "582318560864", "Fargate": "No" },
74-
"ap-northeast-2": { "Ami": "ami-0a09f75d88cac17d3", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "600734575887", "Fargate": "Yes" },
75-
"ap-northeast-3": { "Ami": "ami-0e47631e1b1fb884c", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "383597477331", "Fargate": "Yes" },
76-
"ap-south-1": { "Ami": "ami-02704edb2becb49b9", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "718504428378", "Fargate": "Yes" },
77-
"ap-southeast-1": { "Ami": "ami-0c5ab0d956378c44d", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "114774131450", "Fargate": "Yes" },
78-
"ap-southeast-2": { "Ami": "ami-0ba6df717ed766b7c", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "783225319266", "Fargate": "Yes" },
79-
"ca-central-1": { "Ami": "ami-09dab0e05012ef93d", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "985666609251", "Fargate": "No" },
80-
"eu-central-1": { "Ami": "ami-0ebfeb0108c46be41", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "054676820928", "Fargate": "Yes" },
81-
"eu-north-1": { "Ami": "ami-0035a9fe772fd6d60", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "897822967062", "Fargate": "Yes" },
82-
"eu-south-1": { "Ami": "ami-0d78d1b861cca58f3", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "635631232127", "Fargate": "Yes" },
83-
"eu-west-1": { "Ami": "ami-0fc76c7f5cfa96e89", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "156460612806", "Fargate": "Yes" },
84-
"eu-west-2": { "Ami": "ami-077f98d933531f865", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "652711504416", "Fargate": "Yes" },
85-
"eu-west-3": { "Ami": "ami-0c8823759848d625a", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "009996457667", "Fargate": "Yes" },
86-
"me-south-1": { "Ami": "ami-006655367b29fb81c", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "076674570225", "Fargate": "Yes" },
87-
"sa-east-1": { "Ami": "ami-0f9e2322459fd12e0", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "507241528517", "Fargate": "Yes" },
88-
"us-east-1": { "Ami": "ami-0dbd8c88f9060cf71", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "127311923021", "Fargate": "Yes" },
89-
"us-east-2": { "Ami": "ami-062be0c2f0e7fb6d2", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "033677994240", "Fargate": "Yes" },
90-
"us-west-1": { "Ami": "ami-09bc3667a66efbf89", "EFS": "Yes", "ThirdAvailabilityZone": "No", "ELBAccountId": "027434742980", "Fargate": "No" },
91-
"us-west-2": { "Ami": "ami-0a51409a409fbc030", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "797873946194", "Fargate": "Yes" },
71+
"af-south-1": { "Ami": "ami-04595fb57b8c3064d", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "098369216593", "Fargate": "Yes" },
72+
"ap-east-1": { "Ami": "ami-04ab87564f47361db", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "754344448648", "Fargate": "Yes" },
73+
"ap-northeast-1": { "Ami": "ami-07932765b08ae3232", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "582318560864", "Fargate": "No" },
74+
"ap-northeast-2": { "Ami": "ami-040ef5b25ed8bf593", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "600734575887", "Fargate": "Yes" },
75+
"ap-northeast-3": { "Ami": "ami-0fd48c913e53119a1", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "383597477331", "Fargate": "Yes" },
76+
"ap-south-1": { "Ami": "ami-017cab36e4ddda18b", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "718504428378", "Fargate": "Yes" },
77+
"ap-southeast-1": { "Ami": "ami-0cf02969983d4304c", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "114774131450", "Fargate": "Yes" },
78+
"ap-southeast-2": { "Ami": "ami-0e3a9308d8f475421", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "783225319266", "Fargate": "Yes" },
79+
"ca-central-1": { "Ami": "ami-0ebb9f30538a674fd", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "985666609251", "Fargate": "No" },
80+
"eu-central-1": { "Ami": "ami-0102ef3da1a6c47ca", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "054676820928", "Fargate": "Yes" },
81+
"eu-north-1": { "Ami": "ami-0e74361b71c3bbc04", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "897822967062", "Fargate": "Yes" },
82+
"eu-south-1": { "Ami": "ami-0d6fd8fdf5e5747a7", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "635631232127", "Fargate": "Yes" },
83+
"eu-west-1": { "Ami": "ami-0f81029f3b18d0712", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "156460612806", "Fargate": "Yes" },
84+
"eu-west-2": { "Ami": "ami-02fee912d20d2f3cd", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "652711504416", "Fargate": "Yes" },
85+
"eu-west-3": { "Ami": "ami-042e88199f7d67576", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "009996457667", "Fargate": "Yes" },
86+
"me-south-1": { "Ami": "ami-04109006cb2ed0b66", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "076674570225", "Fargate": "Yes" },
87+
"sa-east-1": { "Ami": "ami-095d3a8a82e8fadf6", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "507241528517", "Fargate": "Yes" },
88+
"us-east-1": { "Ami": "ami-0e5fb9632ceee168f", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "127311923021", "Fargate": "Yes" },
89+
"us-east-2": { "Ami": "ami-0dfa0bf531cde9048", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "033677994240", "Fargate": "Yes" },
90+
"us-west-1": { "Ami": "ami-08327d538edec6c14", "EFS": "Yes", "ThirdAvailabilityZone": "No", "ELBAccountId": "027434742980", "Fargate": "No" },
91+
"us-west-2": { "Ami": "ami-02b70ab564d80f9e9", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "797873946194", "Fargate": "Yes" },
9292
"us-gov-east-1": { "Ami": "ami-04f633b669ee7b61c", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "190560391635", "Fargate": "Yes" },
9393
"us-gov-west-1": { "Ami": "ami-90704ef1", "EFS": "Yes", "ThirdAvailabilityZone": "Yes", "ELBAccountId": "048591011584", "Fargate": "Yes" }
9494
}

‎provider/aws/formation/resource/mariadb.json.tmpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"BlankIops": { "Fn::Equals": [ { "Ref": "Iops" }, "0" ] }
66
},
77
"Parameters": {
8+
"AutoMinorVersionUpgrade": {
9+
"Type" : "String",
10+
"Default": "true",
11+
"AllowedValues" : [ "true", "false" ]
12+
},
813
"Class": {
914
"Type": "String",
1015
"Default": "db.t2.micro"
@@ -71,6 +76,7 @@
7176
"Properties": {
7277
"AllocatedStorage": { "Ref": "Storage" },
7378
"AllowMajorVersionUpgrade": "true",
79+
"AutoMinorVersionUpgrade": { "Ref": "AutoMinorVersionUpgrade" },
7480
"DBInstanceClass": { "Ref": "Class" },
7581
"DBInstanceIdentifier": { "Ref": "AWS::StackName" },
7682
"DBName": "app",

‎provider/aws/formation/resource/memcached.json.tmpl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"AWSTemplateFormatVersion" : "2010-09-09",
33
"Parameters": {
4+
"AutoMinorVersionUpgrade": {
5+
"Type" : "String",
6+
"Default": "true",
7+
"AllowedValues" : [ "true", "false" ]
8+
},
49
"Class": {
510
"Type": "String",
611
"Default": "cache.t2.micro"
@@ -50,7 +55,7 @@
5055
"CacheCluster": {
5156
"Type": "AWS::ElastiCache::CacheCluster",
5257
"Properties": {
53-
"AutoMinorVersionUpgrade": true,
58+
"AutoMinorVersionUpgrade": { "Ref": "AutoMinorVersionUpgrade" },
5459
"CacheNodeType": { "Ref": "Class" },
5560
"CacheSubnetGroupName": { "Ref": "SubnetGroup" },
5661
"Engine": "memcached",

‎provider/aws/formation/resource/mysql.json.tmpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"BlankIops": { "Fn::Equals": [ { "Ref": "Iops" }, "0" ] }
66
},
77
"Parameters": {
8+
"AutoMinorVersionUpgrade": {
9+
"Type" : "String",
10+
"Default": "true",
11+
"AllowedValues" : [ "true", "false" ]
12+
},
813
"Class": {
914
"Type": "String",
1015
"Default": "db.t2.micro"
@@ -71,6 +76,7 @@
7176
"Properties": {
7277
"AllocatedStorage": { "Ref": "Storage" },
7378
"AllowMajorVersionUpgrade": "true",
79+
"AutoMinorVersionUpgrade": { "Ref": "AutoMinorVersionUpgrade" },
7480
"DBInstanceClass": { "Ref": "Class" },
7581
"DBInstanceIdentifier": { "Ref": "AWS::StackName" },
7682
"DBName": "app",

‎provider/aws/formation/resource/postgres.json.tmpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
"Version9": { "Fn::Equals": [ { "Fn::Select": [ 0, { "Fn::Split": [ ".", { "Ref": "Version" } ] } ] }, "9" ] }
77
},
88
"Parameters": {
9+
"AutoMinorVersionUpgrade": {
10+
"Type" : "String",
11+
"Default": "true",
12+
"AllowedValues" : [ "true", "false" ]
13+
},
914
"Class": {
1015
"Type": "String",
1116
"Default": "db.t2.micro"
@@ -72,6 +77,7 @@
7277
"Properties": {
7378
"AllocatedStorage": { "Ref": "Storage" },
7479
"AllowMajorVersionUpgrade": "true",
80+
"AutoMinorVersionUpgrade": { "Ref": "AutoMinorVersionUpgrade" },
7581
"DBInstanceClass": { "Ref": "Class" },
7682
"DBInstanceIdentifier": { "Ref": "AWS::StackName" },
7783
"DBName": "app",

‎provider/aws/formation/resource/redis.json.tmpl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"Encrypted": { "Fn::Equals": [{ "Ref": "Encrypted" }, "true"] }
55
},
66
"Parameters": {
7+
"AutoMinorVersionUpgrade": {
8+
"Type" : "String",
9+
"Default": "true",
10+
"AllowedValues" : [ "true", "false" ]
11+
},
712
"Class": {
813
"Type": "String",
914
"Default": "cache.t2.micro"
@@ -86,7 +91,7 @@
8691
]
8792
},
8893
"AutomaticFailoverEnabled": { "Ref": "Durable" },
89-
"AutoMinorVersionUpgrade": "true",
94+
"AutoMinorVersionUpgrade": { "Ref": "AutoMinorVersionUpgrade" },
9095
"CacheNodeType": { "Ref": "Class" },
9196
"CacheSubnetGroupName": { "Ref": "SubnetGroup" },
9297
"Engine": "redis",

‎provider/aws/templates/resource/mysql.tmpl‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
"Default" : "10",
1313
"Description" : "Allocated storage size (GB)"
1414
},
15+
"AutoMinorVersionUpgrade": {
16+
"Type" : "String",
17+
"Default": "true",
18+
"AllowedValues" : [ "true", "false" ]
19+
},
1520
"Database": {
1621
"Type" : "String",
1722
"Default" : "app",
@@ -110,9 +115,10 @@
110115
"KmsKeyId": { "Fn::If": [ "Encrypted", { "Ref": "EncryptionKey" }, { "Ref": "AWS::NoValue" } ] },
111116
"StorageEncrypted": { "Ref": "Encrypted" },
112117
"AllocatedStorage": { "Ref": "AllocatedStorage" },
118+
"AutoMinorVersionUpgrade": { "Ref": "AutoMinorVersionUpgrade" },
113119
"DBInstanceClass": { "Ref": "InstanceType" },
114120
"DBInstanceIdentifier": { "Ref": "AWS::StackName" },
115-
"DBName": { "Ref": "Database" },
121+
"DBName": { "Fn::If": [ "BlankDatabaseSnapshotIdentifier", { "Ref": "Database" }, { "Ref": "AWS::NoValue" } ] },
116122
"DBSnapshotIdentifier": { "Fn::If": [ "BlankDatabaseSnapshotIdentifier", { "Ref": "AWS::NoValue" }, { "Ref": "DatabaseSnapshotIdentifier" } ] },
117123
"DBSubnetGroupName": { "Ref": "SubnetGroup" },
118124
"Engine": "mysql",

‎provider/aws/templates/resource/postgres.tmpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
"Default": "10",
1414
"Description": "Allocated storage size (GB)"
1515
},
16+
"AutoMinorVersionUpgrade": {
17+
"Type" : "String",
18+
"Default": "true",
19+
"AllowedValues" : [ "true", "false" ]
20+
},
1621
"Database": {
1722
"Type": "String",
1823
"Default": "app",
@@ -124,6 +129,7 @@
124129
"Type": "AWS::RDS::DBInstance",
125130
"Properties": {
126131
"AllocatedStorage": { "Ref": "AllocatedStorage" },
132+
"AutoMinorVersionUpgrade": { "Ref": "AutoMinorVersionUpgrade" },
127133
"DBInstanceClass": { "Ref": "InstanceType" },
128134
"DBInstanceIdentifier": { "Ref": "AWS::StackName" },
129135
"DBName": { "Fn::If": [ "BlankDatabaseSnapshotIdentifier", { "Ref": "Database" }, { "Ref": "AWS::NoValue" } ] },

0 commit comments

Comments
 (0)