diff --git a/.changelog/3030.txt b/.changelog/3030.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/.changelog/3034.txt b/.changelog/3034.txt new file mode 100644 index 0000000000..6ab0461785 --- /dev/null +++ b/.changelog/3034.txt @@ -0,0 +1,3 @@ +```release-note:bug +sql: undeprecated `settings.ip_configuration.authorized_networks.expiration_time` +``` diff --git a/google-beta/resource_sql_database_instance.go b/google-beta/resource_sql_database_instance.go index c9b719bce1..df4417a14c 100644 --- a/google-beta/resource_sql_database_instance.go +++ b/google-beta/resource_sql_database_instance.go @@ -21,9 +21,8 @@ const privateNetworkLinkRegex = "projects/(" + ProjectRegex + ")/global/networks var sqlDatabaseAuthorizedNetWorkSchemaElem *schema.Resource = &schema.Resource{ Schema: map[string]*schema.Schema{ "expiration_time": { - Type: schema.TypeString, - Optional: true, - Deprecated: "This property is only applicable to First Generation instances, and First Generation instances are now deprecated.", + Type: schema.TypeString, + Optional: true, }, "name": { Type: schema.TypeString, diff --git a/google-beta/resource_sql_database_instance_test.go b/google-beta/resource_sql_database_instance_test.go index 5b99680669..87c1f69cae 100644 --- a/google-beta/resource_sql_database_instance_test.go +++ b/google-beta/resource_sql_database_instance_test.go @@ -779,6 +779,7 @@ resource "google_sql_database_instance" "instance" { authorized_networks { value = "108.12.12.12" name = "misc" + expiration_time = "2037-11-15T16:19:00.094Z" } } @@ -941,6 +942,7 @@ resource "google_sql_database_instance" "instance" { authorized_networks { value = "108.12.12.12" name = "misc" + expiration_time = "2037-11-15T16:19:00.094Z" } } } diff --git a/website/docs/r/sql_database_instance.html.markdown b/website/docs/r/sql_database_instance.html.markdown index 9e5e802188..e3fdffb61a 100644 --- a/website/docs/r/sql_database_instance.html.markdown +++ b/website/docs/r/sql_database_instance.html.markdown @@ -27,7 +27,6 @@ the above documentation: * `tier` Remove any fields that are not applicable to Second-generation instances: * `settings.crash_safe_replication` -* `settings.ip_configuration.authorized_networks.expiration_time` * `settings.replication_type` * `settings.authorized_gae_applications` And change values to appropriate values for Second-generation instances for: