Merge pull request #2 in VTMTF/terraform-provider-vtm-public from bugfix/VTMTF-91-terraform-import-fails-as-name-field-is-not-passed-to-obj-read to master

* commit 'ac4c69b1bcf2eb2126838d19167d1cf9a50ce57c':
  Fix for ISSUE_1 import failures

Author: Matthew Geldert

4.0.0/data_source_config_action.go

@@ -215,6 +215,10 @@ func dataSourceAction() *schema.Resource {
 
 func dataSourceActionRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetAction(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_action_program.go

@@ -35,6 +35,10 @@ func dataSourceActionProgram() *schema.Resource {
 
 func dataSourceActionProgramRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetActionProgram(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_aptimizer_profile.go

@@ -69,6 +69,10 @@ func dataSourceAptimizerProfile() *schema.Resource {
 
 func dataSourceAptimizerProfileRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetAptimizerProfile(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_aptimizer_scope.go

@@ -51,6 +51,10 @@ func dataSourceAptimizerScope() *schema.Resource {
 
 func dataSourceAptimizerScopeRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetAptimizerScope(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_bandwidth.go

@@ -52,6 +52,10 @@ func dataSourceBandwidth() *schema.Resource {
 
 func dataSourceBandwidthRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetBandwidth(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_bgpneighbor.go

@@ -86,6 +86,10 @@ func dataSourceBgpneighbor() *schema.Resource {
 
 func dataSourceBgpneighborRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetBgpneighbor(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_cloud_api_credential.go

@@ -82,6 +82,10 @@ func dataSourceCloudApiCredential() *schema.Resource {
 
 func dataSourceCloudApiCredentialRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetCloudApiCredential(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_custom.go

@@ -60,6 +60,10 @@ func dataSourceCustom() *schema.Resource {
 
 func dataSourceCustomRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetCustom(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_dns_server_zone.go

@@ -41,6 +41,10 @@ func dataSourceDnsServerZone() *schema.Resource {
 
 func dataSourceDnsServerZoneRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetDnsServerZone(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {

4.0.0/data_source_config_dns_server_zone_file.go

@@ -35,6 +35,10 @@ func dataSourceDnsServerZoneFile() *schema.Resource {
 
 func dataSourceDnsServerZoneFileRead(d *schema.ResourceData, tm interface{}) error {
 	objectName := d.Get("name").(string)
+	if objectName == "" {
+		objectName = d.Id()
+		d.Set("name", objectName)
+	}
 	object, err := tm.(*vtm.VirtualTrafficManager).GetDnsServerZoneFile(objectName)
 	if err != nil {
 		if err.ErrorId == "resource.not_found" {