Create management_id option for project and group Cluster

Brad Downey · Brad Downey · commit 8b11b7582fb7 · 2020-05-30T09:20:06.000-07:00
diff --git a/gitlab/resource_gitlab_group_cluster.go b/gitlab/resource_gitlab_group_cluster.go
@@ -87,6 +87,10 @@ func resourceGitlabGroupCluster() *schema.Resource {
 				Default:      "rbac",
 				ValidateFunc: validation.StringInSlice([]string{"rbac", "abac", "unknown_authorization"}, false),
 			},
+			"management_project_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -123,6 +127,10 @@ func resourceGitlabGroupClusterCreate(d *schema.ResourceData, meta interface{})
 		options.EnvironmentScope = gitlab.String(v.(string))
 	}
 
+	if v, ok := d.GetOk("management_project_id"); ok {
+		options.ManagementProjectID = gitlab.String(v.(string))
+	}
+
 	log.Printf("[DEBUG] create gitlab group cluster %q/%q", group, *options.Name)
 
 	cluster, _, err := client.GroupCluster.AddCluster(group, options)
@@ -165,6 +173,12 @@ func resourceGitlabGroupClusterRead(d *schema.ResourceData, meta interface{}) er
 	d.Set("kubernetes_ca_cert", cluster.PlatformKubernetes.CaCert)
 	d.Set("kubernetes_authorization_type", cluster.PlatformKubernetes.AuthorizationType)
 
+	if cluster.ManagementProject == nil {
+		d.Set("management_project_id", "")
+	} else {
+		d.Set("management_project_id", strconv.Itoa(cluster.ManagementProject.ID))
+	}
+
 	return nil
 }
 
@@ -208,6 +222,10 @@ func resourceGitlabGroupClusterUpdate(d *schema.ResourceData, meta interface{})
 		options.PlatformKubernetes = pk
 	}
 
+	if d.HasChange("management_project_id") {
+		options.ManagementProjectID = gitlab.String(d.Get("management_project_id").(string))
+	}
+
 	if *options != (gitlab.EditGroupClusterOptions{}) {
 		log.Printf("[DEBUG] update gitlab group cluster %q/%d", group, clusterId)
 		_, _, err := client.GroupCluster.EditCluster(group, clusterId, options)
diff --git a/gitlab/resource_gitlab_group_cluster_test.go b/gitlab/resource_gitlab_group_cluster_test.go
@@ -79,6 +79,21 @@ func TestAccGitlabGroupCluster_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Create cluster with management_project_id
+			{
+				Config: testAccGitlabGroupClusterManagement(rInt, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGitlabGroupClusterExists("gitlab_group_cluster.foo", &cluster),
+					testAccCheckGitlabGroupClusterAttributes(&cluster, &testAccGitlabGroupClusterExpectedAttributes{
+						Name:                        fmt.Sprintf("foo-cluster-%d", rInt),
+						Domain:                      "example.com",
+						EnvironmentScope:            "*",
+						KubernetesApiURL:            "https://123.123.123",
+						KubernetesCACert:            groupClusterFakeCert,
+						KubernetesAuthorizationType: "abac",
+					}),
+				),
+			},
 		},
 	})
 }
