add folder_id as output to folder datasource and resource (#3763) (#2287

)

Signed-off-by: Modular Magician <[email protected]>

.changelog/3763.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resourcemanager: added `folder_id` as computed attribute to `google_folder` resource and datasource.
+```

google-beta/data_source_google_folder.go

@@ -15,6 +15,10 @@ func dataSourceGoogleFolder() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"folder_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"name": {
 				Type:     schema.TypeString,
 				Computed: true,

google-beta/resource_cloud_asset_folder_feed_generated_test.go

@@ -56,7 +56,7 @@ func testAccCloudAssetFolderFeed_cloudAssetFolderFeedExample(context map[string]
 # particular folder.
 resource "google_cloud_asset_folder_feed" "folder_feed" {
   billing_project  = "%{project}"
-  folder           = google_folder.my_folder.name
+  folder           = google_folder.my_folder.folder_id
   feed_id          = "tf-test-network-updates%{random_suffix}"
   content_type     = "RESOURCE"
 

google-beta/resource_google_folder.go

@@ -41,7 +41,11 @@ func resourceGoogleFolder() *schema.Resource {
 				Required:    true,
 				Description: `The folder's display name. A folder's display name must be unique amongst its siblings, e.g. no two folders with the same parent can share the same display name. The display name must start and end with a letter or digit, may contain letters, digits, spaces, hyphens and underscores and can be no longer than 30 characters.`,
 			},
-
+			"folder_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: `The folder id from the name "folders/{folder_id}"`,
+			},
 			// Format is 'folders/{folder_id}.
 			// The terraform id holds the same value.
 			"name": {
@@ -119,6 +123,8 @@ func resourceGoogleFolderRead(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	d.Set("name", folder.Name)
+	folderId := strings.TrimPrefix(folder.Name, "folders/")
+	d.Set("folder_id", folderId)
 	d.Set("parent", folder.Parent)
 	d.Set("display_name", folder.DisplayName)
 	d.Set("lifecycle_state", folder.LifecycleState)

website/docs/r/cloud_asset_folder_feed.html.markdown

@@ -44,7 +44,7 @@ To get more information about FolderFeed, see:
 # particular folder.
 resource "google_cloud_asset_folder_feed" "folder_feed" {
   billing_project  = "my-project-name"
-  folder           = google_folder.my_folder.name
+  folder           = google_folder.my_folder.folder_id
   feed_id          = "network-updates"
   content_type     = "RESOURCE"