From bdeb8715fe1f8fcd364b5726c7b89f4d70fac700 Mon Sep 17 00:00:00 2001 From: MrWolong Date: Mon, 17 Jun 2024 15:54:01 +0800 Subject: [PATCH] resource/alicloud_kms_key: Added error code Forbidden.ResourceNotFound --- alicloud/resource_alicloud_kms_key.go | 4 +++- alicloud/service_alicloud_kms.go | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/alicloud/resource_alicloud_kms_key.go b/alicloud/resource_alicloud_kms_key.go index adf621b9079e..1ca79c1bc4f0 100644 --- a/alicloud/resource_alicloud_kms_key.go +++ b/alicloud/resource_alicloud_kms_key.go @@ -282,7 +282,9 @@ func resourceAliCloudKmsKeyRead(d *schema.ResourceData, meta interface{}) error return WrapError(err) } - d.Set("policy", policy["Policy"]) + if keyPolicy, ok := policy["Policy"]; ok { + d.Set("policy", keyPolicy) + } } } diff --git a/alicloud/service_alicloud_kms.go b/alicloud/service_alicloud_kms.go index 5e380f1395cc..ef3547c86907 100644 --- a/alicloud/service_alicloud_kms.go +++ b/alicloud/service_alicloud_kms.go @@ -120,6 +120,9 @@ func (s *KmsService) DescribeKmsKeyPolicy(id string) (object map[string]interfac addDebug(action, response, request) if err != nil { + if IsExpectedErrors(err, []string{"Forbidden.ResourceNotFound"}) { + return object, nil + } return object, WrapErrorf(err, DefaultErrorMsg, id, action, AlibabaCloudSdkGoERROR) }