@@ -111,6 +126,7 @@ type testAccGitlabGroupClusterExpectedAttributes struct {
 	KubernetesApiURL            string
 	KubernetesCACert            string
 	KubernetesAuthorizationType string
+	ManagementProjectID         string
 }
 
 func testAccCheckGitlabGroupClusterExists(n string, cluster *gitlab.GroupCluster) resource.TestCheckFunc {
@@ -261,6 +277,48 @@ resource gitlab_group_cluster "foo" {
 `, groupClusterFakeCert, rInt, rInt, rInt, authType)
 }
 
+func testAccGitlabGroupClusterManagement(rInt int, managed bool) string {
+	m := "false"
+	if managed {
+		m = "true"
+	}
+
+	return fmt.Sprintf(`
+variable "cert" {
+  default = <<EOF
+%s
+EOF
+}
+
+resource "gitlab_group" "foo" {
+  name = "foo-group-%d"
+  path = "foo-group-%d"
+  description = "Terraform acceptance tests"
+
+  # So that acceptance tests can be run in a gitlab organization
+  # with no billing
+  visibility_level = "public"
+}
+
+resource "gitlab_project" "cluster-management" {
+	name                   = "cluster-management"
+	namespace_id           = gitlab_group.foo.id
+}
+
+resource gitlab_group_cluster "foo" {
+  group                       = "${gitlab_group.foo.id}"
+  name                          = "foo-cluster-%d"
+  domain                        = "example.com"
+  managed                       = "%s"
+  kubernetes_api_url            = "https://123.123.123"
+  kubernetes_token              = "some-token"
+  kubernetes_ca_cert            = "${trimspace(var.cert)}"
+  kubernetes_authorization_type = "abac"
+  management_project_id         = "${gitlab_project.cluster-management.id}"
+}
+`, groupClusterFakeCert, rInt, rInt, rInt, m)
+}
+
 var groupClusterFakeCert = `-----BEGIN CERTIFICATE-----
 MIICljCCAX4CCQDV7q2baHBlJjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV
 SzAeFw0xOTAzMjUxMTUxNTZaFw0xOTA0MjQxMTUxNTZaMA0xCzAJBgNVBAYTAlVL
diff --git a/gitlab/resource_gitlab_project_cluster.go b/gitlab/resource_gitlab_project_cluster.go
@@ -91,6 +91,10 @@ func resourceGitlabProjectCluster() *schema.Resource {
 				Default:      "rbac",
 				ValidateFunc: validation.StringInSlice([]string{"rbac", "abac", "unknown_authorization"}, false),
 			},
+			"management_project_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -131,6 +135,10 @@ func resourceGitlabProjectClusterCreate(d *schema.ResourceData, meta interface{}
 		options.EnvironmentScope = gitlab.String(v.(string))
 	}
 
+	if v, ok := d.GetOk("management_project_id"); ok {
+		options.ManagementProjectID = gitlab.String(v.(string))
+	}
+
 	log.Printf("[DEBUG] create gitlab project cluster %q/%q", project, *options.Name)
 
 	cluster, _, err := client.ProjectCluster.AddCluster(project, options)
@@ -174,6 +182,12 @@ func resourceGitlabProjectClusterRead(d *schema.ResourceData, meta interface{})
 	d.Set("kubernetes_namespace", cluster.PlatformKubernetes.Namespace)
 	d.Set("kubernetes_authorization_type", cluster.PlatformKubernetes.AuthorizationType)
 
+	if cluster.ManagementProject == nil {
+		d.Set("management_project_id", "")
+	} else {
+		d.Set("management_project_id", strconv.Itoa(cluster.ManagementProject.ID))
+	}
+
 	return nil
 }
 
@@ -221,6 +235,10 @@ func resourceGitlabProjectClusterUpdate(d *schema.ResourceData, meta interface{}
 		options.PlatformKubernetes = pk
 	}
 
+	if d.HasChange("management_project_id") {
+		options.ManagementProjectID = gitlab.String(d.Get("management_project_id").(string))
+	}
+
 	if *options != (gitlab.EditClusterOptions{}) {
 		log.Printf("[DEBUG] update gitlab project cluster %q/%d", project, clusterId)
 		_, _, err := client.ProjectCluster.EditCluster(project, clusterId, options)
diff --git a/gitlab/resource_gitlab_project_cluster_test.go b/gitlab/resource_gitlab_project_cluster_test.go
@@ -81,6 +81,21 @@ func TestAccGitlabProjectCluster_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Create cluster with management_project_id
+			{
+				Config: testAccGitlabProjectClusterManagement(rInt, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGitlabProjectClusterExists("gitlab_project_cluster.foo", &cluster),
+					testAccCheckGitlabProjectClusterAttributes(&cluster, &testAccGitlabProjectClusterExpectedAttributes{
+						Name:                        fmt.Sprintf("foo-cluster-%d", rInt),
+						Domain:                      "example.com",
+						EnvironmentScope:            "*",
+						KubernetesApiURL:            "https://123.123.123",
+						KubernetesCACert:            projectClusterFakeCert,
+						KubernetesAuthorizationType: "abac",
+					}),
+				),
+			},
 		},
 	})
 }
