bugfix: setting ebs volume type (#84)

Co-authored-by: sternik <sternik@users.noreply.github.com>

Author: sternik

docs/index.md

@@ -34,7 +34,7 @@ terraform {
   required_providers {
     imagefactory = {
       source  = "nordcloud/imagefactory"
-      version = "1.14.0"
+      version = "1.14.1"
     }
   }
 }

docs/resources/template.md

@@ -341,7 +341,7 @@ Optional:
 
 - `additional_ebs_volumes` (Block List, Max: 10) (see [below for nested schema](#nestedblock--config--aws--additional_ebs_volumes))
 - `custom_image_name` (String)
-- `ebs_volume_type` (String) The type of the EBS volume. Available types are `gp2`, `gp3`. If not specified, volume type is used from the source image.
+- `ebs_volume_type` (String) The type of the EBS volume of primary block device. Available types are `gp2`, `gp3`. If not specified, volume type is used from the source image.
 - `kms_key_id` (String) The ID of the AWS KMS key that is used to encrypt the destination snapshot of the copied image. To allow use of this key, onboarded master role `ImageFactoryMasterRole` must have permission to use the key. You can use key ID, key ARN, alias name, or alias ARN.
 - `region` (String)
 

examples/provider/provider.tf

@@ -7,7 +7,7 @@ terraform {
   required_providers {
     imagefactory = {
       source  = "nordcloud/imagefactory"
-      version = "1.14.0"
+      version = "1.14.1"
     }
   }
 }

imagefactory/account/resource.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Nordcloud Oy or its affiliates. All Rights Reserved.
+// Copyright 2021-2025 Nordcloud Oy or its affiliates. All Rights Reserved.
 
 package account
 
@@ -39,7 +39,6 @@ func accountCreate(d *schema.ResourceData, m interface{}, provider graphql.Provi
 		CloudProviderId: graphql.String(d.Get(getCloudProviderKeyName(provider)).(string)),
 		Provider:        provider,
 		Scope:           &scope,
-		Properties:      &graphql.AccountCloudPropertiesInput{},
 	}
 
 	switch provider {
@@ -161,7 +160,7 @@ func setProps(d *schema.ResourceData, a sdk.Account) diag.Diagnostics {
 		return diag.FromErr(err)
 	}
 
-	if a.Provider == graphql.ProviderAWS {
+	if a.Provider == graphql.ProviderAWS && a.Properties != nil {
 		if err := d.Set("properties", []map[string]interface{}{
 			flattenAccountProperties(a.Properties),
 		}); err != nil {

imagefactory/imagetemplate/structures.go

@@ -50,10 +50,17 @@ func expandAdditionalEBSVolumes(in []interface{}) *[]graphql.NewAdditionalEBSVol
 	out := []graphql.NewAdditionalEBSVolumes{}
 	for i := range in {
 		m := in[i].(map[string]interface{})
-		out = append(out, graphql.NewAdditionalEBSVolumes{
+		v := graphql.NewAdditionalEBSVolumes{
 			Size:       graphql.Int(m["size"].(int)),
 			DeviceName: graphql.String(m["device_name"].(string)),
-		})
+		}
+		if m["volume_type"] != nil {
+			volumeType := graphql.EBSVolumeType(m["volume_type"].(string))
+			if volumeType != "" {
+				v.VolumeType = &volumeType
+			}
+		}
+		out = append(out, v)
 	}
 
 	return &out
@@ -92,6 +99,13 @@ func expandTemplateAwsConfig(in []interface{}, scope graphql.Scope) (*graphql.Ne
 		}
 	}
 
+	if m["ebs_volume_type"] != nil {
+		ebsVolumeType := graphql.EBSVolumeType(m["ebs_volume_type"].(string))
+		if ebsVolumeType != "" {
+			tplConfig.EbsVolumeType = &ebsVolumeType
+		}
+	}
+
 	return tplConfig, nil
 }