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_stream_input_eventhub - Mark shared_access_policy_key and shared_access_policy_name as optional #18959

Merged
merged 3 commits into from
Oct 26, 2022
Merged

azurerm_stream_analytics_stream_input_eventhub - Mark shared_access_policy_key and shared_access_policy_name as optional #18959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b927906
azurerm_stream_analytics_stream_input_eventhub - Mark shared_access_p…
neil-yechenwei Oct 25, 2022
9430dea
update code
neil-yechenwei Oct 26, 2022
b832b06
update code
neil-yechenwei Oct 26, 2022
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
30 changes: 21 additions & 9 deletions internal/services/streamanalytics/stream_analytics_stream_input_eventhub_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ func resourceStreamAnalyticsStreamInputEventHub() *pluginsdk.Resource {

"shared_access_policy_key": {
neil-yechenwei marked this conversation as resolved.
Show resolved Hide resolved
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 @@ -132,12 +132,18 @@ func resourceStreamAnalyticsStreamInputEventHubCreateUpdate(d *pluginsdk.Resourc
}

eventHubDataSourceProps := &streamanalytics.EventHubStreamInputDataSourceProperties{
EventHubName: utils.String(d.Get("eventhub_name").(string)),
ServiceBusNamespace: utils.String(d.Get("servicebus_namespace").(string)),
SharedAccessPolicyKey: utils.String(d.Get("shared_access_policy_key").(string)),
SharedAccessPolicyName: utils.String(d.Get("shared_access_policy_name").(string)),
ConsumerGroupName: utils.String(d.Get("eventhub_consumer_group_name").(string)),
AuthenticationMode: streamanalytics.AuthenticationMode(d.Get("authentication_mode").(string)),
EventHubName: utils.String(d.Get("eventhub_name").(string)),
ServiceBusNamespace: utils.String(d.Get("servicebus_namespace").(string)),
ConsumerGroupName: utils.String(d.Get("eventhub_consumer_group_name").(string)),
AuthenticationMode: streamanalytics.AuthenticationMode(d.Get("authentication_mode").(string)),
}

if v, ok := d.GetOk("shared_access_policy_key"); ok {
eventHubDataSourceProps.SharedAccessPolicyKey = utils.String(v.(string))
}

if v, ok := d.GetOk("shared_access_policy_name"); ok {
eventHubDataSourceProps.SharedAccessPolicyName = utils.String(v.(string))
}

props := streamanalytics.Input{
Expand Down Expand Up @@ -204,7 +210,6 @@ func resourceStreamAnalyticsStreamInputEventHubRead(d *pluginsdk.ResourceData, m

d.Set("eventhub_name", eventHub.EventHubName)
d.Set("servicebus_namespace", eventHub.ServiceBusNamespace)
d.Set("shared_access_policy_name", eventHub.SharedAccessPolicyName)
d.Set("authentication_mode", eventHub.AuthenticationMode)

consumerGroupName := ""
Expand All @@ -214,6 +219,13 @@ func resourceStreamAnalyticsStreamInputEventHubRead(d *pluginsdk.ResourceData, m

d.Set("eventhub_consumer_group_name", consumerGroupName)

sharedAccessPolicyName := ""
if eventHub.SharedAccessPolicyName != nil {
sharedAccessPolicyName = *eventHub.SharedAccessPolicyName
}

d.Set("shared_access_policy_name", sharedAccessPolicyName)

partitionKey := ""
if v.PartitionKey != nil {
partitionKey = *v.PartitionKey
Expand Down
40 changes: 38 additions & 2 deletions internal/services/streamanalytics/stream_analytics_stream_input_eventhub_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func TestAccStreamAnalyticsStreamInputEventHub_requiresImport(t *testing.T) {
})
}

func TestAccStreamAnalyticsInputEventhub_authenticationMode(t *testing.T) {
func TestAccStreamAnalyticsStreamInputEventHub_authenticationMode(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_stream_analytics_stream_input_eventhub", "test")
r := StreamAnalyticsStreamInputEventHubResource{}

Expand All @@ -142,6 +142,21 @@ func TestAccStreamAnalyticsInputEventhub_authenticationMode(t *testing.T) {
})
}

func TestAccStreamAnalyticsStreamInputEventHub_msiWithoutSharedAccessPolicy(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_stream_analytics_stream_input_eventhub", "test")
r := StreamAnalyticsStreamInputEventHubResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.msiWithoutSharedAccessPolicy(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep("shared_access_policy_key"),
})
}

func (r StreamAnalyticsStreamInputEventHubResource) Exists(ctx context.Context, client *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := parse.StreamInputID(state.ID)
if err != nil {
Expand Down Expand Up @@ -337,7 +352,7 @@ resource "azurerm_stream_analytics_stream_input_eventhub" "test" {
shared_access_policy_key = azurerm_eventhub_namespace.test.default_primary_key
shared_access_policy_name = "RootManagedSharedAccessKey"
partition_key = "partitionKey"
authentication_mode = "Msi"
authentication_mode = "ConnectionString"

serialization {
type = "Json"
Expand All @@ -347,6 +362,27 @@ resource "azurerm_stream_analytics_stream_input_eventhub" "test" {
`, template, data.RandomInteger)
}

func (r StreamAnalyticsStreamInputEventHubResource) msiWithoutSharedAccessPolicy(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

resource "azurerm_stream_analytics_stream_input_eventhub" "test" {
name = "acctestinput-%d"
stream_analytics_job_name = azurerm_stream_analytics_job.test.name
resource_group_name = azurerm_stream_analytics_job.test.resource_group_name
eventhub_consumer_group_name = azurerm_eventhub_consumer_group.test.name
eventhub_name = azurerm_eventhub.test.name
servicebus_namespace = azurerm_eventhub_namespace.test.name
authentication_mode = "Msi"

serialization {
type = "Json"
encoding = "UTF8"
}
}
`, r.template(data), data.RandomInteger)
}

func (r StreamAnalyticsStreamInputEventHubResource) template(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down
8 changes: 4 additions & 4 deletions website/docs/r/stream_analytics_stream_input_eventhub.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ 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_name` - (Required) The shared access policy name for the Event Hub, Service Bus Queue, Service Bus Topic, etc.

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

* `partition_key` - (Optional) The property the input Event Hub has been partitioned by.
Expand All @@ -89,6 +85,10 @@ The following arguments are supported:

* `eventhub_consumer_group_name` - (Optional) The name of an Event Hub Consumer Group that should be used to read events from the Event Hub. Specifying distinct consumer group names for multiple inputs allows each of those inputs to receive the same events from the Event Hub. If not set the input will use the Event Hub's default consumer group.

* `shared_access_policy_key` - (Optional) The shared access policy key for the specified shared access policy.

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

---

A `serialization` block supports the following:
Expand Down