export url

internal/services/storage/storage_queue_data_source.go

@@ -41,6 +41,11 @@ func dataSourceStorageQueue() *pluginsdk.Resource {
 			},
 
 			"metadata": MetaDataComputedSchema(),
+
+			"url": {
+				Type:     pluginsdk.TypeString,
+				Computed: true,
+			},
 		},
 	}
 
@@ -126,6 +131,7 @@ func dataSourceStorageQueueRead(d *pluginsdk.ResourceData, meta interface{}) err
 
 			resourceManagerId := parse.NewStorageQueueResourceManagerID(account.StorageAccountId.SubscriptionId, account.StorageAccountId.ResourceGroupName, account.StorageAccountId.StorageAccountName, "default", queueName)
 			d.Set("resource_manager_id", resourceManagerId.ID())
+			d.Set("url", id.ID())
 
 			return nil
 		}
@@ -155,6 +161,22 @@ func dataSourceStorageQueueRead(d *pluginsdk.ResourceData, meta interface{}) err
 		}
 	}
 
+	account, err := meta.(*clients.Client).Storage.GetAccount(ctx, commonids.NewStorageAccountID(id.SubscriptionId, id.ResourceGroupName, id.StorageAccountName))
+	if err != nil {
+		return fmt.Errorf("retrieving Account for Queue %q: %v", id, err)
+	}
+	// Determine the queue endpoint, so we can build a data plane ID
+	endpoint, err := account.DataPlaneEndpoint(client.EndpointTypeQueue)
+	if err != nil {
+		return fmt.Errorf("determining Queue endpoint: %v", err)
+	}
+	// Parse the queue endpoint as a data plane account ID
+	accountDpId, err := accounts.ParseAccountID(*endpoint, meta.(*clients.Client).Storage.StorageDomainSuffix)
+	if err != nil {
+		return fmt.Errorf("parsing Account ID: %v", err)
+	}
+	d.Set("url", queues.NewQueueID(*accountDpId, id.QueueName).ID())
+
 	if !features.FivePointOh() {
 		d.Set("resource_manager_id", id.ID())
 	}

internal/services/storage/storage_queue_data_source_test.go

@@ -24,6 +24,7 @@ func TestAccDataSourceStorageQueue_basic(t *testing.T) {
 				check.That(data.ResourceName).Key("metadata.%").HasValue("2"),
 				check.That(data.ResourceName).Key("metadata.k1").HasValue("v1"),
 				check.That(data.ResourceName).Key("metadata.k2").HasValue("v2"),
+				check.That(data.ResourceName).Key("url").HasValue(fmt.Sprintf("https://acctestsadsc%[1]s.queue.core.windows.net/queuedstest-%[1]s", data.RandomString)),
 			),
 		},
 	})
@@ -43,6 +44,7 @@ func TestAccDataSourceStorageQueue_basicDeprecated(t *testing.T) {
 				check.That(data.ResourceName).Key("metadata.%").HasValue("2"),
 				check.That(data.ResourceName).Key("metadata.k1").HasValue("v1"),
 				check.That(data.ResourceName).Key("metadata.k2").HasValue("v2"),
+				check.That(data.ResourceName).Key("url").HasValue(fmt.Sprintf("https://acctestsadsc%[1]s.queue.core.windows.net/queuedstest-%[1]s", data.RandomString)),
 			),
 		},
 	})

internal/services/storage/storage_queue_resource.go

@@ -76,6 +76,11 @@ func resourceStorageQueue() *pluginsdk.Resource {
 			},
 
 			"metadata": MetaDataSchema(),
+
+			"url": {
+				Type:     pluginsdk.TypeString,
+				Computed: true,
+			},
 		},
 	}
 
@@ -314,6 +319,7 @@ func resourceStorageQueueRead(d *pluginsdk.ResourceData, meta interface{}) error
 
 		resourceManagerId := parse.NewStorageQueueResourceManagerID(account.StorageAccountId.SubscriptionId, account.StorageAccountId.ResourceGroupName, id.AccountId.AccountName, "default", id.QueueName)
 		d.Set("resource_manager_id", resourceManagerId.ID())
+		d.Set("url", id.ID())
 
 		return nil
 	}
@@ -346,6 +352,22 @@ func resourceStorageQueueRead(d *pluginsdk.ResourceData, meta interface{}) error
 		}
 	}
 
+	account, err := meta.(*clients.Client).Storage.GetAccount(ctx, commonids.NewStorageAccountID(id.SubscriptionId, id.ResourceGroupName, id.StorageAccountName))
+	if err != nil {
+		return fmt.Errorf("retrieving Account for Queue %q: %v", id, err)
+	}
+	// Determine the queue endpoint, so we can build a data plane ID
+	endpoint, err := account.DataPlaneEndpoint(client.EndpointTypeQueue)
+	if err != nil {
+		return fmt.Errorf("determining Queue endpoint: %v", err)
+	}
+	// Parse the queue endpoint as a data plane account ID
+	accountDpId, err := accounts.ParseAccountID(*endpoint, meta.(*clients.Client).Storage.StorageDomainSuffix)
+	if err != nil {
+		return fmt.Errorf("parsing Account ID: %v", err)
+	}
+	d.Set("url", queues.NewQueueID(*accountDpId, id.QueueName).ID())
+
 	if !features.FivePointOh() {
 		d.Set("resource_manager_id", id.ID())
 	}

internal/services/storage/storage_queue_resource_test.go

@@ -31,6 +31,7 @@ func TestAccStorageQueue_basic(t *testing.T) {
 			Config: r.basic(data),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("url").HasValue(fmt.Sprintf("https://acctestacc%s.queue.core.windows.net/mysamplequeue-%d", data.RandomString, data.RandomInteger)),
 			),
 		},
 		data.ImportStep(),
@@ -50,6 +51,7 @@ func TestAccStorageQueue_basicDeprecated(t *testing.T) {
 			Config: r.basicDeprecated(data),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("url").HasValue(fmt.Sprintf("https://acctestacc%s.queue.core.windows.net/mysamplequeue-%d", data.RandomString, data.RandomInteger)),
 			),
 		},
 		data.ImportStep(),

website/docs/d/storage_queue.html.markdown

@@ -37,6 +37,8 @@ The following arguments are supported:
 
 * `resource_manager_id` - The Resource Manager ID of this Storage Queue.
 
+* `url` - The data plane URL of the Storage Queue in the format of `<storage queue endpoint>/<queue name>`. E.g. `https://example.queue.core.windows.net/queue1`.
+
 ## Timeouts
 
 The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions:

website/docs/r/storage_queue.html.markdown

@@ -54,6 +54,8 @@ In addition to the Arguments listed above - the following Attributes are exporte
 
 * `resource_manager_id` - The Resource Manager ID of this Storage Queue.
 
+* `url` - The data plane URL of the Storage Queue in the format of `<storage queue endpoint>/<queue name>`. E.g. `https://example.queue.core.windows.net/queue1`.
+
 ## Timeouts
 
 The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions: