Merge pull request #194 from kingsoftcloud/trunk

Trunk

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.14.2 (Jan 17, 2024)
+
+BUGFIX:
+
+- `resource_ksyun_ssh_key` 修复public key comments引发的plan diff
+
 ## 1.14.1 (Jan 12, 2024)
 
 IMPROVEMENTS:

ksyun/resource_ksyun_ssh_key.go

@@ -24,6 +24,8 @@ package ksyun
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
@@ -49,10 +51,40 @@ func resourceKsyunSSHKey() *schema.Resource {
 				Description: "ID of the key.",
 			},
 			"public_key": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Computed:    true,
-				ForceNew:    true,
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					// pKey := d.Get("public_key").(string)
+					if old == "" {
+						return false
+					}
+					old = strings.TrimSpace(old)
+					new = strings.TrimSpace(new)
+
+					if old == new {
+						return true
+					}
+					oPks := strings.Split(old, " ")
+					nPks := strings.Split(new, " ")
+
+					// new public key is incorrect
+					if len(nPks) < 2 {
+						return false
+					}
+
+					for i, s := range oPks {
+						if i > 1 {
+							return true
+						}
+						if s != nPks[i] {
+							return false
+						}
+					}
+
+					return false
+				},
 				Description: "public key.",
 			},
 			"private_key": {

ksyun/resource_ksyun_ssh_key_test.go

@@ -2,9 +2,10 @@ package ksyun
 
 import (
 	"fmt"
+	"testing"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-	"testing"
 )
 
 func TestAccKsyunSSHKey_basic(t *testing.T) {