Skip to content

Cluster autoscaling compute #92

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

Merged
merged 3 commits into from
May 20, 2020
Merged

Cluster autoscaling compute #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec66a62
feat: added fields for autoscaling
May 18, 2020
1a9c7e3
test: added fields for autoscaling and compute for cluster test
May 18, 2020
2fe57cf
docs: changed the max and min instance size and added fields for crea…
May 19, 2020
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
28 changes: 19 additions & 9 deletions mongodbatlas/clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,16 @@ var _ ClustersService = &ClustersServiceOp{}

// AutoScaling configures your cluster to automatically scale its storage
type AutoScaling struct {
DiskGBEnabled *bool `json:"diskGBEnabled,omitempty"`
DiskGBEnabled *bool `json:"diskGBEnabled,omitempty"`
Compute *Compute `json:"compute,omitempty"`
}

// Compute Specifies whether the cluster automatically scales its cluster tier and whether the cluster can scale down.
type Compute struct {
Enabled *bool `json:"enabled,omitempty"`
ScaleDownEnabled *bool `json:"scaleDownEnabled,omitempty"`
MinInstanceSize string `json:"minInstanceSize,omitempty"`
MaxInstanceSize string `json:"maxInstanceSize,omitempty"`
}

// BiConnector specifies BI Connector for Atlas configuration on this cluster
Expand All @@ -43,14 +52,15 @@ type BiConnector struct {

// ProviderSettings configuration for the provisioned servers on which MongoDB runs. The available options are specific to the cloud service provider.
type ProviderSettings struct {
BackingProviderName string `json:"backingProviderName,omitempty"`
DiskIOPS *int64 `json:"diskIOPS,omitempty"`
DiskTypeName string `json:"diskTypeName,omitempty"`
EncryptEBSVolume *bool `json:"encryptEBSVolume,omitempty"`
InstanceSizeName string `json:"instanceSizeName,omitempty"`
ProviderName string `json:"providerName,omitempty"`
RegionName string `json:"regionName,omitempty"`
VolumeType string `json:"volumeType,omitempty"`
BackingProviderName string `json:"backingProviderName,omitempty"`
DiskIOPS *int64 `json:"diskIOPS,omitempty"`
DiskTypeName string `json:"diskTypeName,omitempty"`
EncryptEBSVolume *bool `json:"encryptEBSVolume,omitempty"`
InstanceSizeName string `json:"instanceSizeName,omitempty"`
ProviderName string `json:"providerName,omitempty"`
RegionName string `json:"regionName,omitempty"`
VolumeType string `json:"volumeType,omitempty"`
AutoScaling *AutoScaling `json:"autoScaling,omitempty"`
}

// RegionsConfig describes the region’s priority in elections and the number and type of MongoDB nodes Atlas deploys to the region.
Expand Down
103 changes: 90 additions & 13 deletions mongodbatlas/clusters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ func TestClusters_ListClusters(t *testing.T) {
"results": [
{
"autoScaling": {
"diskGBEnabled": true
"diskGBEnabled": true,
"compute": {
"enabled": true,
"scaleDownEnabled": true
}
},
"backupEnabled": true,
"biConnector": {
Expand Down Expand Up @@ -55,7 +59,13 @@ func TestClusters_ListClusters(t *testing.T) {
"diskIOPS": 1320,
"encryptEBSVolume": false,
"instanceSizeName": "M40",
"regionName": "US_WEST_2"
"regionName": "US_WEST_2",
"autoScaling": {
"compute": {
"maxInstanceSize": "M60",
"minInstanceSize": "M10"
}
}
},
"replicationFactor": 3,
"replicationSpec": {
Expand All @@ -70,7 +80,11 @@ func TestClusters_ListClusters(t *testing.T) {
},
{
"autoScaling": {
"diskGBEnabled": true
"diskGBEnabled": true,
"compute": {
"enabled": true,
"scaleDownEnabled": true
}
},
"backupEnabled": true,
"biConnector": {
Expand Down Expand Up @@ -105,7 +119,13 @@ func TestClusters_ListClusters(t *testing.T) {
"diskIOPS": 1320,
"encryptEBSVolume": false,
"instanceSizeName": "M40",
"regionName": "US_WEST_2"
"regionName": "US_WEST_2",
"autoScaling": {
"compute": {
"maxInstanceSize": "M60",
"minInstanceSize": "M10"
}
}
},
"replicationFactor": 3,
"replicationSpec": {
Expand All @@ -129,7 +149,13 @@ func TestClusters_ListClusters(t *testing.T) {
}

cluster1 := Cluster{
AutoScaling: &AutoScaling{DiskGBEnabled: pointy.Bool(true)},
AutoScaling: &AutoScaling{
DiskGBEnabled: pointy.Bool(true),
Compute: &Compute{
Enabled: pointy.Bool(true),
ScaleDownEnabled: pointy.Bool(true),
},
},
BackupEnabled: pointy.Bool(true),
BiConnector: &BiConnector{Enabled: pointy.Bool(false), ReadPreference: "secondary"},
ClusterType: "REPLICASET",
Expand All @@ -141,6 +167,7 @@ func TestClusters_ListClusters(t *testing.T) {
Private: "mongodb://cluster0-shard-00-00-pri.auylw.mongodb.net:27017,cluster0-shard-00-01-pri.auylw.mongodb.net:27017,cluster0-shard-00-02-pri.auylw.mongodb.net:27017/?ssl=true&authSource=admin&replicaSet=Cluster0-shard-0",
PrivateSrv: "mongodb+srv://cluster0-pri.auylw.mongodb.net",
},

DiskSizeGB: pointy.Float64(160),
EncryptionAtRestProvider: "AWS",
GroupID: "5356823b3794de37132bb7b",
Expand All @@ -157,6 +184,12 @@ func TestClusters_ListClusters(t *testing.T) {
EncryptEBSVolume: pointy.Bool(false),
InstanceSizeName: "M40",
RegionName: "US_WEST_2",
AutoScaling: &AutoScaling{
Compute: &Compute{
MaxInstanceSize: "M60",
MinInstanceSize: "M10",
},
},
},
ReplicationFactor: pointy.Int64(3),

Expand Down Expand Up @@ -262,8 +295,9 @@ func TestClusters_Create(t *testing.T) {
groupID := "1"

createRequest := &Cluster{
ID: "1",
AutoScaling: &AutoScaling{DiskGBEnabled: pointy.Bool(true)},
ID: "1",
AutoScaling: &AutoScaling{DiskGBEnabled: pointy.Bool(true),
Compute: &Compute{Enabled: pointy.Bool(true), ScaleDownEnabled: pointy.Bool(true)}},
BackupEnabled: pointy.Bool(true),
BiConnector: &BiConnector{Enabled: pointy.Bool(false), ReadPreference: "secondary"},
ClusterType: "REPLICASET",
Expand All @@ -283,6 +317,7 @@ func TestClusters_Create(t *testing.T) {
EncryptEBSVolume: pointy.Bool(false),
InstanceSizeName: "M40",
RegionName: "US_WEST_2",
AutoScaling: &AutoScaling{Compute: &Compute{MinInstanceSize: "M10", MaxInstanceSize: "M60"}},
},
ReplicationFactor: pointy.Int64(3),

Expand All @@ -302,6 +337,10 @@ func TestClusters_Create(t *testing.T) {
"id": "1",
"autoScaling": map[string]interface{}{
"diskGBEnabled": true,
"compute": map[string]interface{}{
"enabled": true,
"scaleDownEnabled": true,
},
},
"backupEnabled": true,
"biConnector": map[string]interface{}{
Expand All @@ -325,6 +364,12 @@ func TestClusters_Create(t *testing.T) {
"encryptEBSVolume": false,
"instanceSizeName": "M40",
"regionName": "US_WEST_2",
"autoScaling": map[string]interface{}{
"compute": map[string]interface{}{
"minInstanceSize": "M10",
"maxInstanceSize": "M60",
},
},
},
"replicationFactor": float64(3),
"replicationSpec": map[string]interface{}{
Expand All @@ -342,7 +387,11 @@ func TestClusters_Create(t *testing.T) {
{
"id":"1",
"autoScaling": {
"diskGBEnabled": true
"diskGBEnabled": true,
"compute": {
"enabled": true,
"scaleDownEnabled": true
}
},
"backupEnabled": true,
"biConnector": {
Expand All @@ -366,7 +415,13 @@ func TestClusters_Create(t *testing.T) {
"diskIOPS": 1320,
"encryptEBSVolume": false,
"instanceSizeName": "M40",
"regionName": "US_WEST_2"
"regionName": "US_WEST_2",
"autoScaling": {
"compute": {
"minInstanceSize": "M10",
"maxInstanceSize": "M60"
}
}
},
"replicationFactor": 3,
"replicationSpec": {
Expand Down Expand Up @@ -422,8 +477,9 @@ func TestClusters_Update(t *testing.T) {
clusterName := "AppData"

updateRequest := &Cluster{
ID: "1",
AutoScaling: &AutoScaling{DiskGBEnabled: pointy.Bool(true)},
ID: "1",
AutoScaling: &AutoScaling{DiskGBEnabled: pointy.Bool(true),
Compute: &Compute{Enabled: pointy.Bool(true), ScaleDownEnabled: pointy.Bool(true)}},
BackupEnabled: pointy.Bool(true),
BiConnector: &BiConnector{Enabled: pointy.Bool(false), ReadPreference: "secondary"},
ClusterType: "REPLICASET",
Expand All @@ -443,6 +499,7 @@ func TestClusters_Update(t *testing.T) {
EncryptEBSVolume: pointy.Bool(false),
InstanceSizeName: "M40",
RegionName: "US_WEST_2",
AutoScaling: &AutoScaling{Compute: &Compute{MinInstanceSize: "M20", MaxInstanceSize: "M80"}},
},
ReplicationFactor: pointy.Int64(3),

Expand All @@ -462,6 +519,10 @@ func TestClusters_Update(t *testing.T) {
"id": "1",
"autoScaling": map[string]interface{}{
"diskGBEnabled": true,
"compute": map[string]interface{}{
"enabled": true,
"scaleDownEnabled": true,
},
},
"backupEnabled": true,
"biConnector": map[string]interface{}{
Expand All @@ -485,6 +546,12 @@ func TestClusters_Update(t *testing.T) {
"encryptEBSVolume": false,
"instanceSizeName": "M40",
"regionName": "US_WEST_2",
"autoScaling": map[string]interface{}{
"compute": map[string]interface{}{
"minInstanceSize": "M20",
"maxInstanceSize": "M80",
},
},
},
"replicationFactor": float64(3),
"replicationSpec": map[string]interface{}{
Expand All @@ -501,7 +568,11 @@ func TestClusters_Update(t *testing.T) {
jsonBlob := `
{
"autoScaling": {
"diskGBEnabled": true
"diskGBEnabled": true,
"compute": {
"enabled": true,
"scaleDownEnabled": true
}
},
"backupEnabled": true,
"biConnector": {
Expand All @@ -525,7 +596,13 @@ func TestClusters_Update(t *testing.T) {
"diskIOPS": 1320,
"encryptEBSVolume": false,
"instanceSizeName": "M40",
"regionName": "US_WEST_2"
"regionName": "US_WEST_2",
"autoScaling": {
"compute": {
"minInstanceSize": "M10",
"maxInstanceSize": "M60"
}
}
},
"replicationFactor": 3,
"replicationSpec": {
Expand Down