Fixed spacing

OctopusDeployLabs · Sep 28, 2020 · 9a68327 · 9a68327
1 parent 62cdac3
commit 9a68327
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 25 deletions.
diff --git a/octopusdeploy/data_account.go b/octopusdeploy/data_account.go
@@ -8,7 +8,6 @@ import (
 func dataAccount() *schema.Resource {
 	return &schema.Resource{
 		Read: dataAccountReadByName,
-
 		Schema: map[string]*schema.Schema{
 			constName: {
 				Type:     schema.TypeString,
@@ -27,7 +26,6 @@ func dataAccountReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingAccount, name, err)
 	}
 	if resource == nil {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_aws_account.go b/octopusdeploy/data_aws_account.go
@@ -59,7 +59,6 @@ func dataAwsAccountReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingAWSAccount, name, err)
 	}
 	if resource == nil {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_azure_service_principal.go b/octopusdeploy/data_azure_service_principal.go
@@ -75,7 +75,6 @@ func dataAzureServicePrincipalReadByName(d *schema.ResourceData, m interface{})
 		return createResourceOperationError(errorReadingAzureServicePrincipal, name, err)
 	}
 	if resource == nil {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_certificate.go b/octopusdeploy/data_certificate.go
@@ -63,7 +63,6 @@ func dataCertificateReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingCertificate, name, err)
 	}
 	if len(resourceList) == 0 {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_channel.go b/octopusdeploy/data_channel.go
@@ -64,7 +64,6 @@ func dataChannelReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingChannel, name, err)
 	}
 	if len(resourceList) == 0 {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_environment.go b/octopusdeploy/data_environment.go
@@ -39,7 +39,6 @@ func dataEnvironmentReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingEnvironment, name, err)
 	}
 	if resource == nil {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_feed.go b/octopusdeploy/data_feed.go
@@ -27,7 +27,6 @@ func dataFeedReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingFeed, name, err)
 	}
 	if len(resourceList) == 0 {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_library_variable_set.go b/octopusdeploy/data_library_variable_set.go
@@ -27,7 +27,6 @@ func dataLibraryVariableSetReadByName(d *schema.ResourceData, m interface{}) err
 		return createResourceOperationError(errorReadingLibraryVariableSet, name, err)
 	}
 	if len(resourceList) == 0 {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_lifecycle.go b/octopusdeploy/data_lifecycle.go
@@ -31,7 +31,6 @@ func dataLifecycleReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingLifecycle, name, err)
 	}
 	if len(resourceList) == 0 {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_machine.go b/octopusdeploy/data_machine.go
@@ -120,7 +120,6 @@ func dataMachineReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingMachine, name, err)
 	}
 	if resource == nil {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_machinepolicy.go b/octopusdeploy/data_machinepolicy.go
@@ -35,7 +35,6 @@ func dataMachinePolicyReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingMachinePolicy, name, err)
 	}
 	if len(resourceList) == 0 {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_nuget.go b/octopusdeploy/data_nuget.go
@@ -55,7 +55,6 @@ func dataNugetReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingNuGetFeed, name, err)
 	}
 	if len(resourceList) == 0 {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_project.go b/octopusdeploy/data_project.go
@@ -47,7 +47,6 @@ func dataProjectReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingProject, name, err)
 	}
 	if resource == nil {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/data_tag_set.go b/octopusdeploy/data_tag_set.go
@@ -28,7 +28,6 @@ func dataTagSetReadByName(d *schema.ResourceData, m interface{}) error {
 		return createResourceOperationError(errorReadingTagSet, name, err)
 	}
 	if resource == nil {
-		// d.SetId(constEmptyString)
 		return nil
 	}
 

diff --git a/octopusdeploy/deployment_process.go b/octopusdeploy/deployment_process.go
@@ -108,11 +108,7 @@ func resourceDeploymentProcessUpdate(d *schema.ResourceData, m interface{}) erro
 		return createResourceOperationError(errorUpdatingDeploymentProcess, d.Id(), err)
 	}
 
-	if isEmpty(resource.ID) {
-		log.Println("ID is nil")
-	} else {
-		d.SetId(resource.ID)
-	}
+	d.SetId(resource.ID)
 
 	return nil
 }

diff --git a/octopusdeploy/deployment_step.go b/octopusdeploy/deployment_step.go
@@ -69,12 +69,12 @@ func getDeploymentStepSchema() *schema.Schema {
 					Description: "The maximum number of targets to deploy to simultaneously",
 					Optional:    true,
 				},
-				constAction:                          getDeploymentActionSchema(),
-				constManualInterventionAction:      getManualInterventionActionSchema(),
-				constApplyTerraformAction:          getApplyTerraformActionSchema(),
-				constDeployPackageAction:           getDeployPackageAction(),
+				constAction:                       getDeploymentActionSchema(),
+				constManualInterventionAction:     getManualInterventionActionSchema(),
+				constApplyTerraformAction:         getApplyTerraformActionSchema(),
+				constDeployPackageAction:          getDeployPackageAction(),
 				constDeployWindowsServiceAction:   getDeployWindowsServiceActionSchema(),
-				constRunScriptAction:               getRunScriptActionSchema(),
+				constRunScriptAction:              getRunScriptActionSchema(),
 				constRunKubectlScriptAction:       getRunRunKubectlScriptSchema(),
 				constDeployKubernetesSecretAction: getDeployKubernetesSecretActionSchema(),
 			},