Revert " provider: eliminated the need to manually add *_wo and `*_… (#14942) (#24081)

[upstream:c4a23a80951f1790dee041960a96646eed28ed44]

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

Author: modular-magician

google/services/bigquerydatatransfer/resource_bigquery_data_transfer_config.go

@@ -287,24 +287,25 @@ to a different credential configuration in the config will require an apply to u
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"secret_access_key": {
-							Type:        schema.TypeString,
-							Optional:    true,
-							Description: `The Secret Access Key of the AWS account transferring data from.`,
-							Sensitive:   true,
+							Type:          schema.TypeString,
+							Optional:      true,
+							Description:   `The Secret Access Key of the AWS account transferring data from.`,
+							Sensitive:     true,
+							ConflictsWith: []string{"sensitive_params.0.secret_access_key_wo"},
+							AtLeastOneOf:  []string{"sensitive_params.0.secret_access_key", "sensitive_params.0.secret_access_key_wo"},
 						},
 						"secret_access_key_wo": {
-							Type:     schema.TypeString,
-							Optional: true,
-							Description: `The Secret Access Key of the AWS account transferring data from.
- Note: This property is write-only and will not be read from the API. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
-							WriteOnly:    true,
-							ExactlyOneOf: []string{"sensitive_params.0.secret_access_key", "sensitive_params.0.secret_access_key_wo"},
-							RequiredWith: []string{"sensitive_params.0.secret_access_key_wo_version"},
+							Type:          schema.TypeString,
+							Optional:      true,
+							Description:   `The Secret Access Key of the AWS account transferring data from.`,
+							WriteOnly:     true,
+							ConflictsWith: []string{"sensitive_params.0.secret_access_key"},
+							AtLeastOneOf:  []string{"sensitive_params.0.secret_access_key_wo", "sensitive_params.0.secret_access_key"},
 						},
 						"secret_access_key_wo_version": {
-							Type:         schema.TypeString,
+							Type:         schema.TypeInt,
 							Optional:     true,
-							Description:  `Triggers update of secret_access_key_wo write-only. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
+							Description:  `The version of the sensitive params - used to trigger updates of the write-only params. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
 							RequiredWith: []string{"sensitive_params.0.secret_access_key_wo"},
 						},
 					},

google/services/monitoring/resource_monitoring_uptime_check_config.go

@@ -172,23 +172,25 @@ func ResourceMonitoringUptimeCheckConfig() *schema.Resource {
 										Description: `The username to authenticate.`,
 									},
 									"password": {
-										Type:        schema.TypeString,
-										Optional:    true,
-										Description: `The password to authenticate.`,
-										Sensitive:   true,
+										Type:         schema.TypeString,
+										Optional:     true,
+										Description:  `The password to authenticate.`,
+										Sensitive:    true,
+										ExactlyOneOf: []string{},
 									},
 									"password_wo": {
 										Type:         schema.TypeString,
 										Optional:     true,
-										Description:  `The password to authenticate. Note: This property is write-only and will not be read from the API. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
+										Description:  `The password to authenticate.`,
 										WriteOnly:    true,
-										ExactlyOneOf: []string{"http_check.0.auth_info.0.password", "http_check.0.auth_info.0.password_wo"},
+										ExactlyOneOf: []string{},
 										RequiredWith: []string{"http_check.0.auth_info.0.password_wo_version"},
 									},
 									"password_wo_version": {
 										Type:         schema.TypeString,
 										Optional:     true,
-										Description:  `Triggers update of password_wo write-only. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
+										ForceNew:     true,
+										Description:  `The password write-only version.`,
 										RequiredWith: []string{"http_check.0.auth_info.0.password_wo"},
 									},
 								},
@@ -1091,24 +1093,24 @@ func flattenMonitoringUptimeCheckConfigHttpCheckAuthInfo(v interface{}, d *schem
 	transformed := make(map[string]interface{})
 	transformed["password"] =
 		flattenMonitoringUptimeCheckConfigHttpCheckAuthInfoPassword(original["password"], d, config)
-	transformed["username"] =
-		flattenMonitoringUptimeCheckConfigHttpCheckAuthInfoUsername(original["username"], d, config)
 	transformed["password_wo_version"] =
 		flattenMonitoringUptimeCheckConfigHttpCheckAuthInfoPasswordWoVersion(original["passwordWoVersion"], d, config)
+	transformed["username"] =
+		flattenMonitoringUptimeCheckConfigHttpCheckAuthInfoUsername(original["username"], d, config)
 	return []interface{}{transformed}
 }
 func flattenMonitoringUptimeCheckConfigHttpCheckAuthInfoPassword(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return d.Get("http_check.0.auth_info.0.password")
 }
 
-func flattenMonitoringUptimeCheckConfigHttpCheckAuthInfoUsername(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
-}
-
 func flattenMonitoringUptimeCheckConfigHttpCheckAuthInfoPasswordWoVersion(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return d.Get("http_check.0.auth_info.0.password_wo_version")
 }
 
+func flattenMonitoringUptimeCheckConfigHttpCheckAuthInfoUsername(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenMonitoringUptimeCheckConfigHttpCheckServiceAgentAuthentication(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return nil
@@ -1627,18 +1629,11 @@ func expandMonitoringUptimeCheckConfigHttpCheckAuthInfo(v interface{}, d tpgreso
 		transformed["password"] = transformedPassword
 	}
 
-	transformedUsername, err := expandMonitoringUptimeCheckConfigHttpCheckAuthInfoUsername(original["username"], d, config)
-	if err != nil {
-		return nil, err
-	} else if val := reflect.ValueOf(transformedUsername); val.IsValid() && !tpgresource.IsEmptyValue(val) {
-		transformed["username"] = transformedUsername
-	}
-
 	transformedPasswordWo, err := expandMonitoringUptimeCheckConfigHttpCheckAuthInfoPasswordWo(original["password_wo"], d, config)
 	if err != nil {
 		return nil, err
 	} else if val := reflect.ValueOf(transformedPasswordWo); val.IsValid() && !tpgresource.IsEmptyValue(val) {
-		transformed["password"] = transformedPasswordWo
+		transformed["passwordWo"] = transformedPasswordWo
 	}
 
 	transformedPasswordWoVersion, err := expandMonitoringUptimeCheckConfigHttpCheckAuthInfoPasswordWoVersion(original["password_wo_version"], d, config)
@@ -1648,22 +1643,29 @@ func expandMonitoringUptimeCheckConfigHttpCheckAuthInfo(v interface{}, d tpgreso
 		transformed["passwordWoVersion"] = transformedPasswordWoVersion
 	}
 
+	transformedUsername, err := expandMonitoringUptimeCheckConfigHttpCheckAuthInfoUsername(original["username"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedUsername); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["username"] = transformedUsername
+	}
+
 	return transformed, nil
 }
 
 func expandMonitoringUptimeCheckConfigHttpCheckAuthInfoPassword(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
 
-func expandMonitoringUptimeCheckConfigHttpCheckAuthInfoUsername(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+func expandMonitoringUptimeCheckConfigHttpCheckAuthInfoPasswordWo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
 
-func expandMonitoringUptimeCheckConfigHttpCheckAuthInfoPasswordWo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+func expandMonitoringUptimeCheckConfigHttpCheckAuthInfoPasswordWoVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
 
-func expandMonitoringUptimeCheckConfigHttpCheckAuthInfoPasswordWoVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+func expandMonitoringUptimeCheckConfigHttpCheckAuthInfoUsername(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
 

google/services/monitoring/resource_monitoring_uptime_check_config_generated_meta.yaml

@@ -15,9 +15,7 @@ fields:
   - field: 'http_check.accepted_response_status_codes.status_value'
   - field: 'http_check.auth_info.password'
   - field: 'http_check.auth_info.password_wo'
-    api_field: 'http_check.auth_info.password'
   - field: 'http_check.auth_info.password_wo_version'
-    provider_only: true
   - field: 'http_check.auth_info.username'
   - field: 'http_check.body'
   - field: 'http_check.content_type'

google/services/monitoring/resource_monitoring_uptime_check_config_generated_test.go

@@ -51,7 +51,7 @@ func TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpExample(t *testing.
 				ResourceName:            "google_monitoring_uptime_check_config.http",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo"},
+				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo_version"},
 			},
 		},
 	})
@@ -121,7 +121,7 @@ func TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpPasswordWoExample(t
 				ResourceName:            "google_monitoring_uptime_check_config.http",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo"},
+				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo_version"},
 			},
 		},
 	})
@@ -195,7 +195,7 @@ func TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigStatusCodeExample(t *te
 				ResourceName:            "google_monitoring_uptime_check_config.status_code",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo"},
+				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo_version"},
 			},
 		},
 	})
@@ -267,7 +267,7 @@ func TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpsExample(t *testing
 				ResourceName:            "google_monitoring_uptime_check_config.https",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo"},
+				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo_version"},
 			},
 		},
 	})
@@ -328,7 +328,7 @@ func TestAccMonitoringUptimeCheckConfig_uptimeCheckTcpExample(t *testing.T) {
 				ResourceName:            "google_monitoring_uptime_check_config.tcp_group",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo"},
+				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo_version"},
 			},
 		},
 	})
@@ -381,7 +381,7 @@ func TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigSyntheticMonitorExample
 				ResourceName:            "google_monitoring_uptime_check_config.synthetic_monitor",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo"},
+				ImportStateVerifyIgnore: []string{"http_check.0.auth_info.0.password_wo_version"},
 			},
 		},
 	})

google/services/secretmanager/resource_secret_manager_secret_version.go

@@ -90,27 +90,28 @@ func ResourceSecretManagerSecretVersion() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
-			"secret_data": {
-				Type:        schema.TypeString,
+			"secret_data_wo_version": {
+				Type:        schema.TypeInt,
 				Optional:    true,
 				ForceNew:    true,
-				Description: `The secret data. Must be no larger than 64KiB.`,
-				Sensitive:   true,
+				Description: `Triggers update of secret data write-only. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
+				Default:     0,
+			},
+			"secret_data": {
+				Type:          schema.TypeString,
+				Optional:      true,
+				ForceNew:      true,
+				Description:   `The secret data. Must be no larger than 64KiB.`,
+				Sensitive:     true,
+				ConflictsWith: []string{},
 			},
 			"secret_data_wo": {
 				Type:          schema.TypeString,
 				Optional:      true,
-				Description:   `The secret data. Must be no larger than 64KiB. Note: This property is write-only and will not be read from the API. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
+				Description:   `The secret data. Must be no larger than 64KiB. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
 				WriteOnly:     true,
 				ConflictsWith: []string{"secret_data"},
-				RequiredWith:  []string{"secret_data_wo_version"},
-			},
-			"secret_data_wo_version": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ForceNew:     true,
-				Description:  `Triggers update of secret_data_wo write-only. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)`,
-				RequiredWith: []string{"secret_data_wo"},
+				RequiredWith:  []string{},
 			},
 
 			"secret": {

google/services/secretmanager/resource_secret_manager_secret_version_generated_test.go

@@ -49,7 +49,7 @@ func TestAccSecretManagerSecretVersion_secretVersionBasicExample(t *testing.T) {
 				ResourceName:            "google_secret_manager_secret_version.secret-version-basic",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"secret", "secret_data_wo"},
+				ImportStateVerifyIgnore: []string{"secret"},
 			},
 		},
 	})
