[opensearch] Fix deprecation methods.

phillbaker · phillbaker · commit 420462a96e72 · 2022-03-08T20:30:55.000-05:00
Closes #258
diff --git a/es/data_source_elasticsearch_opendistro_destination.go b/es/data_source_elasticsearch_opendistro_destination.go
@@ -31,7 +31,7 @@ var datasourceOpenDistroDestinationSchema = map[string]*schema.Schema{
 
 func dataSourceOpenSearchDestination() *schema.Resource {
 	return &schema.Resource{
-		Description: "`opensearch_destination` can be used to retrieve the destination object by name.",
+		Description: "`elasticsearch_opensearch_destination` can be used to retrieve the destination object by name.",
 		Read:        dataSourceElasticsearchOpenDistroDestinationRead,
 		Schema:      datasourceOpenDistroDestinationSchema,
 	}
@@ -42,7 +42,7 @@ func dataSourceElasticsearchOpenDistroDestination() *schema.Resource {
 		Description:        "`elasticsearch_opendistro_destination` can be used to retrieve the destination object by name.",
 		Read:               dataSourceElasticsearchOpenDistroDestinationRead,
 		Schema:             datasourceOpenDistroDestinationSchema,
-		DeprecationMessage: "elasticsearch_opendistro_destination is deprecated, please use opensearch_destination data source instead.",
+		DeprecationMessage: "elasticsearch_opendistro_destination is deprecated, please use elasticsearch_opensearch_destination data source instead.",
 	}
 }
 
diff --git a/es/provider.go b/es/provider.go
@@ -252,7 +252,7 @@ func Provider() *schema.Provider {
 		DataSourcesMap: map[string]*schema.Resource{
 			"elasticsearch_host":                   dataSourceElasticsearchHost(),
 			"elasticsearch_opendistro_destination": dataSourceElasticsearchOpenDistroDestination(),
-			"opensearch_destination":               dataSourceOpenSearchDestination(),
+			"elasticsearch_opensearch_destination": dataSourceOpenSearchDestination(),
 		},
 
 		ConfigureContextFunc: providerConfigure,
diff --git a/es/resource_elasticsearch_opendistro_destination.go b/es/resource_elasticsearch_opendistro_destination.go
@@ -58,7 +58,7 @@ func resourceElasticsearchOpenDistroDestination() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		DeprecationMessage: "elasticsearch_opendistro_destination is deprecated, please use opensearch_destination resource instead.",
+		DeprecationMessage: "elasticsearch_opendistro_destination is deprecated, please use elasticsearch_opensearch_destination resource instead.",
 	}
 }
 
diff --git a/es/resource_elasticsearch_opendistro_ism_policy.go b/es/resource_elasticsearch_opendistro_ism_policy.go
@@ -69,7 +69,7 @@ func resourceElasticsearchOpenDistroISMPolicy() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		DeprecationMessage: "elasticsearch_opendistro_ism_policy is deprecated, please use opensearch_ism_policy resource instead.",
+		DeprecationMessage: "elasticsearch_opendistro_ism_policy is deprecated, please use elasticsearch_opensearch_ism_policy resource instead.",
 	}
 }
 
diff --git a/es/resource_elasticsearch_opendistro_ism_policy_mapping.go b/es/resource_elasticsearch_opendistro_ism_policy_mapping.go
@@ -67,7 +67,7 @@ func resourceOpenSearchISMPolicyMapping() *schema.Resource {
 			Create: schema.DefaultTimeout(5 * time.Minute),
 			Update: schema.DefaultTimeout(5 * time.Minute),
 		},
-		DeprecationMessage: "opensearch_ism_policy_mapping is deprecated in Opensearch 1.x please use ism_template attribute in policies instead.",
+		DeprecationMessage: "elasticsearch_opensearch_ism_policy_mapping is deprecated in Opensearch 1.x please use ism_template attribute in policies instead.",
 	}
 }
 
diff --git a/es/resource_elasticsearch_opendistro_kibana_tenant.go b/es/resource_elasticsearch_opendistro_kibana_tenant.go
@@ -56,7 +56,7 @@ func resourceElasticsearchOpenDistroKibanaTenant() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		DeprecationMessage: "elasticsearch_opendistro_kibana_tentant is deprecated, please use opensearch_kibana_tenant resource instead.",
+		DeprecationMessage: "elasticsearch_opendistro_kibana_tentant is deprecated, please use elasticsearch_opensearch_kibana_tenant resource instead.",
 	}
 }
 
diff --git a/es/resource_elasticsearch_opendistro_monitor.go b/es/resource_elasticsearch_opendistro_monitor.go
@@ -52,7 +52,7 @@ func resourceElasticsearchOpenDistroMonitor() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		DeprecationMessage: "elasticsearch_opendistro_monitor is deprecated, please use opensearch_monitor resource instead.",
+		DeprecationMessage: "elasticsearch_opendistro_monitor is deprecated, please use elasticsearch_opensearch_monitor resource instead.",
 	}
 }
 
diff --git a/es/resource_elasticsearch_opendistro_role.go b/es/resource_elasticsearch_opendistro_role.go
@@ -125,7 +125,7 @@ func resourceElasticsearchOpenDistroRole() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		DeprecationMessage: "elasticsearch_opendistro_role is deprecated, please use opensearch_role resource instead.",
+		DeprecationMessage: "elasticsearch_opendistro_role is deprecated, please use elasticsearch_opensearch_role resource instead.",
 	}
 }
 
diff --git a/es/resource_elasticsearch_opendistro_roles_mapping.go b/es/resource_elasticsearch_opendistro_roles_mapping.go
@@ -70,7 +70,7 @@ func resourceElasticsearchOpenDistroRolesMapping() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		DeprecationMessage: "elasticsearch_opendistro_roles_mapping is deprecated, please use opensearch_roles_mapping resource instead.",
+		DeprecationMessage: "elasticsearch_opendistro_roles_mapping is deprecated, please use elasticsearch_opensearch_roles_mapping resource instead.",
 	}
 }
 
