Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_stream_analytics_output_servicebus_queue: Shared access policy name/key optional for MSI authentication #19712

Merged
merged 1 commit into from
Jan 26, 2023
Merged

azurerm_stream_analytics_output_servicebus_queue: Shared access policy name/key optional for MSI authentication #19712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions internal/services/streamanalytics/stream_analytics_output_servicebus_queue_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ func resourceStreamAnalyticsOutputServiceBusQueue() *pluginsdk.Resource {

"shared_access_policy_key": {
Type: pluginsdk.TypeString,
Required: true,
Optional: true,
Sensitive: true,
ValidateFunc: validation.StringIsNotEmpty,
},

"shared_access_policy_name": {
Type: pluginsdk.TypeString,
Required: true,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},

Expand Down Expand Up @@ -148,19 +148,26 @@ func resourceStreamAnalyticsOutputServiceBusQueueCreateUpdate(d *pluginsdk.Resou
}

systemPropertyColumns := d.Get("system_property_columns")

dataSourceProperties := &outputs.ServiceBusQueueOutputDataSourceProperties{
QueueName: utils.String(queueName),
ServiceBusNamespace: utils.String(serviceBusNamespace),
PropertyColumns: utils.ExpandStringSlice(d.Get("property_columns").([]interface{})),
SystemPropertyColumns: &systemPropertyColumns,
AuthenticationMode: utils.ToPtr(outputs.AuthenticationMode(d.Get("authentication_mode").(string))),
}

// Add shared access policy key/name only if required by authentication mode
if *dataSourceProperties.AuthenticationMode == outputs.AuthenticationModeConnectionString {
dataSourceProperties.SharedAccessPolicyName = utils.String(sharedAccessPolicyName)
dataSourceProperties.SharedAccessPolicyKey = utils.String(sharedAccessPolicyKey)
}

props := outputs.Output{
Name: utils.String(id.OutputName),
Properties: &outputs.OutputProperties{
Datasource: &outputs.ServiceBusQueueOutputDataSource{
Properties: &outputs.ServiceBusQueueOutputDataSourceProperties{
QueueName: utils.String(queueName),
ServiceBusNamespace: utils.String(serviceBusNamespace),
SharedAccessPolicyKey: utils.String(sharedAccessPolicyKey),
SharedAccessPolicyName: utils.String(sharedAccessPolicyName),
PropertyColumns: utils.ExpandStringSlice(d.Get("property_columns").([]interface{})),
SystemPropertyColumns: &systemPropertyColumns,
AuthenticationMode: utils.ToPtr(outputs.AuthenticationMode(d.Get("authentication_mode").(string))),
},
Properties: dataSourceProperties,
},
Serialization: serialization,
},
Expand Down
9 changes: 4 additions & 5 deletions internal/services/streamanalytics/stream_analytics_output_servicebus_queue_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ func TestAccStreamAnalyticsOutputServiceBusQueue_json(t *testing.T) {
})
}

func TestAccStreamAnalyticsOutputServiceBusQueue_authenticationMode(t *testing.T) {
func TestAccStreamAnalyticsOutputServiceBusQueue_authenticationModeMsi(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_stream_analytics_output_servicebus_queue", "test")
r := StreamAnalyticsOutputServiceBusQueueResource{}
identity := "identity { type = \"SystemAssigned\" }"

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.authenticationMode(data, identity),
Config: r.authenticationModeMsi(data, identity),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
Expand Down Expand Up @@ -434,7 +434,7 @@ resource "azurerm_stream_analytics_output_servicebus_queue" "import" {
`, template)
}

func (r StreamAnalyticsOutputServiceBusQueueResource) authenticationMode(data acceptance.TestData, identity string) string {
func (r StreamAnalyticsOutputServiceBusQueueResource) authenticationModeMsi(data acceptance.TestData, identity string) string {
template := r.template(data, identity)
return fmt.Sprintf(`
%s
Expand All @@ -445,8 +445,7 @@ resource "azurerm_stream_analytics_output_servicebus_queue" "test" {
resource_group_name = azurerm_stream_analytics_job.test.resource_group_name
queue_name = azurerm_servicebus_queue.test.name
servicebus_namespace = azurerm_servicebus_namespace.test.name
shared_access_policy_key = azurerm_servicebus_namespace.test.default_primary_key
shared_access_policy_name = "RootManageSharedAccessKey"
authentication_mode = "Msi"

serialization {
type = "Json"
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/stream_analytics_output_servicebus_queue.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ The following arguments are supported:

* `servicebus_namespace` - (Required) The namespace that is associated with the desired Event Hub, Service Bus Queue, Service Bus Topic, etc.

* `shared_access_policy_key` - (Required) The shared access policy key for the specified shared access policy.
* `shared_access_policy_key` - (Optional) The shared access policy key for the specified shared access policy. Required if `authentication_mode` is `ConnectionString`.

* `shared_access_policy_name` - (Required) The shared access policy name for the Event Hub, Service Bus Queue, Service Bus Topic, etc.
* `shared_access_policy_name` - (Optional) The shared access policy name for the Event Hub, Service Bus Queue, Service Bus Topic, etc. Required if `authentication_mode` is `ConnectionString`.

* `serialization` - (Required) A `serialization` block as defined below.

Expand Down