Merge branch disk_encrypt_change into v3.16xR

Title: 兼容apsarastack的disk加密参数

磁盘加密默认值兼容apsarastack
Link: https://code.alibaba-inc.com/apsarastack-cross-platform/terraform-provider-apsarastack/codereview/20614861

Author: douwentao

alibabacloudstack/resource_apsarastack_ecs_disk.go

@@ -2,6 +2,7 @@ package alibabacloudstack
 
 import (
 	"errors"
+	"os"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -96,6 +97,18 @@ func resourceAlibabacloudStackDisk() *schema.Resource {
 				Optional:     true,
 				ForceNew:     true,
 				ValidateFunc: validation.StringInSlice([]string{"sm4-128", "aes-256"}, false),
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					// 无法直接读取 encrypted 的当前值，只能通过 ResourceData 获取可能不准确的状态
+					if encrypted := d.Get("encrypted").(bool); !encrypted {
+						return true
+					} else if v, err := stringToBool(os.Getenv("APSARASTACK_IN_ALIBABACLOUDSTACK")); err != nil && v {
+						if (old == "aes-256" && new == "") || (old == "" && new == "aes-256") {
+							// 如果是APSARASTACK迁移模式，aes-256改""不触发变更
+							return true
+						}
+					}
+					return !d.HasChange("encrypt_algorithm")
+				},
 			},
 
 			"delete_auto_snapshot": {

alibabacloudstack/resource_apsarastack_edas_k8s_application.go

@@ -646,6 +646,9 @@ func resourceAlibabacloudStackEdasK8sApplicationUpdate(d *schema.ResourceData, m
 		if len(request.QueryParams["PackageUrl"]) == 0 {
 			return errmsgs.WrapError(errmsgs.Error("package_url is needed for creating fatjar k8s application"))
 		}
+		if d.HasChange("package_version") {
+			partialKeys = append(partialKeys, "package_version")
+		}
 		request.QueryParams["PackageVersion"] = d.Get("package_version").(string)
 
 		if d.HasChange("jdk") {