Update ID usage

Author: paultyng

docs/data-sources/data_source.md

@@ -48,11 +48,11 @@ output "all_server_ips" {
 ### Optional
 
 - **has_computed_default** (String) If set, its literal value will be stored and returned. If not, its value defaults to `"default"`. This argument exists primarily for testing and has little practical use.
-- **id** (String) The ID of this resource.
 - **inputs** (Map of String) A map of arbitrary strings that is copied into the `outputs` attribute, and accessible directly for interpolation.
 
 ### Read-Only
 
+- **id** (String, Deprecated) This attribute is only present for some legacy compatibility issues and should not be used. It will be removed in a future version.
 - **outputs** (Map of String) After the data source is "read", a copy of the `inputs` map.
 - **random** (String) A random value. This is primarily for testing and has little practical use; prefer the [hashicorp/random provider](https://registry.terraform.io/providers/hashicorp/random) for more practical random number use-cases.
 

docs/resources/resource.md

@@ -55,6 +55,9 @@ resource "null_resource" "cluster" {
 
 ### Optional
 
-- **id** (String) The ID of this resource.
 - **triggers** (Map of String) A map of arbitrary strings that, when changed, will force the null resource to be replaced, re-running any associated provisioners.
 
+### Read-Only
+
+- **id** (String) This is set to a random value at create time.
+

internal/provider/data_source.go

@@ -9,6 +9,9 @@ import (
 
 func dataSource() *schema.Resource {
 	return &schema.Resource{
+		DeprecationMessage: "The null_data_source was historically used to construct intermediate values to re-use elsewhere " +
+			"in configuration, the same can now be achieved using locals",
+
 		Description: `The ` + "`null_data_source`" + ` data source implements the standard data source lifecycle but does not
 interact with any external APIs.
 
@@ -40,6 +43,13 @@ same can now be achieved using [locals](https://www.terraform.io/docs/language/v
 				Optional:    true,
 				Computed:    true,
 			},
+
+			"id": {
+				Description: "This attribute is only present for some legacy compatibility issues and should not be used. It will be removed in a future version.",
+				Computed:    true,
+				Deprecated:  "This attribute is only present for some legacy compatibility issues and should not be used. It will be removed in a future version.",
+				Type:        schema.TypeString,
+			},
 		},
 	}
 }

internal/provider/resource.go

@@ -24,6 +24,12 @@ The ` + "`triggers`" + ` argument allows specifying an arbitrary set of values t
 				Optional:    true,
 				ForceNew:    true,
 			},
+
+			"id": {
+				Description: "This is set to a random value at create time.",
+				Computed:    true,
+				Type:        schema.TypeString,
+			},
 		},
 	}
 }