updated expiration_time in tests to use year < 2038, undeprecated it (#…

…3034) (#1691) Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jan 29, 2020 · 6c50cbb · 6c50cbb
1 parent 7efce11
commit 6c50cbb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.changelog/3030.txt b/.changelog/3030.txt
diff --git a/.changelog/3034.txt 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
@@ -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
@@ -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
@@ -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: