Merge pull request #2 from stackitcloud/fix-disk-selection

Make configured disk size applied to server

Author: Markus-Schwer

pkg/options/options.go

@@ -3,6 +3,8 @@ package options
 import (
 	"fmt"
 	"os"
+	"regexp"
+	"strconv"
 )
 
 type Options struct {
@@ -13,7 +15,7 @@ type Options struct {
 	ProjectID        string
 	AvailabilityZone string
 	Flavor           string
-	DiskSize         string
+	DiskSize         int64
 }
 
 type ClientOptions struct {
@@ -51,7 +53,11 @@ func FromEnv(skipMachine bool) (*Options, error) {
 	if err != nil {
 		return nil, err
 	}
-	retOptions.DiskSize, err = fromEnvOrError("STACKIT_DISK_SIZE")
+	diskSize, err := fromEnvOrError("STACKIT_DISK_SIZE")
+	if err != nil {
+		return nil, err
+	}
+	retOptions.DiskSize, err = extractInt64(diskSize)
 	if err != nil {
 		return nil, err
 	}
@@ -79,3 +85,18 @@ func fromEnvOrError(name string) (string, error) {
 
 	return val, nil
 }
+
+func extractInt64(s string) (int64, error) {
+	re := regexp.MustCompile(`\d+`)
+	match := re.FindString(s)
+
+	if match == "" {
+		return 0, fmt.Errorf("couldn't find number in %s", s)
+	}
+
+	result, err := strconv.ParseInt(match, 10, 64)
+	if err != nil {
+		return 0, err
+	}
+	return result, nil
+}

pkg/stackit/cloud-config.yaml

@@ -18,10 +18,6 @@ users:
     shell: /bin/bash
     ssh_authorized_keys:
       - "{{ .PublicKey }}"
-  - name: test
-    lock_passwd: false
-    passwd: $1$X4rlCkR8$mZuINsPlJmSydnLeIFTl5/
-    sudo: ALL=(ALL) NOPASSWD:ALL
 write_files:
   - path: /etc/docker/daemon.json
     content: |

pkg/stackit/stackit.go

@@ -6,9 +6,10 @@ import (
 	"embed"
 	"encoding/base64"
 	"fmt"
-	"github.com/loft-sh/log"
 	"text/template"
 
+	"github.com/loft-sh/log"
+
 	"github.com/stackitcloud/stackit-sdk-go/core/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/iaas/wait"
 
@@ -215,7 +216,7 @@ func (s *Stackit) Create(ctx context.Context, options *options.Options, publicKe
 		MachineType:      &options.Flavor,
 		BootVolume: &iaas.CreateServerPayloadBootVolume{
 			DeleteOnTermination: utils.Ptr(true),
-			Size:                utils.Ptr(int64(64)),
+			Size:                utils.Ptr(options.DiskSize),
 			Source: &iaas.BootVolumeSource{
 				Id:   utils.Ptr(ubuntuImageID),
 				Type: utils.Ptr("image"),