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

Fix DBaaS datastore resize by flavor #301

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix DBaaS datastore resize by flavor #301

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
871724e
Fix DBaaS datastore resize by flavor
Gogen120 Sep 20, 2024
68fc5f2
Add separate function to get resize opts for datastore resize
Gogen120 Sep 23, 2024
9fff5cf
Fix golangci-lint issues
Gogen120 Sep 23, 2024
4a6ecb9
Use crypto/rand instead of math/rand
Gogen120 Sep 23, 2024
0807b0c
Merge branch 'master' into fix/fix-dbaas-datastore-resize-by-flavor
Gogen120 Nov 11, 2024
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
43 changes: 27 additions & 16 deletions selectel/dbaas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ package selectel
import (
"context"
"crypto/md5"
"crypto/rand"
"errors"
"fmt"
"log"
"math"
"math/rand" // nosemgrep: go.lang.security.audit.crypto.math_random.math-random-used
"math/big"
"sort"
"strconv"
"strings"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -97,7 +97,8 @@ func convertFieldToStringByType(field interface{}) string {
}

func RandomWithPrefix(name string) string {
return fmt.Sprintf("%s_%d", name, rand.New(rand.NewSource(time.Now().UnixNano())).Int())
n, _ := rand.Int(rand.Reader, big.NewInt(1000000))
return fmt.Sprintf("%s_%d", name, n.Int64())
}

func flavorSchema() *schema.Resource {
Expand Down Expand Up @@ -320,31 +321,41 @@ func updateDatastoreBackups(ctx context.Context, d *schema.ResourceData, client
return nil
}

func resizeDatastore(ctx context.Context, d *schema.ResourceData, client *dbaas.API) error {
func getResizeOpts(ctx context.Context, d *schema.ResourceData, client *dbaas.API) (dbaas.DatastoreResizeOpts, error) {
var resizeOpts dbaas.DatastoreResizeOpts
nodeCount := d.Get("node_count").(int)
resizeOpts.NodeCount = nodeCount

flavorID := d.Get("flavor_id")
flavorRaw := d.Get("flavor")

flavorSet := flavorRaw.(*schema.Set)
flavor, err := resourceDBaaSDatastoreV1FlavorFromSet(flavorSet)
if err != nil {
return errParseDatastoreV1Resize(err)
if d.HasChange("flavor_id") {
flavorID := d.Get("flavor_id")
resizeOpts.FlavorID = flavorID.(string)
} else if d.HasChange("flavor") {
flavorRaw := d.Get("flavor")
flavorSet := flavorRaw.(*schema.Set)
flavor, err := resourceDBaaSDatastoreV1FlavorFromSet(flavorSet)
if err != nil {
return resizeOpts, errParseDatastoreV1Resize(err)
}
resizeOpts.Flavor = flavor
}

typeID := d.Get("type_id").(string)
datastoreType, err := client.DatastoreType(ctx, typeID)
if err != nil {
return errors.New("Couldnt get datastore type with id" + typeID)
return resizeOpts, errors.New("Couldnt get datastore type with id" + typeID)
}

if datastoreType.Engine == "redis" {
resizeOpts.Flavor = nil
resizeOpts.FlavorID = flavorID.(string)
} else {
resizeOpts.Flavor = flavor
resizeOpts.FlavorID = flavorID.(string)
}

return resizeOpts, nil
}

func resizeDatastore(ctx context.Context, d *schema.ResourceData, client *dbaas.API) error {
resizeOpts, err := getResizeOpts(ctx, d, client)
if err != nil {
return errUpdatingObject(objectDatastore, d.Id(), err)
}

log.Print(msgUpdate(objectDatastore, d.Id(), resizeOpts))
Expand Down
Loading