Merge pull request rancher#6 from rawmind0/master

Fix rancher2_cluster_role_template_binding resource saving. Updated acceptance tests.
jordanjean · Nov 12, 2018 · 2433ff3 · 2433ff3
2 parents 1461010 + ca7fecb
commit 2433ff3
Show file tree

Hide file tree

Showing 14 changed files with 469 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -109,3 +109,16 @@ To update vendor dependencies, edit `vendor.conf` file and execute trash
 $ trash
 ```
 
+Acceptance tests 
+----------------
+
+For execute acceptance tests, a running rancher HA system and a rancher API key are needed. 
+
+To run acceptance tests, export `RANCHER_URL` with rancher url and `RANCHER_TOKEN_KEY` with bearer token or `RANCHER_ACCESS_KEY` with rancher acces key and `RANCHER_SECRET_KEY` with rancher secret key and execute
+
+```sh
+$ export RANCHER_URL=<URL>
+$ export RANCHER_TOKEN_KEY=<TOKEN>
+$ scripts/testacc
+```
+
diff --git a/rancher2/config.go b/rancher2/config.go
@@ -365,3 +365,41 @@ func (c *Config) GetAuthConfig(in *managementClient.AuthConfig) (interface{}, er
 func (c *Config) UpdateAuthConfig(url string, createObj interface{}, respObject interface{}) error {
 	return c.Client.Management.Ops.DoModify("PUT", url, createObj, respObject)
 }
+
+func (c *Config) GetUserByName(name string) (*managementClient.User, error) {
+	if name == "" {
+		return nil, fmt.Errorf("[ERROR] Username is nil")
+	}
+
+	client, err := c.ManagementClient()
+	if err != nil {
+		return nil, err
+	}
+
+	filters := map[string]interface{}{"username": name}
+	listOpts := NewListOpts(filters)
+
+	users, err := client.User.List(listOpts)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, user := range users.Data {
+		if user.Username == name {
+			return &user, nil
+		}
+	}
+	return nil, fmt.Errorf("[ERROR] Username %s not found", name)
+}
+
+func (c *Config) GetUserIDByName(name string) (string, error) {
+	if name == "" {
+		return "", nil
+	}
+
+	user, err := c.GetUserByName(name)
+	if err != nil {
+		return "", err
+	}
+	return user.ID, nil
+}
diff --git a/rancher2/provider_test.go b/rancher2/provider_test.go
@@ -29,7 +29,16 @@ func TestProvider_impl(t *testing.T) {
 }
 
 func testAccPreCheck(t *testing.T) {
-	if v := os.Getenv("RANCHER_URL"); v == "" {
+	url := os.Getenv("RANCHER_URL")
+	token := os.Getenv("RANCHER_TOKEN_KEY")
+	accessKey := os.Getenv("RANCHER_ACCESS_KEY")
+	secretKey := os.Getenv("RANCHER_SECRET_KEY")
+
+	if url == "" {
 		t.Fatal("RANCHER_URL must be set for acceptance tests")
 	}
+
+	if token == "" && (accessKey == "" || secretKey == "") {
+		t.Fatal("RANCHER_TOKEN_KEY or RANCHER_ACCESS_KEY and RANCHER_SECRET_KEY must be set for acceptance tests")
+	}
 }
diff --git a/rancher2/resource_rancher2_catalog_test.go b/rancher2/resource_rancher2_catalog_test.go
@@ -16,23 +16,23 @@ const (
 resource "rancher2_catalog" "foo" {
   name = "foo"
   url = "http://foo.com:8080"
-  description= "Foo catalog test"
+  description= "Terraform catalog acceptance test"
 }
 `
 
 	testAccRancher2CatalogUpdateConfig = `
 resource "rancher2_catalog" "foo" {
   name = "foo"
   url = "http://foo.updated.com:8080"
-  description= "Foo catalog test - updated"
+  description= "Terraform catalog acceptance test - updated"
 }
  `
 
 	testAccRancher2CatalogRecreateConfig = `
 resource "rancher2_catalog" "foo" {
   name = "foo"
   url = "http://foo.com:8080"
-  description= "Foo catalog test"
+  description= "Terraform catalog acceptance test"
 }
  `
 )
@@ -50,7 +50,7 @@ func TestAccRancher2Catalog_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckRancher2CatalogExists(testAccRancher2CatalogType+".foo", catalog),
 					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "name", "foo"),
-					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "description", "Foo catalog test"),
+					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "description", "Terraform catalog acceptance test"),
 					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "url", "http://foo.com:8080"),
 				),
 			},
@@ -59,7 +59,7 @@ func TestAccRancher2Catalog_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckRancher2CatalogExists(testAccRancher2CatalogType+".foo", catalog),
 					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "name", "foo"),
