New Resource: `azurerm_dynatrace_monitor` #27432

jiaweitao001 · 2024-09-19T03:02:30Z

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

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)

Change Log

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

New Resource: azurerm_dynatrace_monitor

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)

Fixes #0000

Note

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

As discussed several months ago, since the tests of this resource cost too much, I'll perform tests on the subs provided by the service team. Here's the test results.

PASS: TestAccDynatraceMonitor_basic (394.27s)
PASS: TestAccDynatraceMonitor_update(456.12s)
PASS: TestAccDynatraceMonitor_requiresImport(387.24s)

katbyte · 2024-10-23T17:25:00Z

internal/services/dynatrace/helper.go

+	country := v["country"].(string)
+	emailAddress := v["email"].(string)
+	firstName := v["first_name"].(string)
+	lastName := v["last_name"].(string)
+	phoneNumber := v["phone_number"].(string)
+
+	return []UserInfo{
+		{
+			Country:      country,
+			EmailAddress: emailAddress,
+			FirstName:    firstName,
+			LastName:     lastName,
+			PhoneNumber:  phoneNumber,
+		},
+	}


could we please just inline these?

Suggested change

country := v["country"].(string)

emailAddress := v["email"].(string)

firstName := v["first_name"].(string)

lastName := v["last_name"].(string)

phoneNumber := v["phone_number"].(string)

return []UserInfo{

{

Country: country,

EmailAddress: emailAddress,

FirstName: firstName,

LastName: lastName,

PhoneNumber: phoneNumber,

},

}

return []UserInfo{

{

Country: v["country"].(string),

EmailAddress: v["email"].(string),

FirstName: v["first_name"].(string),

LastName: lastName,

PhoneNumber: phoneNumber,

},

}

etc

katbyte · 2024-10-23T17:25:48Z

internal/services/dynatrace/helper.go

+						"MONTHLY",
+						"WEEKLY",


Shouldn't these be an enum?

They are not enums.

Other APIs correctly make these an enum (ie sql_license_type) so i presume this is a swagger oversite, could we create a quick rest api specs issue and the link that inline?

katbyte · 2024-10-23T17:25:54Z

internal/services/dynatrace/helper.go

+						"PAYG",
+						"COMMITTED",


Same as above, these are not enums.

katbyte · 2024-10-23T17:26:26Z

internal/services/dynatrace/helper.go

+				"email": {
+					Type:         pluginsdk.TypeString,
+					Required:     true,
+					ValidateFunc: validation.StringIsNotEmpty,


we can propertly validate this is an email?

katbyte · 2024-10-23T17:27:28Z

internal/services/dynatrace/dynatrace_monitors_resource.go

+		"plan": SchemaPlanData(),
+
+		"user": SchemaUserInfo(),


is there a reason we are pulling these out into a function? they are only used here so could we please inline them to be consistant with the rest of the provider?

Will inline them.

katbyte · 2024-10-23T17:27:40Z

internal/services/dynatrace/dynatrace_monitors_resource.go

+				"Active",
+				"Suspended",


shouldn't this be an enum?

Will change.

katbyte · 2024-10-23T17:28:29Z

website/docs/r/dynatrace_monitors.html.markdown

+
+A `plan` block supports the following:
+
+* `billing_cycle` - (Optional) Different billing cycles. Possible values are `MONTHLY`, `WEEKLY`.


comma's are not used for two item list

Suggested change

* `billing_cycle` - (Optional) Different billing cycles. Possible values are `MONTHLY`, `WEEKLY`.

* `billing_cycle` - (Optional) Different billing cycles. Possible values are `MONTHLY` and `WEEKLY`.

Will change.

katbyte · 2024-10-23T17:28:34Z

website/docs/r/dynatrace_monitors.html.markdown

+
+* `identity` - (Required) The kind of managed identity assigned to this resource.  A `identity` block as defined below.
+
+* `marketplace_subscription` - (Required) Flag specifying the Marketplace Subscription Status of the resource. If payment is not made in time, the resource will go in Suspended state. Possible values are `Active`, `Suspended`.


Will change.

katbyte · 2024-10-23T17:28:42Z

website/docs/r/dynatrace_monitors.html.markdown

+
+* `plan` - (Required) Plan id as published by Dynatrace.
+
+* `usage_type` - (Optional) Different usage type. Possible values are `PAYG`, `COMMITTED`.


Will change.

katbyte

2 minor comments + the rest API specs for the missing enum but otherwise LGTM once they are resolved 🏷️

katbyte · 2024-10-28T20:06:09Z

internal/services/dynatrace/dynatrace_monitors_resource.go

+				monitoringStatus = monitors.MonitoringStatusDisabled
+			}
+			monitorsProps := monitors.MonitorProperties{
+				MarketplaceSubscriptionStatus: pointer.To(marketplaceSubscriptionServiceStatus),


this can be

Suggested change

MarketplaceSubscriptionStatus: pointer.To(marketplaceSubscriptionServiceStatus),

MarketplaceSubscriptionStatus: pointer.To(monitors.MarketplaceSubscriptionStatus(model.MarketplaceSubscriptionStatus)),

?

katbyte · 2024-10-28T20:06:28Z

internal/services/dynatrace/dynatrace_monitors_resource.go

+			}
+			if model := resp.Model; model != nil {


Suggested change

}

