From d13b34b1d694ec01df5c8aa862f35e9ebb01d8d8 Mon Sep 17 00:00:00 2001 From: Sharad Kesarwani <108344822+sharadkesarwani@users.noreply.github.com> Date: Tue, 26 Nov 2024 20:10:41 +0530 Subject: [PATCH] fix(ocean/gcp): fixed `min_size` and `max_size` attributes to accept 0. (#601) --- CHANGELOG.md | 4 ++++ .../fields_spotinst_ocean_gke_import.go | 11 ++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 327900c8..328daadd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Unreleased +## 1.199.2 (November, 26 2024) +BUG FIXES: +* resource/spotinst_ocean_gke_import: Fixed update of attribute `min_size` and `max_size`. + ## 1.199.1 (November, 26 2024) BUG FIXES: * resource/spotinst_ocean_aws: Fixed `max_vcpu` and `max_memory_gib` fields to accept null. diff --git a/spotinst/ocean_gke_import/fields_spotinst_ocean_gke_import.go b/spotinst/ocean_gke_import/fields_spotinst_ocean_gke_import.go index d1fa423a..9f026977 100644 --- a/spotinst/ocean_gke_import/fields_spotinst_ocean_gke_import.go +++ b/spotinst/ocean_gke_import/fields_spotinst_ocean_gke_import.go @@ -239,7 +239,6 @@ func Setup(fieldsMap map[commons.FieldName]*commons.GenericField) { &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, }, func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error { clusterWrapper := resourceObject.(*commons.GKEImportClusterWrapper) @@ -268,8 +267,8 @@ func Setup(fieldsMap map[commons.FieldName]*commons.GenericField) { func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error { clusterWrapper := resourceObject.(*commons.GKEImportClusterWrapper) cluster := clusterWrapper.GetCluster() - if v, ok := resourceData.GetOk(string(MaxSize)); ok { - cluster.Capacity.SetMaximum(spotinst.Int(v.(int))) + if v, ok := resourceData.Get(string(MaxSize)).(int); ok && v >= 0 { + cluster.Capacity.SetMaximum(spotinst.Int(v)) } return nil }, @@ -282,7 +281,6 @@ func Setup(fieldsMap map[commons.FieldName]*commons.GenericField) { &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, }, func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error { clusterWrapper := resourceObject.(*commons.GKEImportClusterWrapper) @@ -311,8 +309,8 @@ func Setup(fieldsMap map[commons.FieldName]*commons.GenericField) { func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error { clusterWrapper := resourceObject.(*commons.GKEImportClusterWrapper) cluster := clusterWrapper.GetCluster() - if v, ok := resourceData.GetOk(string(MinSize)); ok { - cluster.Capacity.SetMinimum(spotinst.Int(v.(int))) + if v, ok := resourceData.Get(string(MinSize)).(int); ok && v >= 0 { + cluster.Capacity.SetMinimum(spotinst.Int(v)) } return nil }, @@ -325,7 +323,6 @@ func Setup(fieldsMap map[commons.FieldName]*commons.GenericField) { &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, }, func(resourceObject interface{}, resourceData *schema.ResourceData, meta interface{}) error { clusterWrapper := resourceObject.(*commons.GKEImportClusterWrapper)