fixup! Add status to azurerm_servicebus_subscription resource

hashicorp · Jul 23, 2020 · 87b1115 · 87b1115
1 parent e3a3b45
commit 87b1115
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 100 deletions.
diff --git a/azurerm/internal/services/servicebus/helper/entity_status.go b/azurerm/internal/services/servicebus/helper/entity_status.go
diff --git a/azurerm/internal/services/servicebus/helper/entity_status_test.go b/azurerm/internal/services/servicebus/helper/entity_status_test.go
diff --git a/azurerm/internal/services/servicebus/resource_arm_servicebus_subscription.go b/azurerm/internal/services/servicebus/resource_arm_servicebus_subscription.go
@@ -12,7 +12,6 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/servicebus/helper"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/servicebus/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
@@ -158,7 +157,7 @@ func resourceArmServiceBusSubscriptionCreateUpdate(d *schema.ResourceData, meta
 			EnableBatchedOperations:          &enableBatchedOps,
 			MaxDeliveryCount:                 &maxDeliveryCount,
 			RequiresSession:                  &requiresSession,
-			Status:                           helper.ExpandEntityStatus(d.Get("status")),
+			Status:                           servicebus.EntityStatus(d.Get("status").(string)),
 		},
 	}
 
@@ -236,7 +235,7 @@ func resourceArmServiceBusSubscriptionRead(d *schema.ResourceData, meta interfac
 		d.Set("requires_session", props.RequiresSession)
 		d.Set("forward_to", props.ForwardTo)
 		d.Set("forward_dead_lettered_messages_to", props.ForwardDeadLetteredMessagesTo)
-		d.Set("status", helper.FlattenEntityStatus(props.Status))
+		d.Set("status", utils.String(string(props.Status)))
 
 		if count := props.MaxDeliveryCount; count != nil {
 			d.Set("max_delivery_count", int(*count))