Merge pull request #1019 from ewbankkit/issue-1018

Set 'project' attribute when importing 'google_logging_project_sink'

Author: emilymye

google/import_logging_project_sink_test.go

@@ -18,7 +18,7 @@ func TestAccLoggingProjectSink_importBasic(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccLoggingProjectSink_basic(sinkName, bucketName),
+				Config: testAccLoggingProjectSink_basic(sinkName, getTestProjectFromEnv(), bucketName),
 			},
 
 			resource.TestStep{

google/resource_logging_project_sink.go

@@ -16,12 +16,13 @@ func resourceLoggingProjectSink() *schema.Resource {
 		Update: resourceLoggingProjectSinkUpdate,
 		Schema: resourceLoggingSinkSchema(),
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			State: resourceLoggingProjectSinkImportState,
 		},
 	}
 	schm.Schema["project"] = &schema.Schema{
 		Type:     schema.TypeString,
 		Optional: true,
+		Computed: true,
 		ForceNew: true,
 	}
 	schm.Schema["unique_writer_identity"] = &schema.Schema{
@@ -57,11 +58,17 @@ func resourceLoggingProjectSinkCreate(d *schema.ResourceData, meta interface{})
 func resourceLoggingProjectSinkRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
+	project, err := getProject(d, config)
+	if err != nil {
+		return err
+	}
+
 	sink, err := config.clientLogging.Projects.Sinks.Get(d.Id()).Do()
 	if err != nil {
 		return handleNotFoundError(err, d, fmt.Sprintf("Project Logging Sink %s", d.Get("name").(string)))
 	}
 
+	d.Set("project", project)
 	flattenResourceLoggingSink(d, sink)
 	if sink.WriterIdentity != nonUniqueWriterAccount {
 		d.Set("unique_writer_identity", true)
@@ -96,3 +103,18 @@ func resourceLoggingProjectSinkDelete(d *schema.ResourceData, meta interface{})
 	d.SetId("")
 	return nil
 }
+
+func resourceLoggingProjectSinkImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	config := meta.(*Config)
+
+	loggingSinkId, err := parseLoggingSinkId(d.Id())
+	if err != nil {
+		return nil, err
+	}
+
+	if config.Project != loggingSinkId.resourceId {
+		d.Set("project", loggingSinkId.resourceId)
+	}
+
+	return []*schema.ResourceData{d}, nil
+}

google/resource_logging_project_sink_test.go

@@ -2,12 +2,13 @@ package google
 
 import (
 	"fmt"
+	"strconv"
+	"testing"
+
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"google.golang.org/api/logging/v2"
-	"strconv"
-	"testing"
 )
 
 func TestAccLoggingProjectSink_basic(t *testing.T) {
@@ -24,7 +25,7 @@ func TestAccLoggingProjectSink_basic(t *testing.T) {
 		CheckDestroy: testAccCheckLoggingProjectSinkDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccLoggingProjectSink_basic(sinkName, bucketName),
+				Config: testAccLoggingProjectSink_basic(sinkName, getTestProjectFromEnv(), bucketName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckLoggingProjectSinkExists("google_logging_project_sink.basic", &sink),
 					testAccCheckLoggingProjectSink(&sink, "google_logging_project_sink.basic"),
@@ -165,18 +166,19 @@ func testAccCheckLoggingProjectSink(sink *logging.LogSink, n string) resource.Te
 	}
 }
 
-func testAccLoggingProjectSink_basic(name, bucketName string) string {
+func testAccLoggingProjectSink_basic(name, project, bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_logging_project_sink" "basic" {
 	name = "%s"
+	project = "%s"
 	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
 	filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 	unique_writer_identity = false
 }
 
 resource "google_storage_bucket" "log-bucket" {
 	name     = "%s"
-}`, name, getTestProjectFromEnv(), bucketName)
+}`, name, project, project, bucketName)
 }
 
 func testAccLoggingProjectSink_uniqueWriter(name, bucketName string) string {