terraform: create nodeGroups in tfvars from nodeGroups in config

cli/internal/cloudcmd/terraform.go

@@ -8,12 +8,12 @@ package cloudcmd
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/terraform"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/variant"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/config"
-	"github.com/edgelesssys/constellation/v2/internal/constants"
 	"github.com/edgelesssys/constellation/v2/internal/role"
 )
 
@@ -21,13 +21,13 @@ import (
 func TerraformUpgradeVars(conf *config.Config, imageRef string) (terraform.Variables, error) {
 	switch conf.GetProvider() {
 	case cloudprovider.AWS:
-		vars := awsTerraformVars(conf, imageRef, nil, nil)
+		vars := awsTerraformVars(conf, imageRef)
 		return vars, nil
 	case cloudprovider.Azure:
-		vars := azureTerraformVars(conf, imageRef, nil, nil)
+		vars := azureTerraformVars(conf, imageRef)
 		return vars, nil
 	case cloudprovider.GCP:
-		vars := gcpTerraformVars(conf, imageRef, nil, nil)
+		vars := gcpTerraformVars(conf, imageRef)
 		return vars, nil
 	default:
 		return nil, fmt.Errorf("unsupported provider: %s", conf.GetProvider())
@@ -36,27 +36,21 @@ func TerraformUpgradeVars(conf *config.Config, imageRef string) (terraform.Varia
 
 // awsTerraformVars provides variables required to execute the Terraform scripts.
 // It should be the only place to declare the AWS variables.
-func awsTerraformVars(conf *config.Config, imageRef string, controlPlaneCount, workerCount *int) *terraform.AWSClusterVariables {
+func awsTerraformVars(conf *config.Config, imageRef string) *terraform.AWSClusterVariables {
+	nodeGroups := make(map[string]terraform.AWSNodeGroup)
+	for groupName, group := range conf.NodeGroups {
+		nodeGroups[groupName] = terraform.AWSNodeGroup{
+			Role:            role.FromString(group.Role).TFString(),
+			StateDiskSizeGB: group.StateDiskSizeGB,
+			InitialCount:    group.InitialCount,
+			Zone:            group.Zone,
+			InstanceType:    group.InstanceType,
+			DiskType:        group.StateDiskType,
+		}
+	}
 	return &terraform.AWSClusterVariables{
-		Name: conf.Name,
+		Name:                   conf.Name,
-		NodeGroups: map[string]terraform.AWSNodeGroup{
+		NodeGroups:             nodeGroups,
-			constants.ControlPlaneDefault: {
-				Role:            role.ControlPlane.TFString(),
-				StateDiskSizeGB: conf.StateDiskSizeGB,
-				InitialCount:    controlPlaneCount,
-				Zone:            conf.Provider.AWS.Zone,
-				InstanceType:    conf.Provider.AWS.InstanceType,
-				DiskType:        conf.Provider.AWS.StateDiskType,
-			},
-			constants.WorkerDefault: {
-				Role:            role.Worker.TFString(),
-				StateDiskSizeGB: conf.StateDiskSizeGB,
-				InitialCount:    workerCount,
-				Zone:            conf.Provider.AWS.Zone,
-				InstanceType:    conf.Provider.AWS.InstanceType,
-				DiskType:        conf.Provider.AWS.StateDiskType,
-			},
-		},
 		Region:                 conf.Provider.AWS.Region,
 		Zone:                   conf.Provider.AWS.Zone,
 		AMIImageID:             imageRef,
@@ -70,27 +64,25 @@ func awsTerraformVars(conf *config.Config, imageRef string, controlPlaneCount, w
 
 // azureTerraformVars provides variables required to execute the Terraform scripts.
 // It should be the only place to declare the Azure variables.
-func azureTerraformVars(conf *config.Config, imageRef string, controlPlaneCount, workerCount *int) *terraform.AzureClusterVariables {
+func azureTerraformVars(conf *config.Config, imageRef string) *terraform.AzureClusterVariables {
+	nodeGroups := make(map[string]terraform.AzureNodeGroup)
+	for groupName, group := range conf.NodeGroups {
+		zones := strings.Split(group.Zone, ",")
+		if len(zones) == 0 || (len(zones) == 1 && zones[0] == "") {
+			zones = nil
+		}
+		nodeGroups[groupName] = terraform.AzureNodeGroup{
+			Role:         role.FromString(group.Role).TFString(),
+			InitialCount: group.InitialCount,
+			InstanceType: group.InstanceType,
+			DiskSizeGB:   group.StateDiskSizeGB,
+			DiskType:     group.StateDiskType,
+			Zones:        zones,
+		}
+	}
 	vars := &terraform.AzureClusterVariables{
-		Name: conf.Name,
+		Name:                 conf.Name,
-		NodeGroups: map[string]terraform.AzureNodeGroup{
+		NodeGroups:           nodeGroups,
-			constants.ControlPlaneDefault: {
-				Role:         "control-plane",
-				InitialCount: controlPlaneCount,
-				InstanceType: conf.Provider.Azure.InstanceType,
-				DiskSizeGB:   conf.StateDiskSizeGB,
-				DiskType:     conf.Provider.Azure.StateDiskType,
-				Zones:        nil, // TODO(elchead): support zones AB#3225. check if lifecycle arg is required.
-			},
-			constants.WorkerDefault: {
-				Role:         "worker",
-				InitialCount: workerCount,
-				InstanceType: conf.Provider.Azure.InstanceType,
-				DiskSizeGB:   conf.StateDiskSizeGB,
-				DiskType:     conf.Provider.Azure.StateDiskType,
-				Zones:        nil,
-			},
-		},
 		Location:             conf.Provider.Azure.Location,
 		ImageID:              imageRef,
 		CreateMAA:            toPtr(conf.GetAttestationConfig().GetVariant().Equal(variant.AzureSEVSNP{})),
@@ -108,27 +100,21 @@ func azureTerraformVars(conf *config.Config, imageRef string, controlPlaneCount,
 
 // gcpTerraformVars provides variables required to execute the Terraform scripts.
 // It should be the only place to declare the GCP variables.
-func gcpTerraformVars(conf *config.Config, imageRef string, controlPlaneCount, workerCount *int) *terraform.GCPClusterVariables {
+func gcpTerraformVars(conf *config.Config, imageRef string) *terraform.GCPClusterVariables {
+	nodeGroups := make(map[string]terraform.GCPNodeGroup)
+	for groupName, group := range conf.NodeGroups {
+		nodeGroups[groupName] = terraform.GCPNodeGroup{
+			Role:            role.FromString(group.Role).TFString(),
+			StateDiskSizeGB: group.StateDiskSizeGB,
+			InitialCount:    group.InitialCount,
+			Zone:            group.Zone,
+			InstanceType:    group.InstanceType,
+			DiskType:        group.StateDiskType,
+		}
+	}
 	return &terraform.GCPClusterVariables{
-		Name: conf.Name,
+		Name:           conf.Name,
-		NodeGroups: map[string]terraform.GCPNodeGroup{
+		NodeGroups:     nodeGroups,
-			constants.ControlPlaneDefault: {
-				Role:            role.ControlPlane.TFString(),
-				StateDiskSizeGB: conf.StateDiskSizeGB,
-				InitialCount:    controlPlaneCount,
-				Zone:            conf.Provider.GCP.Zone,
-				InstanceType:    conf.Provider.GCP.InstanceType,
-				DiskType:        conf.Provider.GCP.StateDiskType,
-			},
-			constants.WorkerDefault: {
-				Role:            role.Worker.TFString(),
-				StateDiskSizeGB: conf.StateDiskSizeGB,
-				InitialCount:    workerCount,
-				Zone:            conf.Provider.GCP.Zone,
-				InstanceType:    conf.Provider.GCP.InstanceType,
-				DiskType:        conf.Provider.GCP.StateDiskType,
-			},
-		},
 		Project:        conf.Provider.GCP.Project,
 		Region:         conf.Provider.GCP.Region,
 		Zone:           conf.Provider.GCP.Zone,
@@ -140,11 +126,21 @@ func gcpTerraformVars(conf *config.Config, imageRef string, controlPlaneCount, w
 
 // openStackTerraformVars provides variables required to execute the Terraform scripts.
 // It should be the only place to declare the OpenStack variables.
-func openStackTerraformVars(conf *config.Config, imageRef string, controlPlaneCount, workerCount *int) *terraform.OpenStackClusterVariables {
+func openStackTerraformVars(conf *config.Config, imageRef string) *terraform.OpenStackClusterVariables {
+	nodeGroups := make(map[string]terraform.OpenStackNodeGroup)
+	for groupName, group := range conf.NodeGroups {
+		nodeGroups[groupName] = terraform.OpenStackNodeGroup{
+			Role:            role.FromString(group.Role).TFString(),
+			StateDiskSizeGB: group.StateDiskSizeGB,
+			InitialCount:    group.InitialCount,
+			FlavorID:        group.InstanceType,
+			Zone:            group.Zone,
+			StateDiskType:   group.StateDiskType,
+		}
+	}
 	return &terraform.OpenStackClusterVariables{
 		Name:                    conf.Name,
 		Cloud:                   toPtr(conf.Provider.OpenStack.Cloud),
-		FlavorID:                conf.Provider.OpenStack.FlavorID,
 		FloatingIPPoolID:        conf.Provider.OpenStack.FloatingIPPoolID,
 		ImageURL:                imageRef,
 		DirectDownload:          *conf.Provider.OpenStack.DirectDownload,
@@ -152,54 +148,34 @@ func openStackTerraformVars(conf *config.Config, imageRef string, controlPlaneCo
 		OpenstackUsername:       conf.Provider.OpenStack.Username,
 		OpenstackPassword:       conf.Provider.OpenStack.Password,
 		Debug:                   conf.IsDebugCluster(),
-		NodeGroups: map[string]terraform.OpenStackNodeGroup{
+		NodeGroups:              nodeGroups,
-			constants.ControlPlaneDefault: {
+		CustomEndpoint:          conf.CustomEndpoint,
-				Role:            role.ControlPlane.TFString(),
-				InitialCount:    controlPlaneCount,
-				Zone:            conf.Provider.OpenStack.AvailabilityZone, // TODO(elchead): make configurable AB#3225
-				StateDiskType:   conf.Provider.OpenStack.StateDiskType,
-				StateDiskSizeGB: conf.StateDiskSizeGB,
-			},
-			constants.WorkerDefault: {
-				Role:            role.Worker.TFString(),
-				InitialCount:    workerCount,
-				Zone:            conf.Provider.OpenStack.AvailabilityZone, // TODO(elchead): make configurable AB#3225
-				StateDiskType:   conf.Provider.OpenStack.StateDiskType,
-				StateDiskSizeGB: conf.StateDiskSizeGB,
-			},
-		},
-		CustomEndpoint: conf.CustomEndpoint,
 	}
 }
 
 // qemuTerraformVars provides variables required to execute the Terraform scripts.
 // It should be the only place to declare the QEMU variables.
-func qemuTerraformVars(conf *config.Config, imageRef string, controlPlaneCount, workerCount *int, libvirtURI, libvirtSocketPath, metadataLibvirtURI string) *terraform.QEMUVariables {
+func qemuTerraformVars(conf *config.Config, imageRef string, libvirtURI, libvirtSocketPath, metadataLibvirtURI string) *terraform.QEMUVariables {
+	nodeGroups := make(map[string]terraform.QEMUNodeGroup)
+	for groupName, group := range conf.NodeGroups {
+		nodeGroups[groupName] = terraform.QEMUNodeGroup{
+			Role:         role.FromString(group.Role).TFString(),
+			InitialCount: group.InitialCount,
+			DiskSize:     group.StateDiskSizeGB,
+			CPUCount:     conf.Provider.QEMU.VCPUs,
+			MemorySize:   conf.Provider.QEMU.Memory,
+		}
+	}
 	return &terraform.QEMUVariables{
 		Name:              conf.Name,
 		LibvirtURI:        libvirtURI,
 		LibvirtSocketPath: libvirtSocketPath,
 		// TODO(malt3): auto select boot mode based on attestation variant.
 		// requires image info v2.
-		BootMode:    "uefi",
+		BootMode:           "uefi",
-		ImagePath:   imageRef,
+		ImagePath:          imageRef,
-		ImageFormat: conf.Provider.QEMU.ImageFormat,
+		ImageFormat:        conf.Provider.QEMU.ImageFormat,
-		NodeGroups: map[string]terraform.QEMUNodeGroup{
+		NodeGroups:         nodeGroups,
-			constants.ControlPlaneDefault: {
-				Role:         role.ControlPlane.TFString(),
-				InitialCount: controlPlaneCount,
-				DiskSize:     conf.StateDiskSizeGB,
-				CPUCount:     conf.Provider.QEMU.VCPUs,
-				MemorySize:   conf.Provider.QEMU.Memory,
-			},
-			constants.WorkerDefault: {
-				Role:         role.Worker.TFString(),
-				InitialCount: workerCount,
-				DiskSize:     conf.StateDiskSizeGB,
-				CPUCount:     conf.Provider.QEMU.VCPUs,
-				MemorySize:   conf.Provider.QEMU.Memory,
-			},
-		},
 		Machine:            "q35", // TODO(elchead): make configurable AB#3225
 		MetadataAPIImage:   conf.Provider.QEMU.MetadataAPIImage,
 		MetadataLibvirtURI: metadataLibvirtURI,

cli/internal/terraform/variables.go

@@ -74,8 +74,8 @@ type AWSNodeGroup struct {
 	// StateDiskSizeGB is the size of the state disk to allocate to each node, in GB.
 	StateDiskSizeGB int `hcl:"disk_size" cty:"disk_size"`
 	// InitialCount is the initial number of nodes to create in the node group.
-	// During upgrades this value is not set.
+	// During upgrades this value ignored.
-	InitialCount *int `hcl:"initial_count" cty:"initial_count"`
+	InitialCount int `hcl:"initial_count" cty:"initial_count"`
 	// Zone is the AWS availability-zone to use in the given region.
 	Zone string `hcl:"zone" cty:"zone"`
 	// InstanceType is the type of the EC2 instance to use.
@@ -141,8 +141,8 @@ type GCPNodeGroup struct {
 	// StateDiskSizeGB is the size of the state disk to allocate to each node, in GB.
 	StateDiskSizeGB int `hcl:"disk_size" cty:"disk_size"`
 	// InitialCount is the initial number of nodes to create in the node group.
-	// During upgrades this value is not set.
+	// During upgrades this value ignored.
-	InitialCount *int   `hcl:"initial_count" cty:"initial_count"`
+	InitialCount int    `hcl:"initial_count" cty:"initial_count"`
 	Zone         string `hcl:"zone" cty:"zone"`
 	InstanceType string `hcl:"instance_type" cty:"instance_type"`
 	DiskType     string `hcl:"disk_type" cty:"disk_type"`
@@ -219,11 +219,11 @@ type AzureNodeGroup struct {
 	// Role is the role of the node group.
 	Role string `hcl:"role" cty:"role"`
 	// InitialCount is optional for upgrades.
-	InitialCount *int      `hcl:"initial_count" cty:"initial_count"`
+	InitialCount int      `hcl:"initial_count" cty:"initial_count"`
-	InstanceType string    `hcl:"instance_type" cty:"instance_type"`
+	InstanceType string   `hcl:"instance_type" cty:"instance_type"`
-	DiskSizeGB   int       `hcl:"disk_size" cty:"disk_size"`
+	DiskSizeGB   int      `hcl:"disk_size" cty:"disk_size"`
-	DiskType     string    `hcl:"disk_type" cty:"disk_type"`
+	DiskType     string   `hcl:"disk_type" cty:"disk_type"`
-	Zones        *[]string `hcl:"zones" cty:"zones"`
+	Zones        []string `hcl:"zones" cty:"zones"`
 }
 
 // AzureIAMVariables is user configuration for creating the IAM configuration with Terraform on Microsoft Azure.
@@ -371,7 +371,7 @@ type QEMUNodeGroup struct {
 	// InitialCount is the number of instances to create.
 	// InitialCount is optional for upgrades.
 	// Upgrades are not implemented for QEMU. The type is similar to other NodeGroup types for consistency.
-	InitialCount *int `hcl:"initial_count" cty:"initial_count"`
+	InitialCount int `hcl:"initial_count" cty:"initial_count"`
 	// DiskSize is the size of the disk to allocate to each node, in GiB.
 	DiskSize int `hcl:"disk_size" cty:"disk_size"`
 	// CPUCount is the number of CPUs to allocate to each node.

cli/internal/terraform/variables_test.go

@@ -22,7 +22,7 @@ func TestAWSClusterVariables(t *testing.T) {
 			constants.ControlPlaneDefault: {
 				Role:            role.ControlPlane.TFString(),
 				StateDiskSizeGB: 30,
-				InitialCount:    toPtr(1),
+				InitialCount:    1,
 				Zone:            "eu-central-1b",
 				InstanceType:    "x1.foo",
 				DiskType:        "foodisk",
@@ -30,7 +30,7 @@ func TestAWSClusterVariables(t *testing.T) {
 			constants.WorkerDefault: {
 				Role:            role.Worker.TFString(),
 				StateDiskSizeGB: 30,
-				InitialCount:    toPtr(2),
+				InitialCount:    2,
 				Zone:            "eu-central-1c",
 				InstanceType:    "x1.bar",
 				DiskType:        "bardisk",
@@ -105,7 +105,7 @@ func TestGCPClusterVariables(t *testing.T) {
 			constants.ControlPlaneDefault: {
 				Role:            "control-plane",
 				StateDiskSizeGB: 30,
-				InitialCount:    toPtr(1),
+				InitialCount:    1,
 				Zone:            "eu-central-1a",
 				InstanceType:    "n2d-standard-4",
 				DiskType:        "pd-ssd",
@@ -113,7 +113,7 @@ func TestGCPClusterVariables(t *testing.T) {
 			constants.WorkerDefault: {
 				Role:            "worker",
 				StateDiskSizeGB: 10,
-				InitialCount:    toPtr(1),
+				InitialCount:    1,
 				Zone:            "eu-central-1b",
 				InstanceType:    "n2d-standard-8",
 				DiskType:        "pd-ssd",
@@ -177,7 +177,7 @@ func TestAzureClusterVariables(t *testing.T) {
 		NodeGroups: map[string]AzureNodeGroup{
 			constants.ControlPlaneDefault: {
 				Role:         "ControlPlane",
-				InitialCount: to.Ptr(1),
+				InitialCount: 1,
 				InstanceType: "Standard_D2s_v3",
 				DiskType:     "StandardSSD_LRS",
 				DiskSizeGB:   100,
@@ -238,7 +238,6 @@ func TestOpenStackClusterVariables(t *testing.T) {
 	vars := OpenStackClusterVariables{
 		Name:                    "cluster-name",
 		Cloud:                   toPtr("my-cloud"),
-		FlavorID:                "flavor-0123456789abcdef",
 		FloatingIPPoolID:        "fip-pool-0123456789abcdef",
 		ImageURL:                "https://example.com/image.raw",
 		DirectDownload:          true,
@@ -249,7 +248,8 @@ func TestOpenStackClusterVariables(t *testing.T) {
 		NodeGroups: map[string]OpenStackNodeGroup{
 			constants.ControlPlaneDefault: {
 				Role:            "control-plane",
-				InitialCount:    toPtr(1),
+				InitialCount:    1,
+				FlavorID:        "flavor-0123456789abcdef",
 				Zone:            "az-01",
 				StateDiskType:   "performance-8",
 				StateDiskSizeGB: 30,
@@ -262,6 +262,7 @@ func TestOpenStackClusterVariables(t *testing.T) {
 	want := `name = "cluster-name"
 node_groups = {
   control_plane_default = {
+    flavor_id       = "flavor-0123456789abcdef"
     initial_count   = 1
     role            = "control-plane"
     state_disk_size = 30
@@ -270,7 +271,6 @@ node_groups = {
   }
 }
 cloud                      = "my-cloud"
-flavor_id                  = "flavor-0123456789abcdef"
 floating_ip_pool_id        = "fip-pool-0123456789abcdef"
 image_url                  = "https://example.com/image.raw"
 direct_download            = true
@@ -290,7 +290,7 @@ func TestQEMUClusterVariables(t *testing.T) {
 		NodeGroups: map[string]QEMUNodeGroup{
 			"control-plane": {
 				Role:         role.ControlPlane.TFString(),
-				InitialCount: toPtr(1),
+				InitialCount: 1,
 				DiskSize:     30,
 				CPUCount:     4,
 				MemorySize:   8192,