From 2854aeddd13c7ef5bbcc7cb8ccd838de6db3c29e Mon Sep 17 00:00:00 2001 From: mathieu prigent Date: Thu, 29 Sep 2022 13:33:09 +0200 Subject: [PATCH] fix hashcorp go-version library usage && acceptance test --- ovh/resource_cloud_project_kube.go | 7 +++++-- ovh/resource_cloud_project_kube_test.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ovh/resource_cloud_project_kube.go b/ovh/resource_cloud_project_kube.go index e11b18d30..827e2c58b 100644 --- a/ovh/resource_cloud_project_kube.go +++ b/ovh/resource_cloud_project_kube.go @@ -312,6 +312,8 @@ func resourceCloudProjectKubeUpdate(d *schema.ResourceData, meta interface{}) er oldValue := oldValueI.(string) newValue := newValueI.(string) + log.Printf("[DEBUG] cluster version change from %s to %s", oldValue, newValue) + oldVersion, err := version.NewVersion(oldValueI.(string)) if err != nil { return fmt.Errorf("version %s does not match a semver", oldValue) @@ -322,12 +324,13 @@ func resourceCloudProjectKubeUpdate(d *schema.ResourceData, meta interface{}) er } oldVersionSegments := oldVersion.Segments() - newVersionSegments := oldVersion.Segments() + newVersionSegments := newVersion.Segments() if oldVersionSegments[0] != 1 || newVersionSegments[0] != 1 { return fmt.Errorf("the only supported major version is 1") } - if len(oldVersionSegments) != 2 || len(newVersionSegments) != 2 { + if len(oldVersionSegments) < 2 || len(newVersionSegments) < 2 { + log.Printf("[DEBUG] old version segments: %#v new version segments: %#v", oldVersionSegments, newVersionSegments) return fmt.Errorf("the version should only specify the major and minor versions (e.g. \\\"1.20\\\")") } diff --git a/ovh/resource_cloud_project_kube_test.go b/ovh/resource_cloud_project_kube_test.go index ce18ef9e8..d7f2f8e00 100644 --- a/ovh/resource_cloud_project_kube_test.go +++ b/ovh/resource_cloud_project_kube_test.go @@ -446,7 +446,7 @@ func TestAccCloudProjectKubeUpdateVersion_basic(t *testing.T) { updatedName := acctest.RandomWithPrefix(test_prefix) version1 := "1.22" - version2 := "1.22" + version2 := "1.23" config := fmt.Sprintf( testAccCloudProjectKubeConfig,