fix documentations and error messages (#6927) (#13314)

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

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

Author: modular-magician

.changelog/6927.txt

@@ -0,0 +1,3 @@
+```release-note:none
+Fixed some issues in Terraform documentations and error messages.
+```

google/resource_iam_workforce_pool.go

@@ -38,9 +38,9 @@ func validateWorkforcePoolId(v interface{}, k string) (ws []string, errors []err
 
 	if !regexp.MustCompile(workforcePoolIdRegexp).MatchString(value) {
 		errors = append(errors, fmt.Errorf(
-			"Workforce Pool Id \"%q\" must contain only lowercase letters [a-z], digits [0-9], and hyphens "+
+			"%q (%q) must contain only lowercase letters [a-z], digits [0-9], and hyphens "+
 				"[-]. The WorkforcePool ID must be between 6 and 63 characters, begin "+
-				"with a letter, and cannot have a trailing hyphen.", k))
+				"with a letter, and cannot have a trailing hyphen.", k, value))
 	}
 
 	return
@@ -125,7 +125,7 @@ Format: 'locations/{location}/workforcePools/{workforcePoolId}'`,
  * ACTIVE: The pool is active, and may be used in Google Cloud policies.
  * DELETED: The pool is soft-deleted. Soft-deleted pools are permanently deleted
    after approximately 30 days. You can restore a soft-deleted pool using
-   [UndeleteWorkforcePool][WorkforcePools.UndeleteWorkforcePool].
+   [workforcePools.undelete](https://cloud.google.com/iam/docs/reference/rest/v1/locations.workforcePools/undelete#google.iam.admin.v1.WorkforcePools.UndeleteWorkforcePool).
    You cannot reuse the ID of a soft-deleted pool until it is permanently deleted.
    While a pool is deleted, you cannot use it to exchange tokens, or use
    existing tokens to access resources. If the pool is undeleted, existing

google/resource_iam_workforce_pool_provider.go

@@ -32,13 +32,13 @@ func validateWorkforcePoolProviderId(v interface{}, k string) (ws []string, erro
 
 	if strings.HasPrefix(value, "gcp-") {
 		errors = append(errors, fmt.Errorf(
-			"%q \"%q\" can not start with \"gcp-\". "+
+			"%q (%q) can not start with \"gcp-\". "+
 				"The prefix `gcp-` is reserved for use by Google, and may not be specified.", k, value))
 	}
 
 	if !regexp.MustCompile(workforcePoolProviderIdRegexp).MatchString(value) {
 		errors = append(errors, fmt.Errorf(
-			"Workforce Pool Provider Id \"%q\" must be 4-32 characters, and may contain the characters [a-z0-9-].", value))
+			"%q (%q) must be 4-32 characters, and may contain the characters [a-z0-9-].", k, value))
 	}
 
 	return

website/docs/r/iam_workforce_pool.html.markdown

@@ -22,9 +22,6 @@ description: |-
 
 Represents a collection of external workforces. Provides namespaces for
 federated users that can be referenced in IAM policies.
-Note: Ask your Google Cloud account team to request access to workforce identity
-federation for your billing/quota project. The account team notifies you when the project is
-granted access.
 
 
 To get more information about WorkforcePool, see:
@@ -33,6 +30,9 @@ To get more information about WorkforcePool, see:
 * How-to Guides
     * [Manage pools](https://cloud.google.com/iam/docs/manage-workforce-identity-pools-providers#manage_pools)
 
+~> **Note:** Ask your Google Cloud account team to request access to workforce identity federation for
+your billing/quota project. The account team notifies you when the project is granted access.
+
 ## Example Usage - Iam Workforce Pool Basic
 
 
@@ -119,7 +119,7 @@ In addition to the arguments listed above, the following computed attributes are
    * ACTIVE: The pool is active, and may be used in Google Cloud policies.
    * DELETED: The pool is soft-deleted. Soft-deleted pools are permanently deleted
      after approximately 30 days. You can restore a soft-deleted pool using
-     [UndeleteWorkforcePool][WorkforcePools.UndeleteWorkforcePool].
+     [workforcePools.undelete](https://cloud.google.com/iam/docs/reference/rest/v1/locations.workforcePools/undelete#google.iam.admin.v1.WorkforcePools.UndeleteWorkforcePool).
      You cannot reuse the ID of a soft-deleted pool until it is permanently deleted.
      While a pool is deleted, you cannot use it to exchange tokens, or use
      existing tokens to access resources. If the pool is undeleted, existing

website/docs/r/iam_workforce_pool_provider.html.markdown

@@ -21,9 +21,6 @@ description: |-
 # google\_iam\_workforce\_pool\_provider
 
 A configuration for an external identity provider.
-~> **Note:** Ask your Google Cloud account team to request access to workforce identity
-federation for your billing/quota project. The account team notifies you when the project is
-granted access.
 
 
 To get more information about WorkforcePoolProvider, see:
@@ -32,6 +29,9 @@ To get more information about WorkforcePoolProvider, see:
 * How-to Guides
     * [Configure a provider within the workforce pool](https://cloud.google.com/iam/docs/manage-workforce-identity-pools-providers#configure_a_provider_within_the_workforce_pool)
 
+~> **Note:** Ask your Google Cloud account team to request access to workforce identity federation for your
+billing/quota project. The account team notifies you when the project is granted access.
+
 ## Example Usage - Iam Workforce Pool Provider Saml Basic