@@ -114,6 +129,7 @@ type testAccGitlabProjectClusterExpectedAttributes struct {
 	KubernetesCACert            string
 	KubernetesNamespace         string
 	KubernetesAuthorizationType string
+	ManagementProjectID         string
 }
 
 func testAccCheckGitlabProjectClusterExists(n string, cluster *gitlab.ProjectCluster) resource.TestCheckFunc {
@@ -267,6 +283,47 @@ resource gitlab_project_cluster "foo" {
 `, projectClusterFakeCert, rInt, rInt, authType)
 }
 
+func testAccGitlabProjectClusterManagement(rInt int, managed bool) string {
+	m := "false"
+	if managed {
+		m = "true"
+	}
+
+	return fmt.Sprintf(`
+variable "cert" {
+  default = <<EOF
+%s
+EOF
+}
+
+resource "gitlab_project" "foo" {
+  name = "foo-project-%d"
+  description = "Terraform acceptance tests"
+
+  # So that acceptance tests can be run in a gitlab organization
+  # with no billing
+  visibility_level = "public"
+}
+
+resource "gitlab_project" "cluster-management" {
+	name                   = "cluster-management-%d"
+	visibility_level       = "public"
+}
+
+resource gitlab_project_cluster "foo" {
+  project                       = "${gitlab_project.foo.id}"
+  name                          = "foo-cluster-%d"
+  domain                        = "example.com"
+  managed                       = "%s"
+  kubernetes_api_url            = "https://123.123.123"
+  kubernetes_token              = "some-token"
+  kubernetes_ca_cert            = "${trimspace(var.cert)}"
+  kubernetes_authorization_type = "abac"
+  management_project_id         = "${gitlab_project.cluster-management.id}"
+}
+`, projectClusterFakeCert, rInt, rInt, rInt, m)
+}
+
 var projectClusterFakeCert = `-----BEGIN CERTIFICATE-----
 MIICljCCAX4CCQDV7q2baHBlJjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV
 SzAeFw0xOTAzMjUxMTUxNTZaFw0xOTA0MjQxMTUxNTZaMA0xCzAJBgNVBAYTAlVL
diff --git a/website/docs/r/group_cluster.html.markdown b/website/docs/r/group_cluster.html.markdown
@@ -31,6 +31,7 @@ resource gitlab_group_cluster "bar" {
   kubernetes_ca_cert            = "some-cert"
   kubernetes_authorization_type = "rbac"
   environment_scope             = "*"
+  management_cluster_id         = "123456"
 }
 ```
 
@@ -58,6 +59,8 @@ The following arguments are supported:
 
 * `environment_scope` - (Optional, string) The associated environment to the cluster. Defaults to `*`.
 
+* `management_cluster_id` - (Optional, string) The ID of the management project for the cluster. 
+
 ## Import
 
 GitLab group clusters can be imported using an id made up of `groupid:clusterid`, e.g.
diff --git a/website/docs/r/project_cluster.html.markdown b/website/docs/r/project_cluster.html.markdown
@@ -31,6 +31,7 @@ resource gitlab_project_cluster "bar" {
   kubernetes_namespace          = "namespace"
   kubernetes_authorization_type = "rbac"
   environment_scope             = "*"
+  management_cluster_id         = "123456"
 }
 ```
 
@@ -60,6 +61,8 @@ The following arguments are supported:
 
 * `environment_scope` - (Optional, string) The associated environment to the cluster. Defaults to `*`.
 
+* `management_cluster_id` - (Optional, string) The ID of the management project for the cluster. 
+
 ## Import
 
 GitLab project clusters can be imported using an id made up of `projectid:clusterid`, e.g.
