incapsula_origin_pop: avoid crashing when upgrading from version 2* to 3* without changing the resource format in the state file + Add deprecation message to already deprecated resources (old data_center resources) (#167)

Author: BrachaY

CHANGELOG.md

@@ -1,10 +1,15 @@
 ## 3.5.2 (Unreleased)
 
+IMPROVEMENTS:
+
+* Add deprecation message to already deprecated resources (old data_center resources)
+
 BUG FIXES:
 
 * incapsula_site: formatting parameters with %t fails if the values are strings, not bool ([#158](https://github.com/imperva/terraform-provider-incapsula/issues/158))
-* incapsula_site: add retries when configuring site after creating it - to allow the site creation to fully finish 
+* incapsula_site: add retries when configuring site after creating it - to allow the site creation to fully finish ([#165](https://github.com/imperva/terraform-provider-incapsula/issues/165))
 * incapsula_notification_center_policy: Fix redundant slash in path issue ([#162](https://github.com/imperva/terraform-provider-incapsula/issues/162))
+* incapsula_origin_pop: avoid crashing when upgrading from version 2* to 3* without changing the resource format in the state file
 
 ## 3.5.1 (Released)
 

incapsula/resource_data_center.go

@@ -12,10 +12,11 @@ import (
 
 func resourceDataCenter() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceDataCenterCreate,
-		Read:   resourceDataCenterRead,
-		Update: resourceDataCenterUpdate,
-		Delete: resourceDataCenterDelete,
+		DeprecationMessage: "This resource is deprecated. It will be removed in a future version. Please use resource incapsula_data_centers_configuration instead.",
+		Create:             resourceDataCenterCreate,
+		Read:               resourceDataCenterRead,
+		Update:             resourceDataCenterUpdate,
+		Delete:             resourceDataCenterDelete,
 		Importer: &schema.ResourceImporter{
 			State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 				idSlice := strings.Split(d.Id(), "/")

incapsula/resource_data_center_server.go

@@ -10,10 +10,11 @@ import (
 
 func resourceDataCenterServer() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceDataCenterServerCreate,
-		Read:   resourceDataCenterServerRead,
-		Update: resourceDataCenterServerUpdate,
-		Delete: resourceDataCenterServerDelete,
+		DeprecationMessage: "This resource is deprecated. It will be removed in a future version. Please use resource incapsula_data_centers_configuration instead.",
+		Create:             resourceDataCenterServerCreate,
+		Read:               resourceDataCenterServerRead,
+		Update:             resourceDataCenterServerUpdate,
+		Delete:             resourceDataCenterServerDelete,
 		Importer: &schema.ResourceImporter{
 			State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 				idSlice := strings.Split(d.Id(), "/")

incapsula/resource_origin_pop.go

@@ -10,10 +10,11 @@ import (
 
 func resourceOriginPOP() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceOriginPOPUpdate,
-		Read:   resourceOriginPOPRead,
-		Update: resourceOriginPOPUpdate,
-		Delete: resourceOriginPOPDelete,
+		DeprecationMessage: "This resource is deprecated. It will be removed in a future version. Please use resource incapsula_data_centers_configuration instead.",
+		Create:             resourceOriginPOPUpdate,
+		Read:               resourceOriginPOPRead,
+		Update:             resourceOriginPOPUpdate,
+		Delete:             resourceOriginPOPDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
@@ -74,6 +75,14 @@ func resourceOriginPOPUpdate(d *schema.ResourceData, m interface{}) error {
 func resourceOriginPOPRead(d *schema.ResourceData, m interface{}) error {
 	// Implement by reading the ListDataCentersResponse for the data centers
 	client := m.(*Client)
+	if !strings.Contains(d.Id(), "/") {
+		log.Printf("[ERROR] The origin_pop resource in your state file is in the old, unsupported format. /n" +
+			"We recommend to use the new resource of data_center_configuration which replaced this resource./n" +
+			"If you choose to continue using this resource, you must update the resource in your configuration files according to the new format. /n " +
+			"The old resource will now be removed from state file, and will be updated back on the next terraform plan.")
+		d.SetId("")
+		return nil
+	}
 	siteID := strings.Split(d.Id(), "/")[0]
 	dcID := strings.Split(d.Id(), "/")[1]