@@ -97,7 +97,7 @@ func TestAccSecretManagerSecretVersion_secretVersionBasicWriteOnlyExample(t *tes
 				ResourceName:            "google_secret_manager_secret_version.secret-version-basic-write-only",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"secret", "secret_data_wo"},
+				ImportStateVerifyIgnore: []string{"secret"},
 			},
 		},
 	})
@@ -145,7 +145,7 @@ func TestAccSecretManagerSecretVersion_secretVersionDeletionPolicyAbandonExample
 				ResourceName:            "google_secret_manager_secret_version.secret-version-deletion-policy",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"deletion_policy", "secret", "secret_data_wo"},
+				ImportStateVerifyIgnore: []string{"deletion_policy", "secret"},
 			},
 		},
 	})
@@ -193,7 +193,7 @@ func TestAccSecretManagerSecretVersion_secretVersionDeletionPolicyDisableExample
 				ResourceName:            "google_secret_manager_secret_version.secret-version-deletion-policy",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"deletion_policy", "secret", "secret_data_wo"},
+				ImportStateVerifyIgnore: []string{"deletion_policy", "secret"},
 			},
 		},
 	})
@@ -242,7 +242,7 @@ func TestAccSecretManagerSecretVersion_secretVersionWithBase64StringSecretDataEx
 				ResourceName:            "google_secret_manager_secret_version.secret-version-base64",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"is_secret_data_base64", "secret", "secret_data_wo"},