diff --git a/es/resource_elasticsearch_opendistro_user.go b/es/resource_elasticsearch_opendistro_user.go
@@ -73,7 +73,7 @@ func resourceElasticsearchOpenDistroUser() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
-		DeprecationMessage: "elasticsearch_opendistro_user is deprecated, please use opensearch_user resource instead.",
+		DeprecationMessage: "elasticsearch_opendistro_user is deprecated, please use elasticsearch_opensearch_user resource instead.",
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ var datasourceOpenDistroDestinationSchema = map[string]*schema.Schema{`
`31`	`31`
`32`	`32`	`func dataSourceOpenSearchDestination() *schema.Resource {`
`33`	`33`	`return &schema.Resource{`
`34`		- Description: "`opensearch_destination` can be used to retrieve the destination object by name.",
	`34`	+ Description: "`elasticsearch_opensearch_destination` can be used to retrieve the destination object by name.",
`35`	`35`	`Read: dataSourceElasticsearchOpenDistroDestinationRead,`
`36`	`36`	`Schema: datasourceOpenDistroDestinationSchema,`
`37`	`37`	`}`
`@@ -42,7 +42,7 @@ func dataSourceElasticsearchOpenDistroDestination() *schema.Resource {`
`42`	`42`	Description: "`elasticsearch_opendistro_destination` can be used to retrieve the destination object by name.",
`43`	`43`	`Read: dataSourceElasticsearchOpenDistroDestinationRead,`
`44`	`44`	`Schema: datasourceOpenDistroDestinationSchema,`
`45`		`- DeprecationMessage: "elasticsearch_opendistro_destination is deprecated, please use opensearch_destination data source instead.",`
	`45`	`+ DeprecationMessage: "elasticsearch_opendistro_destination is deprecated, please use elasticsearch_opensearch_destination data source instead.",`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func resourceElasticsearchOpenDistroDestination() *schema.Resource {`
`58`	`58`	`Importer: &schema.ResourceImporter{`
`59`	`59`	`StateContext: schema.ImportStatePassthroughContext,`
`60`	`60`	`},`
`61`		`- DeprecationMessage: "elasticsearch_opendistro_destination is deprecated, please use opensearch_destination resource instead.",`
	`61`	`+ DeprecationMessage: "elasticsearch_opendistro_destination is deprecated, please use elasticsearch_opensearch_destination resource instead.",`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func resourceElasticsearchOpenDistroISMPolicy() *schema.Resource {`
`69`	`69`	`Importer: &schema.ResourceImporter{`
`70`	`70`	`StateContext: schema.ImportStatePassthroughContext,`
`71`	`71`	`},`
`72`		`- DeprecationMessage: "elasticsearch_opendistro_ism_policy is deprecated, please use opensearch_ism_policy resource instead.",`
	`72`	`+ DeprecationMessage: "elasticsearch_opendistro_ism_policy is deprecated, please use elasticsearch_opensearch_ism_policy resource instead.",`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func resourceOpenSearchISMPolicyMapping() *schema.Resource {`
`67`	`67`	`Create: schema.DefaultTimeout(5 * time.Minute),`
`68`	`68`	`Update: schema.DefaultTimeout(5 * time.Minute),`
`69`	`69`	`},`
`70`		`- DeprecationMessage: "opensearch_ism_policy_mapping is deprecated in Opensearch 1.x please use ism_template attribute in policies instead.",`
	`70`	`+ DeprecationMessage: "elasticsearch_opensearch_ism_policy_mapping is deprecated in Opensearch 1.x please use ism_template attribute in policies instead.",`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func resourceElasticsearchOpenDistroKibanaTenant() *schema.Resource {`
`56`	`56`	`Importer: &schema.ResourceImporter{`
`57`	`57`	`StateContext: schema.ImportStatePassthroughContext,`
`58`	`58`	`},`
`59`		`- DeprecationMessage: "elasticsearch_opendistro_kibana_tentant is deprecated, please use opensearch_kibana_tenant resource instead.",`
	`59`	`+ DeprecationMessage: "elasticsearch_opendistro_kibana_tentant is deprecated, please use elasticsearch_opensearch_kibana_tenant resource instead.",`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func resourceElasticsearchOpenDistroMonitor() *schema.Resource {`
`52`	`52`	`Importer: &schema.ResourceImporter{`
`53`	`53`	`StateContext: schema.ImportStatePassthroughContext,`
`54`	`54`	`},`
`55`		`- DeprecationMessage: "elasticsearch_opendistro_monitor is deprecated, please use opensearch_monitor resource instead.",`
	`55`	`+ DeprecationMessage: "elasticsearch_opendistro_monitor is deprecated, please use elasticsearch_opensearch_monitor resource instead.",`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func resourceElasticsearchOpenDistroRole() *schema.Resource {`
`125`	`125`	`Importer: &schema.ResourceImporter{`
`126`	`126`	`StateContext: schema.ImportStatePassthroughContext,`
`127`	`127`	`},`
`128`		`- DeprecationMessage: "elasticsearch_opendistro_role is deprecated, please use opensearch_role resource instead.",`
	`128`	`+ DeprecationMessage: "elasticsearch_opendistro_role is deprecated, please use elasticsearch_opensearch_role resource instead.",`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func resourceElasticsearchOpenDistroRolesMapping() *schema.Resource {`
`70`	`70`	`Importer: &schema.ResourceImporter{`
`71`	`71`	`StateContext: schema.ImportStatePassthroughContext,`
`72`	`72`	`},`
`73`		`- DeprecationMessage: "elasticsearch_opendistro_roles_mapping is deprecated, please use opensearch_roles_mapping resource instead.",`
	`73`	`+ DeprecationMessage: "elasticsearch_opendistro_roles_mapping is deprecated, please use elasticsearch_opensearch_roles_mapping resource instead.",`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func resourceElasticsearchOpenDistroUser() *schema.Resource {`
`73`	`73`	`Importer: &schema.ResourceImporter{`
`74`	`74`	`StateContext: schema.ImportStatePassthroughContext,`
`75`	`75`	`},`
`76`		`- DeprecationMessage: "elasticsearch_opendistro_user is deprecated, please use opensearch_user resource instead.",`
	`76`	`+ DeprecationMessage: "elasticsearch_opendistro_user is deprecated, please use elasticsearch_opensearch_user resource instead.",`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`