fix: set either disk_space or additional_disk_space (#1820)

aiven · Sep 17, 2024 · 0198e52 · 0198e52
1 parent 04825bb
commit 0198e52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ nav_order: 1
 - Use the code-generated client to manage `aiven_service_integration` and `aiven_service_integration_endpoint`
 - Use Go 1.23
 - Add capability to set description and owner group per topic.
+- Fix `terraform import` for services with additional disk space or read replica service integration
 
 ## [4.24.0] - 2024-08-21
 

diff --git a/internal/schemautil/service.go b/internal/schemautil/service.go
@@ -673,13 +673,12 @@ func copyServicePropertiesFromAPIResponseToTerraform(
 		diskSpace = int(*s.DiskSpaceMb)
 	}
 
-	if diskSpace != 0 {
-		if err := d.Set("disk_space", HumanReadableByteSize(diskSpace*units.MiB)); err != nil {
+	if additionalDiskSpace := diskSpace - servicePlanParams.DiskSizeMBDefault; additionalDiskSpace > 0 {
+		if err := d.Set("additional_disk_space", HumanReadableByteSize(additionalDiskSpace*units.MiB)); err != nil {
 			return err
 		}
-	}
-	if diskSpace != 0 {
-		if err := d.Set("additional_disk_space", HumanReadableByteSize((diskSpace-servicePlanParams.DiskSizeMBDefault)*units.MiB)); err != nil {
+	} else if diskSpace > 0 {
+		if err := d.Set("disk_space", HumanReadableByteSize(diskSpace*units.MiB)); err != nil {
 			return err
 		}
 	}