fix: increase default timeout to 20 minutes (#126)

kangasta · web-flow · commit 506602db63a9 · 2025-10-14T21:55:28.000+03:00
Also updates Ubuntu template versions from 20.04 to 24.04 in tests and examples.
diff --git a/.web-docs/components/builder/upcloud/README.md b/.web-docs/components/builder/upcloud/README.md
@@ -38,7 +38,7 @@ The upcloud builder is used to generate storage templates on UpCloud.
 
 - `storage_name` (string) - The name of the storage that will be used to find the first matching storage in the list of existing templates.
   
-  Note that `storage_uuid` parameter has higher priority. You should use either `storage_uuid` or `storage_name` for not strict matching (e.g "ubuntu server 20.04").
+  Note that `storage_uuid` parameter has higher priority. You should use either `storage_uuid` or `storage_name` for not strict matching (e.g "ubuntu server 24.04").
 
 - `template_prefix` (string) - The prefix to use for the generated template title. Defaults to `custom-image`.
   You can use this option to easily differentiate between different templates.
@@ -55,7 +55,7 @@ The upcloud builder is used to generate storage templates on UpCloud.
 - `storage_tier` (string) - The storage tier to use. Available options are `maxiops`, `archive`, and `standard`. Defaults to `maxiops`.
   For most production workloads, MaxIOPS is recommended for best performance.
 
-- `state_timeout_duration` (duration string | ex: "1h5m2s") - The amount of time to wait for resource state changes. Defaults to `5m`.
+- `state_timeout_duration` (duration string | ex: "1h5m2s") - The amount of time to wait for resource state changes. Defaults to `20m`.
 
 - `boot_wait` (duration string | ex: "1h5m2s") - The amount of time to wait after booting the server. Defaults to '0s'
 
@@ -141,7 +141,7 @@ source "upcloud" "test" {
   username        = "${var.username}"
   password        = "${var.password}"
   zone            = "nl-ams1"
-  storage_name    = "ubuntu server 20.04"
+  storage_name    = "ubuntu server 24.04"
   template_prefix = "ubuntu-server"
   # uncomment to use standard tier storage
   # storage_tier = "standard
@@ -201,7 +201,7 @@ source "upcloud" "test" {
   username        = "${var.username}"
   password        = "${var.password}"
   zone            = "nl-ams1"
-  storage_name    = "ubuntu server 20.04"
+  storage_name    = "ubuntu server 24.04"
   template_prefix = "ubuntu-server"
 
   network_interfaces {
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Changed
+
+- Increase default timeout to `20m`.
+
 ## [1.9.1] - 2025-08-29
 
 ### Fixed
diff --git a/builder/upcloud/config.go b/builder/upcloud/config.go
@@ -26,7 +26,7 @@ const (
 	DefaultSSHUsername                    = "root"
 	DefaultCommunicator                   = "ssh"
 	DefaultStorageSize                    = 25
-	DefaultTimeout                        = 5 * time.Minute
+	DefaultTimeout                        = 20 * time.Minute
 	DefaultStorageTier                    = upcloud.StorageTierMaxIOPS
 	InterfaceTypePublic     InterfaceType = upcloud.IPAddressAccessPublic
 	InterfaceTypeUtility    InterfaceType = upcloud.IPAddressAccessUtility
@@ -81,7 +81,7 @@ type Config struct {
 
 	// The name of the storage that will be used to find the first matching storage in the list of existing templates.
 	//
-	// Note that `storage_uuid` parameter has higher priority. You should use either `storage_uuid` or `storage_name` for not strict matching (e.g "ubuntu server 20.04").
+	// Note that `storage_uuid` parameter has higher priority. You should use either `storage_uuid` or `storage_name` for not strict matching (e.g "ubuntu server 24.04").
 	StorageName string `mapstructure:"storage_name"`
 
 	// The prefix to use for the generated template title. Defaults to `custom-image`.
@@ -103,7 +103,7 @@ type Config struct {
 	// For most production workloads, MaxIOPS is recommended for best performance.
 	StorageTier string `mapstructure:"storage_tier"`
 
-	// The amount of time to wait for resource state changes. Defaults to `5m`.
+	// The amount of time to wait for resource state changes. Defaults to `20m`.
 	Timeout time.Duration `mapstructure:"state_timeout_duration"`
 
 	// The amount of time to wait after booting the server. Defaults to '0s'
diff --git a/builder/upcloud/config_test.go b/builder/upcloud/config_test.go
@@ -372,14 +372,14 @@ func TestConfig_StorageName(t *testing.T) {
 			"username":     "testuser",
 			"password":     "testpass",
 			"zone":         "fi-hel1",
-			"storage_name": "Ubuntu Server 20.04",
+			"storage_name": "Ubuntu Server 24.04",
 		},
 	}
 
 	warns, err := c.Prepare(raws...)
 	assert.NoError(t, err)
 	assert.Empty(t, warns)
-	assert.Equal(t, "Ubuntu Server 20.04", c.StorageName)
+	assert.Equal(t, "Ubuntu Server 24.04", c.StorageName)
 	assert.Empty(t, c.StorageUUID)
 }
 
diff --git a/builder/upcloud/test-fixtures/hcl2/storage-name.pkr.hcl b/builder/upcloud/test-fixtures/hcl2/storage-name.pkr.hcl
@@ -1,7 +1,7 @@
 
 source "upcloud" "storage-name" {
   ssh_username    = "root"
-  storage_name    = "ubuntu server 20.04"
+  storage_name    = "ubuntu server 24.04"
   storage_size    = "20"
   template_prefix = "test-builder"
   zone            = "pl-waw1"
diff --git a/builder/upcloud/test-fixtures/json/networking.json b/builder/upcloud/test-fixtures/json/networking.json
@@ -2,7 +2,7 @@
     "builders": [{
         "type": "upcloud",
         "zone": "nl-ams1",
-        "storage_name": "ubuntu server 20.04",
+        "storage_name": "ubuntu server 24.04",
         "ssh_username": "root",
         "template_prefix": "test-builder",
         "storage_size": "20",
diff --git a/builder/upcloud/test-fixtures/json/storage-name.json b/builder/upcloud/test-fixtures/json/storage-name.json
@@ -2,7 +2,7 @@
     "builders": [{
         "type": "upcloud",
         "zone": "nl-ams1",
-        "storage_name": "ubuntu server 20.04",
+        "storage_name": "ubuntu server 24.04",
         "ssh_username": "root",
         "template_prefix": "test-builder",
         "storage_size": "20"
diff --git a/docs-partials/builder/upcloud/Config-not-required.mdx b/docs-partials/builder/upcloud/Config-not-required.mdx
@@ -8,7 +8,7 @@
 
 - `storage_name` (string) - The name of the storage that will be used to find the first matching storage in the list of existing templates.
   
-  Note that `storage_uuid` parameter has higher priority. You should use either `storage_uuid` or `storage_name` for not strict matching (e.g "ubuntu server 20.04").
+  Note that `storage_uuid` parameter has higher priority. You should use either `storage_uuid` or `storage_name` for not strict matching (e.g "ubuntu server 24.04").
 
 - `template_prefix` (string) - The prefix to use for the generated template title. Defaults to `custom-image`.
   You can use this option to easily differentiate between different templates.
@@ -25,7 +25,7 @@
 - `storage_tier` (string) - The storage tier to use. Available options are `maxiops`, `archive`, and `standard`. Defaults to `maxiops`.
   For most production workloads, MaxIOPS is recommended for best performance.
 
-- `state_timeout_duration` (duration string | ex: "1h5m2s") - The amount of time to wait for resource state changes. Defaults to `5m`.
+- `state_timeout_duration` (duration string | ex: "1h5m2s") - The amount of time to wait for resource state changes. Defaults to `20m`.
 
 - `boot_wait` (duration string | ex: "1h5m2s") - The amount of time to wait after booting the server. Defaults to '0s'
 
diff --git a/docs-partials/config/builder/upcloud/interfaces.pkr.hcl b/docs-partials/config/builder/upcloud/interfaces.pkr.hcl
@@ -30,7 +30,7 @@ source "upcloud" "test" {
   username        = "${var.username}"
   password        = "${var.password}"
   zone            = "nl-ams1"
-  storage_name    = "ubuntu server 20.04"
+  storage_name    = "ubuntu server 24.04"
   template_prefix = "ubuntu-server"
 
   network_interfaces {
diff --git a/example/build.pkr.hcl b/example/build.pkr.hcl
@@ -30,7 +30,7 @@ source "upcloud" "test" {
   username        = "${var.username}"
   password        = "${var.password}"
   zone            = "nl-ams1"
-  storage_name    = "ubuntu server 20.04"
+  storage_name    = "ubuntu server 24.04"
   template_prefix = "ubuntu-server"
   # uncomment to use standard tier storage
   # storage_tier = "standard
diff --git a/post-processor/upcloud-import/post-processor_acc_test.go b/post-processor/upcloud-import/post-processor_acc_test.go
@@ -43,6 +43,7 @@ func TestPostProcessorAcc_raw(t *testing.T) {
 	imageFile, err := os.CreateTemp(os.TempDir(), fmt.Sprintf("%s-*.raw", testName))
 	require.NoError(t, err)
 	defer func() {
+		imageFile.Close()
 		if err := os.Remove(imageFile.Name()); err != nil {
 			t.Logf("Warning: failed to remove temp file: %v", err)
 		}
