Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update database storage sizes for gp3 #334

Merged
merged 4 commits into from
Sep 18, 2023
Merged

Update database storage sizes for gp3 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e430cc8
update internal database sizes to 20, which is minimum required size …
markdboyd Sep 8, 2023
82aa2b4
update allocated storage for all plans to 20
markdboyd Sep 18, 2023
ee4bf0c
update allocated storage in tests
markdboyd Sep 18, 2023
8bd652c
fix unit test
markdboyd Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions catalog-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ rds:
free: true
adapter: dedicated
instanceClass: db.t3.micro
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -70,7 +70,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t3.micro
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -107,7 +107,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t3.small
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -144,7 +144,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t3.small
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -181,7 +181,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t3.medium
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -218,7 +218,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t3.medium
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -255,7 +255,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -292,7 +292,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -329,7 +329,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -366,7 +366,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -404,7 +404,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.xlarge
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -441,7 +441,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.xlarge
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -480,7 +480,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.2xlarge
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -517,7 +517,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.2xlarge
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -556,7 +556,7 @@ rds:
free: false
adapter: dedicated
instanceClass: &m6-xlarge db.m6g.xlarge
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -593,7 +593,7 @@ rds:
free: false
adapter: dedicated
instanceClass: *m6-xlarge
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -631,7 +631,7 @@ rds:
free: true
adapter: dedicated
instanceClass: db.t3.micro
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -665,7 +665,7 @@ rds:
free: true
adapter: dedicated
instanceClass: db.t3.micro
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -699,7 +699,7 @@ rds:
free: true
adapter: dedicated
instanceClass: db.t2.small
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -733,7 +733,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t2.small
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbType: mysql
Expand Down Expand Up @@ -767,7 +767,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t2.medium
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -801,7 +801,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t2.medium
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -835,7 +835,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -869,7 +869,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -903,7 +903,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -937,7 +937,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -971,7 +971,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.xlarge
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -1005,7 +1005,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.xlarge
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
dbVersion: "8.0"
Expand Down Expand Up @@ -1040,7 +1040,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.t3.medium
allocatedStorage: 10
allocatedStorage: 20
dbType: oracle-se2
licenseModel: license-included
redundant: false
Expand Down Expand Up @@ -1072,7 +1072,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m5.large
allocatedStorage: 10
allocatedStorage: 20
dbType: sqlserver-se
licenseModel: license-included
redundant: false
Expand Down
10 changes: 5 additions & 5 deletions catalog-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ rds:
free: true
adapter: dedicated
instanceClass: db.t3.micro
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -216,7 +216,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m3.medium
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -249,7 +249,7 @@ rds:
free: false
adapter: dedicated
instanceClass: db.m3.medium
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "12"
- "13"
Expand Down Expand Up @@ -282,7 +282,7 @@ rds:
adapter: dedicated
instanceClass: db.t2.small
dbType: mysql
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
plan_updateable: true
Expand Down Expand Up @@ -310,7 +310,7 @@ rds:
adapter: dedicated
instanceClass: db.t3.medium
dbType: mysql
allocatedStorage: 10
allocatedStorage: 20
approvedMajorVersions:
- "8.0"
plan_updateable: true
Expand Down
4 changes: 2 additions & 2 deletions ci/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ jobs:
TF_VAR_aws_deploy_role_arn: ((staging-aws-deploy-role-arn))

TF_VAR_rds_internal_instance_type: ((prod-pgsql-instance-class))
TF_VAR_rds_internal_db_size: 10
TF_VAR_rds_internal_db_size: 20
TF_VAR_rds_internal_db_name: ((staging-rds-internal-db-name))
TF_VAR_rds_internal_db_engine: postgres
TF_VAR_rds_internal_db_engine_version: 12
Expand Down Expand Up @@ -949,7 +949,7 @@ jobs:
TF_VAR_aws_deploy_role_arn: ((prod-aws-deploy-role-arn))

TF_VAR_rds_internal_instance_type: ((prod-pgsql-instance-class))
TF_VAR_rds_internal_db_size: 10
TF_VAR_rds_internal_db_size: 20
TF_VAR_rds_internal_db_name: ((prod-rds-internal-db-name))
TF_VAR_rds_internal_db_engine: postgres
TF_VAR_rds_internal_db_engine_version: 12
Expand Down
8 changes: 4 additions & 4 deletions main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var modifyRDSInstanceReqStorage = []byte(
"service_id":"db80ca29-2d1b-4fbc-aad3-d03c0bfa7593",
"plan_id":"da91e15c-98c9-46a9-b114-02b8d28062c6",
"parameters": {
"storage": 15
"storage": 25
},
"organization_guid":"an-org",
"space_guid":"a-space"
Expand Down Expand Up @@ -281,7 +281,7 @@ func TestCatalog(t *testing.T) {
}

/*
Testing RDS
Testing RDS
*/
func TestCreateRDSInstance(t *testing.T) {
urlUnacceptsIncomplete := "/v2/service_instances/the_RDS_instance"
Expand Down Expand Up @@ -645,9 +645,9 @@ func TestModifyRDSInstanceSizeIncrease(t *testing.T) {
t.Error("The instance should be saved in the DB")
}

if i.AllocatedStorage != 15 {
if i.AllocatedStorage != 25 {
println(i.AllocatedStorage)
t.Error("The Allocated Storage for the instance should be 15")
t.Error("The Allocated Storage for the instance should be 25")
}
}

Expand Down
4 changes: 2 additions & 2 deletions services/rds/rdsinstance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestModifyInstance(t *testing.T) {
AllocatedStorage: 20,
},
existingInstance: &RDSInstance{
AllocatedStorage: 10,
AllocatedStorage: 20,
},
expectedInstance: &RDSInstance{
AllocatedStorage: 20,
Expand All @@ -45,7 +45,7 @@ func TestModifyInstance(t *testing.T) {
},
"allocated storage option less than existing, does not update": {
options: Options{
AllocatedStorage: 10,
AllocatedStorage: 20,
},
existingInstance: &RDSInstance{
AllocatedStorage: 20,
Expand Down
Loading