Merge pull request #1450 from linode/dev

v2.21.1
linode · May 30, 2024 · 1c2b199 · 1c2b199
2 parents abb9e80 + 6703d4c
commit 1c2b199
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/docs/resources/lke_cluster.md b/docs/resources/lke_cluster.md
@@ -62,8 +62,8 @@ resource "linode_lke_cluster" "test" {
         acl {
             enabled = true
             addresses {
-                ipv4 = "0.0.0.0/0"
-                ipv6 = "2001:db8::/32"
+                ipv4 = ["0.0.0.0/0"]
+                ipv6 = ["2001:db8::/32"]
             }
         }
     }

diff --git a/linode/lke/framework_datasource.go b/linode/lke/framework_datasource.go
@@ -101,8 +101,9 @@ func (r *DataSource) Read(
 	acl, err := client.GetLKEClusterControlPlaneACL(ctx, clusterId)
 	if err != nil {
 		if lerr, ok := err.(*linodego.Error); ok &&
-			lerr.Code == 400 && strings.Contains(lerr.Message, "Cluster does not support Control Plane ACL") {
-			// The cluster does not have a Gateway. Nothing to do here.
+			(lerr.Code == 404 ||
+				(lerr.Code == 400 && strings.Contains(lerr.Message, "Cluster does not support Control Plane ACL"))) {
+			// The customer doesn't have access to LKE ACL or the cluster does not have a Gateway. Nothing to do here.
 		} else {
 			resp.Diagnostics.AddError(
 				fmt.Sprintf("Failed to get Control Plane ACL for LKE cluster %d", clusterId),

diff --git a/linode/lke/resource.go b/linode/lke/resource.go
@@ -99,8 +99,9 @@ func readResource(ctx context.Context, d *schema.ResourceData, meta interface{})
 	acl, err := client.GetLKEClusterControlPlaneACL(ctx, id)
 	if err != nil {
 		if lerr, ok := err.(*linodego.Error); ok &&
-			lerr.Code == 400 && strings.Contains(lerr.Message, "Cluster does not support Control Plane ACL") {
-			// The cluster does not have a Gateway. Nothing to do here.
+			(lerr.Code == 404 ||
+				(lerr.Code == 400 && strings.Contains(lerr.Message, "Cluster does not support Control Plane ACL"))) {
+			// The customer doesn't have access to LKE ACL or the cluster does not have a Gateway. Nothing to do here.
 		} else {
 			return diag.Errorf("failed to get control plane ACL for LKE cluster %d: %s", id, err)
 		}