`azurerm_datadog_monitor_sso_configuration` deprecate `single_sign_on_enabled` property #28520

wyattfry · 2025-01-15T19:42:09Z

Community Note

Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

Deprecates the single_sign_on_enabled property in favor of single_sign_on (a 4.0 TODO)

PR Checklist

I have followed the guidelines in our Contributing Documentation.
I have checked to ensure there aren't other open Pull Requests for the same update/change.
I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
For example: “resource_name_here - description of change e.g. adding property new_property_name_here”

Changes to existing Resource / Data Source

I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
I have written new tests for my resource or datasource changes & updated any relevent documentation.
I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
(For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

The unit tests have been skipped for a long time and fixing them is outside the scope of this PR.

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

azurerm_datadog_monitor_sso_configuration replace single_sign_on_enabled with single_sign_on property [azurerm_datadog_monitor_sso_configuration deprecate single_sign_on_enabled property #28520]

This is a (please select all that apply):

Bug Fix
New Feature (ie adding a service, resource, or data source)
Enhancement
Breaking Change

Related Issue(s)

Relates to https://github.com/hashicorp/tf-azure-stratosphere/issues/245

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

internal/services/kusto/kusto_attached_database_configuration_resource.go

internal/services/kusto/kusto_eventgrid_data_connection_resource.go

wyattfry · 2025-01-15T21:30:46Z

Unfortunately I have not yet found a Datadog API key, so I can't run the tests yet

mbfrahry

Thanks for this @wyattfry. Datadog SSO stuff looks great as does removing the provider test stuff but unfortunately, some of the 4.0 removal stuff can't be done because it currently works in 4.0 and will break people if we remove it the way it's written

internal/services/datadog/azurerm_datadog_monitor_sso_configuration_test.go

internal/services/servicebus/servicebus_queue_data_source.go

internal/services/servicebus/servicebus_subscription_data_source.go

jackofallops

spotted a couple extras to @mbfrahry's review

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go

…r-azurerm into wyatt/todos-4-0-datadog-sso-config

wyattfry · 2025-01-28T16:19:19Z

I've discovered that i am able to make new datadog instances via azure portal (in azure terms, a "datadog monitor", not be confused with monitors within datadog), and do not need hashicorp to provision a datadog organization in order to test this resource.

To progress this work, whoever takes it, be it myself or anyone else, they should be able to progress with the self-serve datadog instances:

wyattfry · 2025-01-28T16:21:14Z

Closes this PR until I have a chance to focus on it.

…r-azurerm into wyatt/todos-4-0-datadog-sso-config

wyattfry · 2025-02-14T17:37:55Z

website/docs/r/datadog_monitor_sso_configuration.html.markdown

-  single_sign_on_enabled    = "Enable"
-  enterprise_application_id = "XXXX"
+  single_sign_on            = "Enable"
+  enterprise_application_id = "00000000-0000-0000-0000-000000000000"


Because enterprise app IDs are always GUIDs, I felt it would be clearer to make the example value a GUID.

mbfrahry

Hey @wyattfry, I've left some comments on this review. Some of which are covered under the breaking-changes guide which I encourage you to look over

mbfrahry · 2025-02-14T22:17:16Z

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go

 				Type:     pluginsdk.TypeString,
 				Required: true,
 				ValidateFunc: validation.StringInSlice([]string{
-					// @tombuildsstuff: other options are available, but the Create handles this as a boolean for now
-					// should the field be a boolean? one to consider for 4.0 when this resource is inlined
 					string(singlesignon.SingleSignOnStatesEnable),
 					string(singlesignon.SingleSignOnStatesDisable),


Can you add support for the other values here as well? From what we saw, I doubt we'll need them but we may as well let people use them if they want

mbfrahry · 2025-02-14T22:18:29Z

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go

+
+	if !features.FivePointOh() {
+		resource.Schema["single_sign_on"].Required = false
+		resource.Schema["single_sign_on"].Optional = true


We'll want these to be computed as well since we're setting both into state even though the user will only specify one

Also, at this point, we could just have rewrite this with another block instead of changing the existing block

resource.Schema["single_sign_on"] = &pluginsdk.Schema{ ... }

mbfrahry · 2025-02-14T22:18:40Z

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go

+		resource.Schema["single_sign_on"].Optional = true
+		resource.Schema["single_sign_on_enabled"] = &pluginsdk.Schema{
+			Type:     pluginsdk.TypeString,
+			Optional: true,


And computed here

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go

mbfrahry · 2025-02-14T22:22:27Z

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go

 		},
 	}

+	if v, ok := d.GetOk("single_sign_on"); ok {


We should refactor this update method to use d.HasChanges so people can use ignore_changes if they want

mbfrahry · 2025-02-14T22:22:58Z

website/docs/r/datadog_monitor_sso_configuration.html.markdown

@@ -50,7 +50,7 @@ The following arguments are supported:

 * `datadog_monitor_id` - (Required) The Datadog Monitor Id which should be used for this Datadog Monitor SSO Configuration. Changing this forces a new Datadog Monitor SSO Configuration to be created.

-* `single_sign_on_enabled` - (Required) The state of SingleSignOn configuration. Possible values are `Enable` and `Disable`.
+* `single_sign_on` - (Required) The state of SingleSignOn configuration. Possible values are `Enable`, `Disable`.


You'll also want to add a note in the 5.0 upgrade guide

mbfrahry · 2025-02-14T22:25:35Z

internal/services/datadog/azurerm_datadog_monitor_sso_configuration_test.go

@@ -64,7 +64,6 @@ func TestAccDatadogMonitorSSO_requiresImport(t *testing.T) {
 			Config: r.basic(data),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("single_sign_on_enabled").HasValue("Enable"),


We'll want to update the tests to use the new value and keep a legacy test config around

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go

…r-azurerm into wyatt/todos-4-0-datadog-sso-config

Co-authored-by: Matthew Frahry <[email protected]>

…om/hashicorp/terraform-provider-azurerm into wyatt/todos-4-0-datadog-sso-config

resolving 4.0 TODOs

211fbc0

github-actions bot added service/service-bus service/kusto service/datadog size/L labels Jan 15, 2025

wyattfry commented Jan 15, 2025

View reviewed changes

internal/services/kusto/kusto_attached_database_configuration_resource.go Outdated Show resolved Hide resolved

github-actions bot added the waiting-response label Jan 15, 2025

wyattfry commented Jan 15, 2025

View reviewed changes

internal/services/kusto/kusto_eventgrid_data_connection_resource.go Outdated Show resolved Hide resolved

missed docs

4f0d672

github-actions bot added documentation waiting-response and removed waiting-response labels Jan 15, 2025

github-actions bot removed the waiting-response label Jan 15, 2025

attempt at adding tests for the other two SSO states

11636b6

github-actions bot added the waiting-response label Jan 15, 2025

mbfrahry requested changes Jan 16, 2025

View reviewed changes

github-actions bot assigned mbfrahry Jan 16, 2025

jackofallops reviewed Jan 16, 2025

View reviewed changes

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go Outdated Show resolved Hide resolved

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go Outdated Show resolved Hide resolved

changes moved to PR #28529

612bac8

github-actions bot removed the waiting-response label Jan 16, 2025

Merge branch 'main' of https://github.com/hashicorp/terraform-provide…

3a10f51

…r-azurerm into wyatt/todos-4-0-datadog-sso-config

github-actions bot added waiting-response and removed waiting-response labels Jan 16, 2025

wyattfry changed the title ~~Resolving 4.0 Resource TODOs~~ Resolving 4.0 TODOs Datadog SSO Jan 16, 2025

moved to PRs 28530 28531

ae61104

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

github-actions bot removed the waiting-response label Jan 28, 2025

wyattfry closed this Jan 28, 2025

wyattfry added 3 commits February 12, 2025 16:23

Merge branch 'main' of https://github.com/hashicorp/terraform-provide…

7ef5b31

…r-azurerm into wyatt/todos-4-0-datadog-sso-config

rename property

afb48ef

Merge branch 'main' of https://github.com/hashicorp/terraform-provide…

a0a2604

…r-azurerm into wyatt/todos-4-0-datadog-sso-config

wyattfry reopened this Feb 14, 2025

wip

88e7100

github-actions bot added size/S waiting-response and removed size/M labels Feb 14, 2025

fix tflint

bcb71a9

github-actions bot removed the waiting-response label Feb 14, 2025

wyattfry commented Feb 14, 2025

View reviewed changes

wyattfry marked this pull request as ready for review February 14, 2025 17:38

wyattfry requested a review from a team as a code owner February 14, 2025 17:38

mbfrahry requested changes Feb 14, 2025

View reviewed changes

github-actions bot added the waiting-response label Feb 14, 2025

mbfrahry reviewed Feb 14, 2025

View reviewed changes

internal/services/datadog/azurerm_datadog_monitor_sso_configuration.go Outdated Show resolved Hide resolved

wyattfry marked this pull request as draft February 17, 2025 14:46

wyattfry and others added 2 commits February 17, 2025 10:05

Merge branch 'main' of https://github.com/hashicorp/terraform-provide…

d220211

…r-azurerm into wyatt/todos-4-0-datadog-sso-config

Apply suggestions from code review

338a55d

Co-authored-by: Matthew Frahry <[email protected]>

github-actions bot removed the waiting-response label Feb 17, 2025

wyattfry added 3 commits February 17, 2025 10:28

wip

b34c808

Merge branch 'wyatt/todos-4-0-datadog-sso-config' of https://github.c…

787c307

…om/hashicorp/terraform-provider-azurerm into wyatt/todos-4-0-datadog-sso-config

feedback

5f1338f

github-actions bot added size/M waiting-response and removed size/S labels Feb 17, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`azurerm_datadog_monitor_sso_configuration` deprecate `single_sign_on_enabled` property #28520

`azurerm_datadog_monitor_sso_configuration` deprecate `single_sign_on_enabled` property #28520

wyattfry commented Jan 15, 2025 •

edited

Loading

wyattfry commented Jan 15, 2025

mbfrahry left a comment

jackofallops left a comment

wyattfry commented Jan 28, 2025

wyattfry commented Jan 28, 2025

wyattfry Feb 14, 2025

mbfrahry left a comment •

edited

Loading

mbfrahry Feb 14, 2025

mbfrahry Feb 14, 2025

mbfrahry Feb 14, 2025

mbfrahry Feb 14, 2025

mbfrahry Feb 14, 2025

mbfrahry Feb 14, 2025

mbfrahry Feb 14, 2025

azurerm_datadog_monitor_sso_configuration deprecate single_sign_on_enabled property #28520

Are you sure you want to change the base?

azurerm_datadog_monitor_sso_configuration deprecate single_sign_on_enabled property #28520

Conversation

wyattfry commented Jan 15, 2025 • edited Loading

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

wyattfry commented Jan 15, 2025

mbfrahry left a comment

Choose a reason for hiding this comment

jackofallops left a comment

Choose a reason for hiding this comment

wyattfry commented Jan 28, 2025

wyattfry commented Jan 28, 2025

Choose a reason for hiding this comment

mbfrahry left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

`azurerm_datadog_monitor_sso_configuration` deprecate `single_sign_on_enabled` property #28520

`azurerm_datadog_monitor_sso_configuration` deprecate `single_sign_on_enabled` property #28520

wyattfry commented Jan 15, 2025 •

edited

Loading

mbfrahry left a comment •

edited

Loading