`azurerm_bot_channel_email` - support for `magic_code` #23129

neil-yechenwei · 2023-08-30T09:19:09Z

fixes #20982

--- PASS: TestAccBotChannelsRegistration/channel/emailMagicCode (70.20s)

tombuildsstuff · 2023-09-01T13:18:08Z

internal/services/bot/bot_channel_email_resource.go

+
+	if v, ok := d.GetOk("magic_code"); ok {
+		channel, _ := channel.Properties.AsEmailChannel()
+		channel.Properties.AuthMethod = utils.Float(1)


this indicates a Swagger/API issue since these should be exposed as Constant values and not an integer - can we raise a Swagger issue for that

@tombuildsstuff , I assume it's by design since they added the meaning/description of the value. "0" means "Password" by default. "1" means "OAuth". See more details from rest api spec. Does it make sense?

Service team confirmed that it's by design to them.

Updated PR for this concern.

neil-yechenwei · 2023-09-04T05:10:52Z

@tombuildsstuff , thanks for the comment and I replied. Please take another look. Thanks.

neil-yechenwei · 2023-09-15T01:50:56Z

@stephybun , may I ask why this PR is added "upstream-pandora"?

stephybun · 2023-09-15T05:54:10Z

@neil-yechenwei the values for Auth method aren't being surfaced correctly as constants in Pandora.

neil-yechenwei · 2023-10-12T05:09:47Z

@stephybun & @tombuildsstuff , is it possible to merge this PR first to unblock users since AuthMethod isn't exposed to users?

katbyte · 2023-11-07T02:32:28Z

"0" means "Password" by default. "1" means "OAuth".

this should still be 2 constants defined in swagger? so can you please open a rest API specs issue and add a comment with it inline explaining what 1 and 0 means and why it should be fixed so we can merge this with the link to the bug? thanks

neil-yechenwei · 2023-11-07T03:33:10Z

Hi @katbyte , the "AuthMethod" property has been defined as enum constants in azure rest api spec. And service team has confirmed that defining this property as number type is by API design so that they won't change it. As @stephybun mentioned, it's a pandora issue since the values for this property aren't being surfaced correctly as constants in Pandora. So I filed an issue on hashicorp/pandora#3254. As we don't expose AuthMethod as parameter to user in this resource, so I assume we can merge this PR first. Once this pandora issue is fixed, we can submit another PR to update this resource with pandora change. Does it make sense?

Note: there is a GH issue that is requesting this feature so that I linked that issue to here.

neil-yechenwei · 2023-11-24T02:32:26Z

@katbyte , is it good to be merged?

tombuildsstuff · 2023-12-07T16:54:58Z

I've got a pending review for this one in-flight but this is blocked on hashicorp/go-azure-helpers#183 which'll enable switching this over to hashicorp/go-azure-sdk which'll allow us to fix this in the SDK.

neil-yechenwei · 2024-01-24T14:15:18Z

@tombuildsstuff , @katbyte , @stephybun , I updated PR. Please take another look. Thanks.

neil-yechenwei · 2024-01-25T01:18:52Z

@tombuildsstuff , @katbyte , @stephybun , Below is the latest test result.

--- PASS: TestAccBotChannelsRegistration/channel/emailBasic (198.77s)
--- PASS: TestAccBotChannelsRegistration/channel/emailUpdate (244.39s)
--- PASS: TestAccBotChannelsRegistration/channel/emailMagicCode (65.30s)

katbyte

Aside from 1 minor comment LGTM ☔

website/docs/r/bot_channel_email.html.markdown

* azurerm_bot_channel_email - support for magic_code * update code * update code * update code * update code * Update website/docs/r/bot_channel_email.html.markdown --------- Co-authored-by: kt <[email protected]>

<Actions> <action id="f410411e63aff4bb73a81c2aec1d373cf8a903e63b30dee2006b0030d8a94cc8"> <h3>Bump Terraform `azurerm` provider version</h3> <details id="1d9343c012f5434ac9fe8a98135bae3667b399259be16d9b14302ea3bd424a24"> <summary>Update Terraform lock file</summary> <p>changes detected:
	"hashicorp/azurerm" updated from "3.89.0" to "3.90.0" in file ".terraform.lock.hcl"</p> <details> <summary>3.90.0</summary> <pre>Changelog retrieved from:
	https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.90.0
UPGRADE NOTES:

* provider - The provider will now automatically register the `AppConfiguration`, `DataFactory`, and `SignalRService` Resource Providers. When running Terraform with limited permissions, note that you [must disable automatic Resource Provider Registration and ensure that any Resource Providers Terraform requires are registered]([XXX](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#skip_provider_registration)). ([#24645](hashicorp/terraform-provider-azurerm#24645; 
FEATURES:

* **New Data Source**: `azurerm_nginx_configuration` ([#24642](hashicorp/terraform-provider-azurerm#24642 **New Data Source**: `azurerm_virtual_desktop_workspace` ([#24732](hashicorp/terraform-provider-azurerm#24732 **New Resource**: `azurerm_kubernetes_fleet_update_strategy` ([#24328](hashicorp/terraform-provider-azurerm#24328 **New Resource**: `azurerm_site_recovery_vmware_replicated_vm` ([#22477](hashicorp/terraform-provider-azurerm#22477 **New Resource**: `azurerm_spring_cloud_new_relic_application_performance_monitoring` ([#24699](https://github.com/hashicorp/terraform-provider-azurerm/issues/24699))

ENHANCEMENTS:

* provider: registering the Resource Provider `Microsoft.AppConfiguration` ([#24645](hashicorp/terraform-provider-azurerm#24645 provider: registering the Resource Provider `Microsoft.DataFactory` ([#24645](hashicorp/terraform-provider-azurerm#24645 provider: registering the Resource Provider `Microsoft.SignalRService` ([#24645](hashicorp/terraform-provider-azurerm#24645 provider: the Provider is now built using Go 1.21.6 ([#24653](hashicorp/terraform-provider-azurerm#24653 dependencies: the dependency `github.com/hashicorp/go-azure-sdk` has been split into multiple Go Modules - and as such will be referred to by those paths going forwards ([#24636](hashicorp/terraform-provider-azurerm#24636 dependencies: updating to ``v0.20240201.1064937` of `github.com/hashicorp/go-azure-sdk/resource-manager` ([#24738](hashicorp/terraform-provider-azurerm#24738 dependencies: updating to `v0.20240201.1064937` of `github.com/hashicorp/go-azure-sdk/sdk` ([#24738](hashicorp/terraform-provider-azurerm#24738 `appservice`: update to `go-azure-sdk` and API version `2023-01-01` ([#24688](hashicorp/terraform-provider-azurerm#24688 `datafactory`: updating to use `tombuildsstuff/kermit` ([#24675](hashicorp/terraform-provider-azurerm#24675 `hdinsight`: refactoring to use `github.com/hashicorp/go-azure-sdk/resource-manager` ([#24011](hashicorp/terraform-provider-azurerm#24011 `hdinsight`: updating to API Version `2021-06-01` ([#24011](hashicorp/terraform-provider-azurerm#24011 `loadbalancer`: updating to use `hashicorp/go-azure-sdk` ([#24291](hashicorp/terraform-provider-azurerm#24291 `nginx`: updating to API Version `2023-09-01` ([#24640](hashicorp/terraform-provider-azurerm#24640 `servicefabricmanagedcluster`: updating to use the base layer from `hashicorp/go-azure-sdk` rather than `Azure/go-autorest` ([#24654](hashicorp/terraform-provider-azurerm#24654 `springcloud`: updating to use API Version `2023-11-01-preview` ([#24690](hashicorp/terraform-provider-azurerm#24690 `subscriptions`: refactoring to use `hashicorp/go-azure-sdk` ([#24663](hashicorp/terraform-provider-azurerm#24663 Data Source: `azurerm_stream_analytics_job` - support for User Assigned Identities ([#24738](hashicorp/terraform-provider-azurerm#24738 `azurerm_cosmosdb_account` - support for the `gremlin_database` and `tables_to_restore` properties ([#24627](hashicorp/terraform-provider-azurerm#24627 `azurerm_bot_channel_email` - support for the `magic_code` property ([#23129](hashicorp/terraform-provider-azurerm#23129 `azurerm_cosmosdb_account` - support for the `partition_merge_enabled` property ([#24615](hashicorp/terraform-provider-azurerm#24615 `azurerm_mssql_managed_database` - support for the `immutable_backups_enabled` property ([#24745](hashicorp/terraform-provider-azurerm#24745 `azurerm_mssql_database` - support for the `immutable_backups_enabled` property ([#24745](hashicorp/terraform-provider-azurerm#24745 `azurerm_palo_alto_next_generation_firewall_virtual_hub_panorama` - support for the `trusted_address_ranges` property ([#24459](hashicorp/terraform-provider-azurerm#24459 `azurerm_palo_alto_next_generation_firewall_virtual_network_local_rulestack` - support for the `trusted_address_ranges` property ([#24459](hashicorp/terraform-provider-azurerm#24459 `azurerm_palo_alto_next_generation_firewall_virtual_network_panorama` - support for the `trusted_address_ranges` property ([#24459](hashicorp/terraform-provider-azurerm#24459 `azurerm_servicebus_namespace` - updating to use API Version `2022-10-01-preview` ([#24650](hashicorp/terraform-provider-azurerm#24650 `azurerm_spring_cloud_api_portal` - support for the `api_try_out_enabled` property ([#24696](hashicorp/terraform-provider-azurerm#24696 `azurerm_spring_cloud_gateway` - support for the `local_response_cache_per_route` and `local_response_cache_per_instance` properties ([#24697](hashicorp/terraform-provider-azurerm#24697 `azurerm_stream_analytics_job` - support for User Assigned Identities ([#24738](hashicorp/terraform-provider-azurerm#24738 `azurerm_subscription` - refactoring to use `hashicorp/go-azure-sdk` to set tags on the subscription ([#24734](hashicorp/terraform-provider-azurerm#24734 `azurerm_virtual_desktop_workspace` - correctly validate the `name` property ([#24668](https://github.com/hashicorp/terraform-provider-azurerm/issues/24668))


BUG FIXES:

* provider: skip registration for resource providers that are unavailable ([#24571](hashicorp/terraform-provider-azurerm#24571 `azurerm_app_configuration` - no longer require `lifecycle_ignore_changes` for the `value` property when using a key vault reference ([#24702](hashicorp/terraform-provider-azurerm#24702 `azurerm_app_service_managed_certificate` - fix casing issue in `app_service_plan_id` by parsing insensitively ([#24664](hashicorp/terraform-provider-azurerm#24664 `azurerm_cognitive_deployment` - updates now include the `version` property ([#24700](hashicorp/terraform-provider-azurerm#24700 `azurerm_dns_cname_record` - prevent casing issue in `target_resource_id` by parsing the ID insensitively ([#24181](hashicorp/terraform-provider-azurerm#24181 `azurerm_mssql_managed_instance_failover_group` - prevent an issue when trying to create a failover group with a managed instance from a different subscription ([#24646](hashicorp/terraform-provider-azurerm#24646 `azurerm_storage_account` - conditionally update properties only when needed ([#24669](hashicorp/terraform-provider-azurerm#24669 `azurerm_storage_account` - change update order for `access_tier`to prevent errors when uploading blobs to the archive tier ([#22250](https://github.com/hashicorp/terraform-provider-azurerm/issues/22250))


</pre> </details> </details> <a href="https://infra.ci.jenkins.io/job/terraform-jobs/job/azure/job/main/1075/">Jenkins pipeline link</a> </action> </Actions> --- <table> <tr> <td width="77"> <img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli logo" width="50" height="50"> </td> <td> <p> Created automatically by <a href="https://www.updatecli.io/">Updatecli</a> </p> <details><summary>Options:</summary> <br /> <p>Most of Updatecli configuration is done via <a href="https://www.updatecli.io/docs/prologue/quick-start/">its manifest(s)</a>.</p> <ul> <li>If you close this pull request, Updatecli will automatically reopen it, the next time it runs.</li> <li>If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.</li> </ul> <p> Feel free to report any issues at <a href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br /> If you find this tool useful, do not hesitate to star <a href="https://github.com/updatecli/updatecli/stargazers">our GitHub repository</a> as a sign of appreciation, and/or to tell us directly on our <a href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>! </p> </details> </td> </tr> </table> Co-authored-by: Jenkins Infra Bot (updatecli) <[email protected]>

github-actions · 2024-04-26T02:08:55Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

neil-yechenwei added 3 commits August 30, 2023 17:16

azurerm_bot_channel_email - support for magic_code

800bcf2

update code

07ace46

update code

00b2b31

github-actions bot added documentation service/bots size/M waiting-response labels Aug 30, 2023

update code

01c6e17

github-actions bot removed the waiting-response label Aug 30, 2023

tombuildsstuff reviewed Sep 1, 2023

View reviewed changes

github-actions bot added the waiting-response label Sep 1, 2023

neil-yechenwei requested a review from tombuildsstuff September 4, 2023 01:19

github-actions bot removed the waiting-response label Sep 4, 2023

stephybun added the upstream/pandora This issue/PR has a dependency on an issue in `github.com/hashicorp/pandora` label Sep 14, 2023

stephybun added this to the Blocked milestone Sep 14, 2023

tombuildsstuff self-assigned this Sep 15, 2023

neil-yechenwei mentioned this pull request Oct 31, 2023

BotChannelEmail - the values for AuthMethod should be surfaced correctly as constants in Pandora. hashicorp/pandora#3254

Closed

katbyte added the waiting-response label Nov 7, 2023

github-actions bot removed the waiting-response label Nov 7, 2023

github-actions bot added the waiting-response label Nov 24, 2023

github-actions bot removed the waiting-response label Nov 24, 2023

neil-yechenwei mentioned this pull request Dec 18, 2023

Config: add BotService@2021-05-01-preview hashicorp/pandora#3511

Closed

neil-yechenwei mentioned this pull request Jan 19, 2024

Upgrade Bot Email Channel API version from 2021-05-01-preview to 2022-09-15 #24555

Merged

update code

84dae64

github-actions bot added size/L waiting-response and removed size/M labels Jan 24, 2024

update code

7125522

github-actions bot added size/M and removed waiting-response size/L labels Jan 24, 2024

tombuildsstuff removed this from the Blocked milestone Jan 24, 2024

tombuildsstuff removed their assignment Jan 24, 2024

tombuildsstuff removed the upstream/pandora This issue/PR has a dependency on an issue in `github.com/hashicorp/pandora` label Jan 24, 2024

katbyte approved these changes Jan 30, 2024

View reviewed changes

website/docs/r/bot_channel_email.html.markdown Outdated Show resolved Hide resolved

Update website/docs/r/bot_channel_email.html.markdown

6204524

katbyte merged commit de887a9 into hashicorp:main Jan 30, 2024
3 checks passed

katbyte added a commit that referenced this pull request Jan 30, 2024

Update CHANGELOG.md #23129

a0b10c3

github-actions bot added this to the v3.90.0 milestone Jan 30, 2024

github-actions bot added the waiting-response label Jan 30, 2024

rizkybiz pushed a commit to rizkybiz/terraform-provider-azurerm that referenced this pull request Jan 30, 2024

Update CHANGELOG.md hashicorp#23129

a6a9c30

github-actions bot locked as resolved and limited conversation to collaborators Apr 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`azurerm_bot_channel_email` - support for `magic_code` #23129

`azurerm_bot_channel_email` - support for `magic_code` #23129

neil-yechenwei commented Aug 30, 2023 •

edited

Loading

tombuildsstuff Sep 1, 2023

neil-yechenwei Sep 4, 2023 •

edited

Loading

neil-yechenwei Sep 13, 2023

neil-yechenwei Jan 24, 2024

neil-yechenwei commented Sep 4, 2023

neil-yechenwei commented Sep 15, 2023

stephybun commented Sep 15, 2023

neil-yechenwei commented Oct 12, 2023

katbyte commented Nov 7, 2023

neil-yechenwei commented Nov 7, 2023 •

edited

Loading

neil-yechenwei commented Nov 24, 2023 •

edited

Loading

tombuildsstuff commented Dec 7, 2023

neil-yechenwei commented Jan 24, 2024

neil-yechenwei commented Jan 25, 2024 •

edited

Loading

katbyte left a comment

github-actions bot commented Apr 26, 2024

azurerm_bot_channel_email - support for magic_code #23129

azurerm_bot_channel_email - support for magic_code #23129

Conversation

neil-yechenwei commented Aug 30, 2023 • edited Loading

tombuildsstuff Sep 1, 2023

Choose a reason for hiding this comment

neil-yechenwei Sep 4, 2023 • edited Loading

Choose a reason for hiding this comment

neil-yechenwei Sep 13, 2023

Choose a reason for hiding this comment

neil-yechenwei Jan 24, 2024

Choose a reason for hiding this comment

neil-yechenwei commented Sep 4, 2023

neil-yechenwei commented Sep 15, 2023

stephybun commented Sep 15, 2023

neil-yechenwei commented Oct 12, 2023

katbyte commented Nov 7, 2023

neil-yechenwei commented Nov 7, 2023 • edited Loading

neil-yechenwei commented Nov 24, 2023 • edited Loading

tombuildsstuff commented Dec 7, 2023

neil-yechenwei commented Jan 24, 2024

neil-yechenwei commented Jan 25, 2024 • edited Loading

katbyte left a comment

Choose a reason for hiding this comment

github-actions bot commented Apr 26, 2024

`azurerm_bot_channel_email` - support for `magic_code` #23129

`azurerm_bot_channel_email` - support for `magic_code` #23129

neil-yechenwei commented Aug 30, 2023 •

edited

Loading

neil-yechenwei Sep 4, 2023 •

edited

Loading

neil-yechenwei commented Nov 7, 2023 •

edited

Loading

neil-yechenwei commented Nov 24, 2023 •

edited

Loading

neil-yechenwei commented Jan 25, 2024 •

edited

Loading