if model := resp.Model; model != nil {

}

if model := resp.Model; model != nil {

katbyte · 2024-10-28T20:07:04Z

internal/services/dynatrace/dynatrace_monitors_resource.go

+					MarketplaceSubscriptionStatus: string(*props.MarketplaceSubscriptionStatus),
+					Identity:                      identityProps,
+					PlanData:                      FlattenDynatracePlanData(props.PlanData),
+					UserInfo:                      FlattenDynatraceUserInfo(userInfo),


this should be

Suggested change

UserInfo: FlattenDynatraceUserInfo(userInfo),

UserInfo: FlattenDynatraceUserInfo(metadata.ResourceData.Get("user").([]interface{})),

?

katbyte · 2024-10-29T03:52:07Z

@jiaweitao001 also don't forget to post test evidence

jiaweitao001 · 2024-10-29T06:06:22Z

@jiaweitao001 also don't forget to post test evidence

Hi @katbyte , the test results are listed in the description note at the top.

katbyte · 2024-10-29T19:41:50Z

@jiaweitao001 - you need to rerun the tests with all the changes/commits made to ensure it still works, and tests should be a comment after the changes have been made. Please re-run the tests and add as a comment.

jiaweitao001 · 2024-11-07T08:46:37Z

@jiaweitao001 - you need to rerun the tests with all the changes/commits made to ensure it still works, and tests should be a comment after the changes have been made. Please re-run the tests and add as a comment.

Latest test results:

=== RUN   TestAccDynatraceMonitor_basic
=== PAUSE TestAccDynatraceMonitor_basic
=== RUN   TestAccDynatraceMonitor_update
=== PAUSE TestAccDynatraceMonitor_update
=== RUN   TestAccDynatraceMonitor_requiresImport
=== PAUSE TestAccDynatraceMonitor_requiresImport
=== CONT  TestAccDynatraceMonitor_basic
=== CONT  TestAccDynatraceMonitor_requiresImport
=== CONT  TestAccDynatraceMonitor_update
--- PASS: TestAccDynatraceMonitor_requiresImport (293.30s)
--- PASS: TestAccDynatraceMonitor_basic (300.87s)
--- PASS: TestAccDynatraceMonitor_update (328.71s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/dynatrace     328.748s

katbyte

Thanks LGTM ☕

internal/services/dynatrace/dynatrace_monitors_resource.go

github-actions bot added documentation dependencies size/XL waiting-response and removed waiting-response labels Sep 19, 2024

stephybun assigned jackofallops Sep 23, 2024

katbyte assigned stephybun Sep 23, 2024

rcskosir added the new-resource label Oct 14, 2024

katbyte requested changes Oct 23, 2024

View reviewed changes

github-actions bot added the waiting-response label Oct 23, 2024

jiaweitao001 requested a review from a team as a code owner October 24, 2024 06:24

github-actions bot added waiting-response and removed waiting-response labels Oct 24, 2024

jiaweitao001 added 13 commits October 24, 2024 15:13

New resources: azurerm_dynatrace_monitors, azurerm_dynatrace_tag_rules

1635a79

Adding documentation

66c631f

Add subcategory

1c6897a

Renaming parameters

aa1919a

change variable names

e29c604

Fix acc tests

bc52244

Renaming variables

c5455db

fix schema

84f445b

fix imports

8d4567a

retrigger teamcity run

e9f9e06

rebase dynatrace

42fa5e5

Update API

fed7c15

New Resource: azurerm_dynatrace_monitors

70e0c18

jiaweitao001 added 9 commits October 24, 2024 15:13

Add prechecks

dca6838

remove effective date, testing

fa5a7b4

modified tests, replace pointers

fabb928

modified docs

ad57c54

upgrade vendor

0fa9382

fix go gen

5a9bf21

skip tests

abce79a

inclined some functions, changed docs

1b73d35

fix imports

c31798c

jiaweitao001 force-pushed the dynatrace_monitor branch from 4c2f4c1 to c31798c Compare October 24, 2024 07:19

github-actions bot added waiting-response and removed waiting-response labels Oct 24, 2024

update vendors

eed639b

github-actions bot added waiting-response and removed waiting-response labels Oct 24, 2024

katbyte approved these changes Oct 28, 2024

View reviewed changes

inlined values, add tracking issue

927c7f4

github-actions bot removed the waiting-response label Oct 29, 2024

katbyte added the waiting-response label Oct 29, 2024

Format code to follow guidance

c076a2d

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

format acc test

05005d6

katbyte approved these changes Nov 8, 2024

View reviewed changes

internal/services/dynatrace/dynatrace_monitors_resource.go Outdated Show resolved Hide resolved

katbyte merged commit 4b761e8 into hashicorp:main Nov 8, 2024
34 checks passed

katbyte added a commit that referenced this pull request Nov 8, 2024

Update CHANGELOG.md #27432

807c6f4

github-actions bot added this to the v4.9.0 milestone Nov 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Resource: `azurerm_dynatrace_monitor` #27432

New Resource: `azurerm_dynatrace_monitor` #27432

jiaweitao001 commented Sep 19, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte Oct 28, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte Oct 23, 2024

jiaweitao001 Oct 24, 2024

katbyte left a comment •

edited

Loading

katbyte Oct 28, 2024

katbyte Oct 28, 2024

katbyte Oct 28, 2024

katbyte commented Oct 29, 2024

jiaweitao001 commented Oct 29, 2024

katbyte commented Oct 29, 2024

jiaweitao001 commented Nov 7, 2024

katbyte left a comment


		A `plan` block supports the following:

		* `billing_cycle` - (Optional) Different billing cycles. Possible values are `MONTHLY`, `WEEKLY`.


		* `identity` - (Required) The kind of managed identity assigned to this resource. A `identity` block as defined below.

		* `marketplace_subscription` - (Required) Flag specifying the Marketplace Subscription Status of the resource. If payment is not made in time, the resource will go in Suspended state. Possible values are `Active`, `Suspended`.


		* `plan` - (Required) Plan id as published by Dynatrace.

		* `usage_type` - (Optional) Different usage type. Possible values are `PAYG`, `COMMITTED`.

	MarketplaceSubscriptionStatus: pointer.To(marketplaceSubscriptionServiceStatus),
	MarketplaceSubscriptionStatus: pointer.To(monitors.MarketplaceSubscriptionStatus(model.MarketplaceSubscriptionStatus)),

	UserInfo: FlattenDynatraceUserInfo(userInfo),
	UserInfo: FlattenDynatraceUserInfo(metadata.ResourceData.Get("user").([]interface{})),

New Resource: azurerm_dynatrace_monitor #27432

New Resource: azurerm_dynatrace_monitor #27432

Conversation

jiaweitao001 commented Sep 19, 2024

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

katbyte 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

katbyte commented Oct 29, 2024

jiaweitao001 commented Oct 29, 2024

katbyte commented Oct 29, 2024

jiaweitao001 commented Nov 7, 2024

katbyte left a comment

Choose a reason for hiding this comment

New Resource: `azurerm_dynatrace_monitor` #27432

New Resource: `azurerm_dynatrace_monitor` #27432

katbyte left a comment •

edited

Loading