cluster & namespace resources feat and fix

CHANGELOG.md

@@ -1,4 +1,20 @@
 ## 1.0.1 (Unreleased)
+
+FEATURES:
+
+ENHANCEMENTS:
+
+* Added `default_project_id` & `system_project_id` attributes to `rancher2_cluster` resource
+* Added support to move `rancher2_namespace` resource to a rancher project when import
+* Added support to terraform 0.12
+
+BUG FIXES:
+
+* Fix: Updated `flattenNamespace` function on `rancher2_namespace` resource to avoid no empty plan if `resource_quota` is not specified
+* Fix: Updated `rke_config` argument for openstack cloud_provider on `rancher2_cluster` resource:
+  * Removed `used_id` field on global argument in favour of `username` following [k8s openstack cloud provider docs](https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/provider-configuration.md#global-required-parameters)
+  * Set computed=true on optional field to avoid no empty plan if not specified
+
 ## 1.0.0 (May 14, 2019)
 
 * Initial Terraform Ecosystem Release

rancher2/config.go

@@ -183,6 +183,34 @@ func (c *Config) GetProjectRoleTemplateBindingsByProjectID(projectID string) ([]
 	return data, err
 }
 
+func (c *Config) IsProjectDefault(project *managementClient.Project) bool {
+	if project == nil {
+		return false
+	}
+
+	for k, v := range project.Labels {
+		if k == projectDefaultLabel && v == "true" {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (c *Config) IsProjectSystem(project *managementClient.Project) bool {
+	if project == nil {
+		return false
+	}
+
+	for k, v := range project.Labels {
+		if k == projectSystemLabel && v == "true" {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (c *Config) GetProjectByName(name, clusterID string) (*managementClient.Project, error) {
 	if name == "" {
 		return nil, fmt.Errorf("[ERROR] Project name is nil")
@@ -277,6 +305,57 @@ func (c *Config) RoleTemplateExist(id string) error {
 	return nil
 }
 
+func (c *Config) GetClusterProjects(id string) ([]managementClient.Project, error) {
+	if id == "" {
+		return nil, fmt.Errorf("[ERROR] Cluster id is nil")
+	}
+
+	client, err := c.ManagementClient()
+	if err != nil {
+		return nil, err
+	}
+
+	filters := map[string]interface{}{"clusterId": id}
+	listOpts := NewListOpts(filters)
+
+	collection, err := client.Project.List(listOpts)
+	if err != nil {
+		return nil, err
+	}
+
+	return collection.Data, nil
+}
+
+func (c *Config) GetClusterSpecialProjectsID(id string) (string, string, error) {
+	if id == "" {
+		return "", "", fmt.Errorf("[ERROR] Cluster id is nil")
+	}
+
+	projects, err := c.GetClusterProjects(id)
+	if err != nil {
+		return "", "", err
+	}
+
+	found := 0
+	defaultProjectID := ""
+	systemProjectID := ""
+	for _, project := range projects {
+		if c.IsProjectDefault(&project) {
+			found += 1
+			defaultProjectID = project.ID
+		}
+		if c.IsProjectSystem(&project) {
+			found += 1
+			systemProjectID = project.ID
+		}
+		if found == 2 {
+			return defaultProjectID, systemProjectID, nil
+		}
+	}
+
+	return defaultProjectID, systemProjectID, nil
+}
+
 func (c *Config) GetClusterByName(name string) (*managementClient.Cluster, error) {
 	if name == "" {
 		return nil, fmt.Errorf("[ERROR] Cluster name is nil")

rancher2/import_rancher2_namespace.go

@@ -1,25 +1,41 @@
 package rancher2
 
 import (
+	"log"
+
 	"github.com/hashicorp/terraform/helper/schema"
+	clusterClient "github.com/rancher/types/client/cluster/v3"
 )
 
 func resourceRancher2NamespaceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
-	clusterID, resourceID := splitID(d.Id())
+	projectID, resourceID := splitID(d.Id())
+
+	clusterID, projectID := splitProjectID(projectID)
 
 	client, err := meta.(*Config).ClusterClient(clusterID)
 	if err != nil {
 		return []*schema.ResourceData{}, err
 	}
-	err = d.Set("project_id", clusterID)
-	if err != nil {
-		return []*schema.ResourceData{}, err
-	}
+
 	ns, err := client.Namespace.ByID(resourceID)
 	if err != nil {
 		return []*schema.ResourceData{}, err
 	}
 
+	d.Set("project_id", clusterID)
+	if projectID != "" {
+		log.Printf("[INFO] Moving Namespace ID %s to project %s", d.Id(), projectID)
+		nsMove := &clusterClient.NamespaceMove{
+			ProjectID: projectID,
+		}
+
+		err = client.Namespace.ActionMove(ns, nsMove)
+		if err != nil {
+			return []*schema.ResourceData{}, err
+		}
+		d.Set("project_id", projectID)
+	}
+
 	err = flattenNamespace(d, ns)
 	if err != nil {
 		return []*schema.ResourceData{}, err

rancher2/resource_rancher2_cluster.go

@@ -113,7 +113,12 @@ func resourceRancher2ClusterRead(d *schema.ResourceData, meta interface{}) error
 		return err
 	}
 
-	err = flattenCluster(d, cluster, clusterRegistrationToken, kubeConfig)
+	defaultProjectID, systemProjectID, err := meta.(*Config).GetClusterSpecialProjectsID(cluster.ID)
+	if err != nil {
+		return err
+	}
+
+	err = flattenCluster(d, cluster, clusterRegistrationToken, kubeConfig, defaultProjectID, systemProjectID)
 	if err != nil {
 		return err
 	}

rancher2/resource_rancher2_node_driver_test.go

@@ -33,7 +33,7 @@ resource "rancher2_node_driver" "foo" {
 `
 	testAccRancher2NodeDriverUpdateConfig = `
 resource "rancher2_node_driver" "foo" {
-    active = false,
+    active = false
     builtin = false
     checksum = "0x1"
     description= "Foo description - updated"

rancher2/schema_cluster.go

@@ -127,6 +127,14 @@ func clusterFields() map[string]*schema.Schema {
 				Schema: clusterGKEConfigFields(),
 			},
 		},
+		"default_project_id": &schema.Schema{
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"system_project_id": &schema.Schema{
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"description": &schema.Schema{
 			Type:     schema.TypeString,
 			Optional: true,

rancher2/schema_cluster_rke_config_cloud_provider_openstack.go

@@ -46,16 +46,6 @@ func clusterRKEConfigCloudProviderOpenstackGlobalFields() map[string]*schema.Sch
 			Required:  true,
 			Sensitive: true,
 		},
-		"tenant_id": {
-			Type:      schema.TypeString,
-			Required:  true,
-			Sensitive: true,
-		},
-		"user_id": {
-			Type:      schema.TypeString,
-			Required:  true,
-			Sensitive: true,
-		},
 		"username": {
 			Type:      schema.TypeString,
 			Required:  true,
@@ -82,6 +72,12 @@ func clusterRKEConfigCloudProviderOpenstackGlobalFields() map[string]*schema.Sch
 			Optional: true,
 			Computed: true,
 		},
+		"tenant_id": {
+			Type:      schema.TypeString,
+			Optional:  true,
+			Sensitive: true,
+			Computed:  true,
+		},
 		"tenant_name": {
 			Type:     schema.TypeString,
 			Optional: true,
@@ -199,6 +195,7 @@ func clusterRKEConfigCloudProviderOpenstackFields() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			MaxItems: 1,
 			Optional: true,
+			Computed: true,
 			Elem: &schema.Resource{
 				Schema: clusterRKEConfigCloudProviderOpenstackBlockStorageFields(),
 			},
@@ -207,6 +204,7 @@ func clusterRKEConfigCloudProviderOpenstackFields() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			MaxItems: 1,
 			Optional: true,
+			Computed: true,
 			Elem: &schema.Resource{
 				Schema: clusterRKEConfigCloudProviderOpenstackLoadBalancerFields(),
 			},
@@ -215,6 +213,7 @@ func clusterRKEConfigCloudProviderOpenstackFields() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			MaxItems: 1,
 			Optional: true,
+			Computed: true,
 			Elem: &schema.Resource{
 				Schema: clusterRKEConfigCloudProviderOpenstackMetadataFields(),
 			},
@@ -223,6 +222,7 @@ func clusterRKEConfigCloudProviderOpenstackFields() map[string]*schema.Schema {
 			Type:     schema.TypeList,
 			MaxItems: 1,
 			Optional: true,
+			Computed: true,
 			Elem: &schema.Resource{
 				Schema: clusterRKEConfigCloudProviderOpenstackRouteFields(),
 			},

rancher2/schema_project.go

@@ -4,6 +4,11 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
+const (
+	projectDefaultLabel = "authz.management.cattle.io/default-project"
+	projectSystemLabel  = "authz.management.cattle.io/system-project"
+)
+
 //Schemas
 
 func projectResourceQuotaLimitFields() map[string]*schema.Schema {

rancher2/structure_cluster.go

@@ -29,7 +29,7 @@ func flattenClusterRegistationToken(in *managementClient.ClusterRegistrationToke
 	return []interface{}{obj}, nil
 }
 
-func flattenCluster(d *schema.ResourceData, in *Cluster, clusterRegToken *managementClient.ClusterRegistrationToken, kubeConfig *managementClient.GenerateKubeConfigOutput) error {
+func flattenCluster(d *schema.ResourceData, in *Cluster, clusterRegToken *managementClient.ClusterRegistrationToken, kubeConfig *managementClient.GenerateKubeConfigOutput, defaultProjectID, systemProjectID string) error {
 	if in == nil {
 		return fmt.Errorf("[ERROR] flattening cluster: Input cluster is nil")
 	}
@@ -67,6 +67,8 @@ func flattenCluster(d *schema.ResourceData, in *Cluster, clusterRegToken *manage
 	}
 
 	d.Set("kube_config", kubeConfig.Config)
+	d.Set("default_project_id", defaultProjectID)
+	d.Set("system_project_id", systemProjectID)
 	d.Set("driver", in.Driver)
 
 	switch in.Driver {

rancher2/structure_cluster_rke_config_cloud_provider_openstack.go

@@ -42,14 +42,6 @@ func flattenClusterRKEConfigCloudProviderOpenstackGlobal(in *managementClient.Gl
 		obj["password"] = in.Password
 	}
 
-	if len(in.TenantID) > 0 {
-		obj["tenant_id"] = in.TenantID
-	}
-
-	if len(in.UserID) > 0 {
-		obj["user_id"] = in.UserID
-	}
-
 	if len(in.Username) > 0 {
 		obj["username"] = in.Username
 	}
@@ -70,6 +62,10 @@ func flattenClusterRKEConfigCloudProviderOpenstackGlobal(in *managementClient.Gl
 		obj["region"] = in.Region
 	}
 
+	if len(in.TenantID) > 0 {
+		obj["tenant_id"] = in.TenantID
+	}
+
 	if len(in.TenantName) > 0 {
 		obj["tenant_name"] = in.TenantName
 	}
@@ -256,14 +252,6 @@ func expandClusterRKEConfigCloudProviderOpenstackGlobal(p []interface{}) (*manag
 		obj.Password = v
 	}
 
-	if v, ok := in["tenant_id"].(string); ok && len(v) > 0 {
-		obj.TenantID = v
-	}
-
-	if v, ok := in["user_id"].(string); ok && len(v) > 0 {
-		obj.UserID = v
-	}
-
 	if v, ok := in["username"].(string); ok && len(v) > 0 {
 		obj.Username = v
 	}
@@ -284,6 +272,10 @@ func expandClusterRKEConfigCloudProviderOpenstackGlobal(p []interface{}) (*manag
 		obj.Region = v
 	}
 
+	if v, ok := in["tenant_id"].(string); ok && len(v) > 0 {
+		obj.TenantID = v
+	}
+
 	if v, ok := in["tenant_name"].(string); ok && len(v) > 0 {
 		obj.TenantName = v
 	}

rancher2/structure_cluster_rke_config_cloud_provider_openstack_test.go

@@ -39,7 +39,6 @@ func init() {
 		AuthURL:    "auth.terraform.test",
 		Password:   "XXXXXXXX",
 		TenantID:   "YYYYYYYY",
-		UserID:     "ZZZZZZZZ",
 		Username:   "user",
 		CAFile:     "ca_file",
 		DomainID:   "domain_id",
@@ -53,7 +52,6 @@ func init() {
 			"auth_url":    "auth.terraform.test",
 			"password":    "XXXXXXXX",
 			"tenant_id":   "YYYYYYYY",
-			"user_id":     "ZZZZZZZZ",
 			"username":    "user",
 			"ca_file":     "ca_file",
 			"domain_id":   "domain_id",