Merge pull request #10397 from hhamalai/securityhub_nil_on_error

bflad · web-flow · commit 56cfd579aac7 · 2019-10-10T00:47:53.000-04:00
Return nil and do not use resource data when resource does not exists
diff --git a/aws/resource_aws_securityhub_product_subscription.go b/aws/resource_aws_securityhub_product_subscription.go
@@ -73,6 +73,7 @@ func resourceAwsSecurityHubProductSubscriptionRead(d *schema.ResourceData, meta
 	if !exists {
 		log.Printf("[WARN] Security Hub product subscriptions (%s) not found, removing from state", d.Id())
 		d.SetId("")
+		return nil
 	}
 
 	d.Set("product_arn", productArn)

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ func resourceAwsSecurityHubProductSubscriptionRead(d *schema.ResourceData, meta`
`73`	`73`	`if !exists {`
`74`	`74`	`log.Printf("[WARN] Security Hub product subscriptions (%s) not found, removing from state", d.Id())`
`75`	`75`	`d.SetId("")`
	`76`	`+ return nil`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`d.Set("product_arn", productArn)`