Type updates

OctopusDeployLabs · Sep 23, 2020 · 4f174b1 · 4f174b1
1 parent 6f7c406
commit 4f174b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/octopusdeploy/deploy_package.go b/octopusdeploy/deploy_package.go
@@ -22,6 +22,7 @@ func getDeployPackageAction() *schema.Schema {
 }
 
 func buildDeployPackageActionResource(tfAction map[string]interface{}) model.DeploymentAction {
+
 	action := buildDeploymentActionResource(tfAction)
 	action.ActionType = "Octopus.TentaclePackage"
 	addWindowsServiceFeatureToActionResource(tfAction, action)

diff --git a/octopusdeploy/resource_aws_account.go b/octopusdeploy/resource_aws_account.go
@@ -108,11 +108,11 @@ func buildAmazonWebServicesAccountResource(d *schema.ResourceData) (*model.Accou
 
 func resourceAmazonWebServicesAccountCreate(d *schema.ResourceData, m interface{}) error {
 	if d == nil {
-		return createInvalidParameterError("resourceAzureServicePrincipalRead", "d")
+		return createInvalidParameterError("resourceAmazonWebServicesAccountCreate", "d")
 	}
 
 	if m == nil {
-		return createInvalidParameterError("resourceAzureServicePrincipalRead", "m")
+		return createInvalidParameterError("resourceAmazonWebServicesAccountCreate", "m")
 	}
 
 	apiClient := m.(*client.Client)
@@ -135,15 +135,11 @@ func resourceAmazonWebServicesAccountCreate(d *schema.ResourceData, m interface{
 
 func resourceAmazonWebServicesAccountUpdate(d *schema.ResourceData, m interface{}) error {
 	if d == nil {
-		return createInvalidParameterError("resourceAzureServicePrincipalRead", "d")
+		return createInvalidParameterError("resourceAmazonWebServicesAccountUpdate", "d")
 	}
 
 	if m == nil {
-		return createInvalidParameterError("resourceAzureServicePrincipalRead", "m")
-	}
-
-	if d == nil {
-		return createInvalidParameterError("resourceAmazonWebServicesAccountUpdate", "d")
+		return createInvalidParameterError("resourceAmazonWebServicesAccountUpdate", "m")
 	}
 
 	account, err := buildAmazonWebServicesAccountResource(d)

diff --git a/octopusdeploy/resource_certificate.go b/octopusdeploy/resource_certificate.go
@@ -26,7 +26,7 @@ func resourceCertificate() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"certificate_data": {
+			CertificateData: {
 				Type:      schema.TypeString,
 				Required:  true,
 				Sensitive: true,
@@ -68,7 +68,7 @@ func resourceCertificateRead(d *schema.ResourceData, m interface{}) error {
 	certificateID := d.Id()
 	certificate, err := apiClient.Certificates.Get(certificateID)
 
-	if err == client.ErrItemNotFound {
+	if certificate == nil {
 		d.SetId("")
 		return nil
 	}