Merge pull request #665 from armsnyder/617-cluster-cert-diff

resource/gitlab_project_cluster: Suppress whitespace diffs for kubernetes_ca_cert attribute

Author: armsnyder

gitlab/resource_gitlab_project_cluster.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -79,6 +80,9 @@ func resourceGitlabProjectCluster() *schema.Resource {
 			"kubernetes_ca_cert": {
 				Type:     schema.TypeString,
 				Optional: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					return strings.TrimSpace(old) == strings.TrimSpace(new)
+				},
 			},
 			"kubernetes_namespace": {
 				Type:     schema.TypeString,

gitlab/resource_gitlab_project_cluster_test.go

@@ -248,7 +248,7 @@ resource gitlab_project_cluster "foo" {
   managed                       = "%s"
   kubernetes_api_url            = "https://123.123.123"
   kubernetes_token              = "some-token"
-  kubernetes_ca_cert            = "${trimspace(var.cert)}"
+  kubernetes_ca_cert            = var.cert
   kubernetes_authorization_type = "abac"
 }
 `, projectClusterFakeCert, rInt, rInt, m)
@@ -277,7 +277,7 @@ resource gitlab_project_cluster "foo" {
   domain                        = "example-new.com"
   kubernetes_api_url            = "https://124.124.124"
   kubernetes_token              = "some-token"
-  kubernetes_ca_cert            = "${trimspace(var.cert)}"
+  kubernetes_ca_cert            = var.cert
   kubernetes_namespace          = "changed-namespace"
   kubernetes_authorization_type = "%s"
 }
@@ -318,7 +318,7 @@ resource gitlab_project_cluster "foo" {
   managed                       = "%s"
   kubernetes_api_url            = "https://123.123.123"
   kubernetes_token              = "some-token"
-  kubernetes_ca_cert            = "${trimspace(var.cert)}"
+  kubernetes_ca_cert            = var.cert
   kubernetes_authorization_type = "abac"
   management_project_id         = "${gitlab_project.cluster-management.id}"
 }