Consistency check on data resources

OctopusDeployLabs · Sep 30, 2020 · 0a4765e · 0a4765e
1 parent 3aa484d
commit 0a4765e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/octopusdeploy/data_aws_account.go b/octopusdeploy/data_aws_account.go
@@ -1,6 +1,8 @@
 package octopusdeploy
 
 import (
+	"fmt"
+
 	"github.com/OctopusDeploy/go-octopusdeploy/client"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -55,10 +57,12 @@ func dataAwsAccountReadByName(d *schema.ResourceData, m interface{}) error {
 
 	apiClient := m.(*client.Client)
 	resource, err := apiClient.Accounts.GetByName(name)
+
 	if err != nil {
 		return createResourceOperationError(errorReadingAWSAccount, name, err)
 	}
 	if resource == nil {
+		fmt.Println("Nil resource")
 		return nil
 	}
 

diff --git a/octopusdeploy/data_azure_service_principal.go b/octopusdeploy/data_azure_service_principal.go
@@ -71,6 +71,7 @@ func dataAzureServicePrincipalReadByName(d *schema.ResourceData, m interface{})
 
 	apiClient := m.(*client.Client)
 	resource, err := apiClient.Accounts.GetByName(name)
+
 	if err != nil {
 		return createResourceOperationError(errorReadingAzureServicePrincipal, name, err)
 	}

diff --git a/octopusdeploy/data_environment.go b/octopusdeploy/data_environment.go
@@ -35,6 +35,7 @@ func dataEnvironmentReadByName(d *schema.ResourceData, m interface{}) error {
 
 	apiClient := m.(*client.Client)
 	resource, err := apiClient.Environments.GetByName(name)
+
 	if err != nil {
 		return createResourceOperationError(errorReadingEnvironment, name, err)
 	}
@@ -43,7 +44,7 @@ func dataEnvironmentReadByName(d *schema.ResourceData, m interface{}) error {
 	}
 
 	logResource(constEnvironment, m)
-	d.SetId(name)
+	d.Set(constName, name)
 
 	return nil
 }
diff --git a/octopusdeploy/data_machine.go b/octopusdeploy/data_machine.go
@@ -116,6 +116,7 @@ func dataMachineReadByName(d *schema.ResourceData, m interface{}) error {
 
 	apiClient := m.(*client.Client)
 	resource, err := apiClient.Machines.GetByName(name)
+
 	if err != nil {
 		return createResourceOperationError(errorReadingMachine, name, err)
 	}
@@ -124,7 +125,7 @@ func dataMachineReadByName(d *schema.ResourceData, m interface{}) error {
 	}
 
 	logResource(constMachine, m)
-	d.SetId(name)
+	d.Set(constName, name)
 
 	return nil
 }