+				ImportStateVerifyIgnore: []string{"is_secret_data_base64", "secret"},
 			},
 		},
 	})
@@ -291,7 +291,7 @@ func TestAccSecretManagerSecretVersion_secretVersionWithBase64StringSecretDataWr
 				ResourceName:            "google_secret_manager_secret_version.secret-version-base64-write-only",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"is_secret_data_base64", "secret", "secret_data_wo"},
+				ImportStateVerifyIgnore: []string{"is_secret_data_base64", "secret"},
 			},
 		},
 	})

website/docs/r/bigquery_data_transfer_config.html.markdown

@@ -296,7 +296,6 @@ The following write-only attributes are supported:
 * `secret_access_key_wo` -
   (Optional)
   The Secret Access Key of the AWS account transferring data from.
-   Note: This property is write-only and will not be read from the API. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)
   **Note**: This property is write-only and will not be read from the API.
 
 ## Attributes Reference

website/docs/r/secret_manager_secret_version.html.markdown

@@ -234,7 +234,7 @@ The following arguments are supported:
 
 * `secret_data_wo_version` -
   (Optional)
-  Triggers update of secret_data_wo write-only. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)
+  Triggers update of secret data write-only. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)
 
 * `deletion_policy` - (Optional) The deletion policy for the secret version. Setting `ABANDON` allows the resource
 to be abandoned rather than deleted. Setting `DISABLE` allows the resource to be
@@ -252,15 +252,15 @@ The following write-only attributes are supported:
 
 * `secret_data_wo` -
   (Optional)
-  The secret data. Must be no larger than 64KiB. Note: This property is write-only and will not be read from the API. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)
+  The secret data. Must be no larger than 64KiB. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)
   **Note**: This property is write-only and will not be read from the API.
 
 
 <a name="nested_payload"></a>The `payload` block supports:
 
 * `secret_data_wo` -
   (Optional)
-  The secret data. Must be no larger than 64KiB. Note: This property is write-only and will not be read from the API. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)
+  The secret data. Must be no larger than 64KiB. For more info see [updating write-only attributes](/docs/providers/google/guides/using_write_only_attributes.html#updating-write-only-attributes)
   **Note**: This property is write-only and will not be read from the API.
 
 ## Attributes Reference