Basic unit tests for lien. Enable resource manager generated code.

Author: nat-henderson

google/provider.go

@@ -95,6 +95,7 @@ func Provider() terraform.ResourceProvider {
 
 		ResourcesMap: mergeResourceMaps(
 			GeneratedComputeResourcesMap,
+			GeneratedResourceManagerResourcesMap,
 			map[string]*schema.Resource{
 				"google_bigquery_dataset":                      resourceBigQueryDataset(),
 				"google_bigquery_table":                        resourceBigQueryTable(),

google/resource_resourcemanager_lien_test.go

@@ -0,0 +1,106 @@
+package google
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+	resourceManager "google.golang.org/api/cloudresourcemanager/v1"
+)
+
+func TestAccResourceManagerLien_basic(t *testing.T) {
+	t.Parallel()
+
+	projectName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+	org := getTestOrgFromEnv(t)
+	var lien resourceManager.Lien
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckResourceManagerLienDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccResourceManagerLien_basic(projectName, org),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckResourceManagerLienExists(
+						"google_resource_manager_lien.lien", projectName, &lien),
+				),
+			},
+			resource.TestStep{
+				ResourceName:      "google_resource_manager_lien.lien",
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateIdFunc: func(_ *terraform.State) (string, error) {
+					return fmt.Sprintf("%s/%s",
+						projectName,
+						strings.Split(lien.Name, "/")[1]), nil
+				},
+			},
+		},
+	})
+}
+
+func testAccCheckResourceManagerLienExists(n, projectName string, lien *resourceManager.Lien) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No ID is set")
+		}
+
+		config := testAccProvider.Meta().(*Config)
+
+		found, err := config.clientResourceManager.Liens.List().Parent(fmt.Sprintf("projects/%s", projectName)).Do()
+		if err != nil {
+			return err
+		}
+		if len(found.Liens) != 1 {
+			return fmt.Errorf("Lien %s not found", rs.Primary.ID)
+		}
+
+		*lien = *found.Liens[0]
+
+		return nil
+	}
+}
+
+func testAccCheckResourceManagerLienDestroy(s *terraform.State) error {
+	config := testAccProvider.Meta().(*Config)
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "google_resource_manager_lien" {
+			continue
+		}
+
+		_, err := config.clientResourceManager.Liens.List().Parent(fmt.Sprintf("projects/%s", rs.Primary.Attributes["parent"])).Do()
+		if err == nil {
+			return fmt.Errorf("Lien %s still exists", rs.Primary.ID)
+		}
+	}
+
+	return nil
+}
+
+func testAccResourceManagerLien_basic(projectName, org string) string {
+	return fmt.Sprintf(`
+resource "google_project" "project" {
+  project_id = "%s"
+  name = "some test project"
+  org_id = "%s"
+}
+
+resource "google_resource_manager_lien" "lien" {
+  parent = "projects/${google_project.project.project_id}"
+  restrictions = ["resourcemanager.projects.delete"]
+  origin = "something"
+  reason = "something else"
+}
+`, projectName, org)
+}

google/utils.go

@@ -298,15 +298,13 @@ func mergeSchemas(a, b map[string]*schema.Schema) map[string]*schema.Schema {
 	return merged
 }
 
-func mergeResourceMaps(a, b map[string]*schema.Resource) map[string]*schema.Resource {
+func mergeResourceMaps(ms ...map[string]*schema.Resource) map[string]*schema.Resource {
 	merged := make(map[string]*schema.Resource)
 
-	for k, v := range a {
-		merged[k] = v
-	}
-
-	for k, v := range b {
-		merged[k] = v
+	for _, m := range ms {
+		for k, v := range m {
+			merged[k] = v
+		}
 	}
 
 	return merged