-					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "description", "Foo catalog test - updated"),
+					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "description", "Terraform catalog acceptance test - updated"),
 					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "url", "http://foo.updated.com:8080"),
 				),
 			},
@@ -68,7 +68,7 @@ func TestAccRancher2Catalog_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckRancher2CatalogExists(testAccRancher2CatalogType+".foo", catalog),
 					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "name", "foo"),
-					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "description", "Foo catalog test"),
+					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "description", "Terraform catalog acceptance test"),
 					resource.TestCheckResourceAttr(testAccRancher2CatalogType+".foo", "url", "http://foo.com:8080"),
 				),
 			},

diff --git a/rancher2/resource_rancher2_cluster.go b/rancher2/resource_rancher2_cluster.go
@@ -361,17 +361,38 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 		return err
 	}
 
-	rkeConfig, err := expandRkeConfig(d.Get("rke_config").([]interface{}))
-	if err != nil {
-		return err
+	update := map[string]interface{}{
+		"name":        d.Get("name").(string),
+		"description": d.Get("description").(string),
+		"annotations": toMapString(d.Get("annotations").(map[string]interface{})),
+		"labels":      toMapString(d.Get("labels").(map[string]interface{})),
 	}
 
-	update := map[string]interface{}{
-		"name":                          d.Get("name").(string),
-		"description":                   d.Get("description").(string),
-		"rancherKubernetesEngineConfig": rkeConfig,
-		"annotations":                   toMapString(d.Get("annotations").(map[string]interface{})),
-		"labels":                        toMapString(d.Get("labels").(map[string]interface{})),
+	switch kind := d.Get("kind").(string); kind {
+	case "rke":
+		rkeConfig, err := expandRkeConfig(d.Get("rke_config").([]interface{}))
+		if err != nil {
+			return err
+		}
+		update["rancherKubernetesEngineConfig"] = rkeConfig
+	case "eks":
+		eksConfig, err := expandEksConfig(d.Get("eks_config").([]interface{}))
+		if err != nil {
+			return err
+		}
+		update["amazonElasticContainerServiceConfig"] = eksConfig
+	case "aks":
+		aksConfig, err := expandAksConfig(d.Get("aks_config").([]interface{}))
+		if err != nil {
+			return err
+		}
+		update["azureKubernetesServiceConfig"] = aksConfig
+	case "gke":
+		gkeConfig, err := expandGkeConfig(d.Get("gke_config").([]interface{}))
+		if err != nil {
+			return err
+		}
+		update["googleKubernetesEngineConfig"] = gkeConfig
 	}
 
 	newCluster, err := meta.(*Config).UpdateClusterByID(cluster, update)

diff --git a/rancher2/resource_rancher2_cluster_role_template_binding.go b/rancher2/resource_rancher2_cluster_role_template_binding.go
@@ -203,7 +203,7 @@ func resourceRancher2ClusterRoleTemplateBindingCreate(d *schema.ResourceData, me
 			"[ERROR] waiting for cluster role template binding (%s) to be created: %s", newClusterRole.ID, waitErr)
 	}
 
-	err = flattenClusterRoleTemplateBinding(d, clusterRole)
+	err = flattenClusterRoleTemplateBinding(d, newClusterRole)
 	if err != nil {
 		return err
 	}

diff --git a/rancher2/resource_rancher2_cluster_role_template_binding_test.go b/rancher2/resource_rancher2_cluster_role_template_binding_test.go
@@ -24,8 +24,7 @@ resource "rancher2_cluster_role_template_binding" "foo" {
 resource "rancher2_cluster_role_template_binding" "foo" {
   name = "foo"
   cluster_id = "local"
-  role_template_id = "project-member"
-  user_id = "u-q2wg7"
+  role_template_id = "project-owner"
 }
  `
 
@@ -61,8 +60,7 @@ func TestAccRancher2ClusterRoleTemplateBinding_basic(t *testing.T) {
 					testAccCheckRancher2ClusterRoleTemplateBindingExists(testAccRancher2ClusterRoleTemplateBindingType+".foo", clusterRole),
 					resource.TestCheckResourceAttr(testAccRancher2ClusterRoleTemplateBindingType+".foo", "name", "foo"),
 					resource.TestCheckResourceAttr(testAccRancher2ClusterRoleTemplateBindingType+".foo", "cluster_id", "local"),
-					resource.TestCheckResourceAttr(testAccRancher2ClusterRoleTemplateBindingType+".foo", "role_template_id", "project-member"),
-					resource.TestCheckResourceAttr(testAccRancher2ClusterRoleTemplateBindingType+".foo", "user_id", "u-q2wg7"),
+					resource.TestCheckResourceAttr(testAccRancher2ClusterRoleTemplateBindingType+".foo", "role_template_id", "project-owner"),
 				),
 			},
 			resource.TestStep{