Allow google.project.id for passing project to resource_project_servi…

…ce (#3975) (#7255) * Alow project.id for passing project to resource_project_service * remove adjustProjectReference and utilize GetResourceNameFromSelfLink Signed-off-by: Modular Magician <[email protected]>
hashicorp · Sep 11, 2020 · 960ce26 · 960ce26
1 parent dd49958
commit 960ce26
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.changelog/3975.txt b/.changelog/3975.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+project_service: Added ability to pass google.project.id to project property
+```
diff --git a/google/resource_google_project_service.go b/google/resource_google_project_service.go
@@ -82,10 +82,11 @@ func resourceGoogleProjectService() *schema.Resource {
 				ValidateFunc: StringNotInSlice(append(ignoredProjectServices, bannedProjectServices...), false),
 			},
 			"project": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
+				Type:             schema.TypeString,
+				Optional:         true,
+				Computed:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: compareResourceNames,
 			},
 
 			"disable_dependent_services": {
@@ -119,12 +120,10 @@ func resourceGoogleProjectServiceCreate(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
+	project = GetResourceNameFromSelfLink(project)
 
 	srv := d.Get("service").(string)
-	id, err := replaceVars(d, config, "{{project}}/{{service}}")
-	if err != nil {
-		return fmt.Errorf("unable to construct ID: %s", err)
-	}
+	id := project + "/" + srv
 
 	// Check if the service has already been enabled
 	servicesRaw, err := BatchRequestReadServices(project, d, config)
@@ -155,6 +154,7 @@ func resourceGoogleProjectServiceRead(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
+	project = GetResourceNameFromSelfLink(project)
 
 	// Verify project for services still exists
 	projectGetCall := config.clientResourceManager.Projects.Get(project)
@@ -206,6 +206,7 @@ func resourceGoogleProjectServiceDelete(d *schema.ResourceData, meta interface{}
 	if err != nil {
 		return err
 	}
+	project = GetResourceNameFromSelfLink(project)
 
 	service := d.Get("service").(string)
 	disableDependencies := d.Get("disable_dependent_services").(bool)

diff --git a/google/resource_google_project_service_test.go b/google/resource_google_project_service_test.go
@@ -39,7 +39,7 @@ func TestAccProjectService_basic(t *testing.T) {
 				ResourceName:            "google_project_service.test2",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"disable_on_destroy"},
+				ImportStateVerifyIgnore: []string{"disable_on_destroy", "project"},
 			},
 			// Use a separate TestStep rather than a CheckDestroy because we need the project to still exist.
 			{
@@ -189,7 +189,7 @@ func testAccProjectService_basic(services []string, pid, name, org string) strin
 	return fmt.Sprintf(`
 provider "google" {
   user_project_override = true
-}	
+}
 resource "google_project" "acceptance" {
   project_id = "%s"
   name       = "%s"
@@ -202,7 +202,7 @@ resource "google_project_service" "test" {
 }
 
 resource "google_project_service" "test2" {
-  project = google_project.acceptance.project_id
+  project = google_project.acceptance.id
   service = "%s"
 }
 `, pid, name, org, services[0], services[1])