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

newrelic - upgrade API version to 2024-03-01 #27135

Merged
merged 9 commits into from
Oct 24, 2024
Merged

newrelic - upgrade API version to 2024-03-01 #27135

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2b8d5ec
newrelic upgrade to 2024-03-01
teowa Aug 22, 2024
f4f1075
fix BillingCycle for the enum is changed to normal string
teowa Aug 22, 2024
8d774cd
Merge branch 'main' of github.com:hashicorp/terraform-provider-azurer…
teowa Sep 4, 2024
b12aca1
Merge branch 'main' of github.com:hashicorp/terraform-provider-azurer…
teowa Sep 26, 2024
1826e6e
add identity to test code of new_relic_monitor
teowa Oct 8, 2024
43938fe
Merge branch 'main' of github.com:hashicorp/terraform-provider-azurer…
teowa Oct 8, 2024
a740f87
Merge branch 'main' of github.com:hashicorp/terraform-provider-azurer…
teowa Oct 18, 2024
666ccc6
link to https://github.com/Azure/azure-rest-api-specs/issues/31093
teowa Oct 18, 2024
6cdd48e
Merge remote-tracking branch 'teowa/newrelic_2024-03-01' into newreli…
teowa Oct 18, 2024
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
4 changes: 2 additions & 2 deletions internal/services/newrelic/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package client
import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/monitors"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/tagrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/monitors"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/tagrules"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

Expand Down
18 changes: 9 additions & 9 deletions internal/services/newrelic/new_relic_monitor_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/monitors"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/monitors"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/suppress"
Expand All @@ -41,10 +41,10 @@ type NewRelicMonitorModel struct {
}

type PlanDataModel struct {
EffectiveDate string `tfschema:"effective_date"`
BillingCycle monitors.BillingCycle `tfschema:"billing_cycle"`
PlanDetails string `tfschema:"plan_id"`
UsageType monitors.UsageType `tfschema:"usage_type"`
EffectiveDate string `tfschema:"effective_date"`
BillingCycle string `tfschema:"billing_cycle"`
PlanDetails string `tfschema:"plan_id"`
UsageType monitors.UsageType `tfschema:"usage_type"`
}

type UserInfoModel struct {
Expand Down Expand Up @@ -105,11 +105,11 @@ func (r NewRelicMonitorResource) Arguments() map[string]*pluginsdk.Schema {
Type: pluginsdk.TypeString,
Optional: true,
ForceNew: true,
Default: string(monitors.BillingCycleMONTHLY),
Default: "MONTHLY",
ValidateFunc: validation.StringInSlice([]string{
string(monitors.BillingCycleMONTHLY),
string(monitors.BillingCycleWEEKLY),
string(monitors.BillingCycleYEARLY),
"MONTHLY",
"WEEKLY",
"YEARLY",
Comment on lines +109 to +113
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason these are no longer constants? could we open an issue on the rest specs asking and link it here ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @katbyte , from service team, earlier there was limit on values that this field can have, now that limitation has lifted. There will be new values in the future.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why that means there is no longer an enum/defined in the rest API specs? i cannot see any reason why these values shouldn't be captures there. could we place open an issue on the rest specs + link it here?

}, false),
},

Expand Down
2 changes: 1 addition & 1 deletion internal/services/newrelic/new_relic_monitor_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/monitors"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/monitors"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/newrelic/new_relic_tag_rule_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/monitors"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/tagrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/monitors"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/tagrules"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/newrelic/new_relic_tag_rule_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/tagrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/tagrules"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
12 changes: 4 additions & 8 deletions ...er/newrelic/2022-07-01/monitors/README.md → ...er/newrelic/2024-03-01/monitors/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...er/newrelic/2022-07-01/monitors/client.go → ...er/newrelic/2024-03-01/monitors/client.go
View file
Open in desktop
File renamed without changes.
44 changes: 0 additions & 44 deletions ...newrelic/2022-07-01/monitors/constants.go → ...newrelic/2024-03-01/monitors/constants.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ewrelic/2022-07-01/monitors/id_monitor.go → ...ewrelic/2024-03-01/monitors/id_monitor.go
View file
Open in desktop
File renamed without changes.
0 ...2-07-01/monitors/method_createorupdate.go → ...4-03-01/monitors/method_createorupdate.go
View file
Open in desktop
File renamed without changes.
0 ...elic/2022-07-01/monitors/method_delete.go → ...elic/2024-03-01/monitors/method_delete.go
View file
Open in desktop
File renamed without changes.
0 ...ewrelic/2022-07-01/monitors/method_get.go → ...ewrelic/2024-03-01/monitors/method_get.go
View file
Open in desktop
File renamed without changes.
0 ...2-07-01/monitors/method_getmetricrules.go → ...4-03-01/monitors/method_getmetricrules.go
View file
Open in desktop
File renamed without changes.
0 ...-07-01/monitors/method_getmetricstatus.go → ...-03-01/monitors/method_getmetricstatus.go
View file
Open in desktop
File renamed without changes.
0 ...-07-01/monitors/method_listappservices.go → ...-03-01/monitors/method_listappservices.go
View file
Open in desktop
File renamed without changes.
0 ...01/monitors/method_listbyresourcegroup.go → ...01/monitors/method_listbyresourcegroup.go
View file
Open in desktop
File renamed without changes.
0 ...-01/monitors/method_listbysubscription.go → ...-01/monitors/method_listbysubscription.go
View file
Open in desktop
File renamed without changes.
0 ...c/2022-07-01/monitors/method_listhosts.go → ...c/2024-03-01/monitors/method_listhosts.go
View file
Open in desktop
File renamed without changes.
0 ...monitors/method_listmonitoredresources.go → ...monitors/method_listmonitoredresources.go
View file
Open in desktop
File renamed without changes.
0 ...22-07-01/monitors/method_switchbilling.go → ...24-03-01/monitors/method_switchbilling.go
View file
Open in desktop
File renamed without changes.
25 changes: 21 additions & 4 deletions ...elic/2022-07-01/monitors/method_update.go → ...elic/2024-03-01/monitors/method_update.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...22-07-01/monitors/method_vmhostpayload.go → ...24-03-01/monitors/method_vmhostpayload.go
View file
Open in desktop
File renamed without changes.
0 .../2022-07-01/monitors/model_accountinfo.go → .../2024-03-01/monitors/model_accountinfo.go
View file
Open in desktop
File renamed without changes.
0 ...22-07-01/monitors/model_appserviceinfo.go → ...24-03-01/monitors/model_appserviceinfo.go
View file
Open in desktop
File renamed without changes.
0 ...1/monitors/model_appservicesgetrequest.go → ...1/monitors/model_appservicesgetrequest.go
View file
Open in desktop
File renamed without changes.
0 ...2022-07-01/monitors/model_filteringtag.go → ...2024-03-01/monitors/model_filteringtag.go
View file
Open in desktop
File renamed without changes.
0 ...2-07-01/monitors/model_hostsgetrequest.go → ...4-03-01/monitors/model_hostsgetrequest.go
View file
Open in desktop
File renamed without changes.
0 .../2022-07-01/monitors/model_metricrules.go → .../2024-03-01/monitors/model_metricrules.go
View file
Open in desktop
File renamed without changes.
0 ...22-07-01/monitors/model_metricsrequest.go → ...24-03-01/monitors/model_metricsrequest.go
View file
Open in desktop
File renamed without changes.
0 ...01/monitors/model_metricsstatusrequest.go → ...01/monitors/model_metricsstatusrequest.go
View file
Open in desktop
File renamed without changes.
0 ...1/monitors/model_metricsstatusresponse.go → ...1/monitors/model_metricsstatusresponse.go
View file
Open in desktop
File renamed without changes.
0 ...07-01/monitors/model_monitoredresource.go → ...03-01/monitors/model_monitoredresource.go
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions ...07-01/monitors/model_monitorproperties.go → ...03-01/monitors/model_monitorproperties.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...nitors/model_newrelicaccountproperties.go → ...nitors/model_newrelicaccountproperties.go
View file
Open in desktop
File renamed without changes.
0 ...monitors/model_newrelicmonitorresource.go → ...monitors/model_newrelicmonitorresource.go
View file
Open in desktop
File renamed without changes.
0 ...rs/model_newrelicmonitorresourceupdate.go → ...rs/model_newrelicmonitorresourceupdate.go
View file
Open in desktop
File renamed without changes.
0 ...ewrelicmonitorresourceupdateproperties.go → ...ewrelicmonitorresourceupdateproperties.go
View file
Open in desktop
File renamed without changes.
0 ...s/model_newrelicsinglesignonproperties.go → ...s/model_newrelicsinglesignonproperties.go
View file
Open in desktop
File renamed without changes.
0 ...-07-01/monitors/model_organizationinfo.go → ...-03-01/monitors/model_organizationinfo.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...lic/2022-07-01/monitors/model_plandata.go → ...lic/2024-03-01/monitors/model_plandata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...01/monitors/model_switchbillingrequest.go → ...01/monitors/model_switchbillingrequest.go
View file
Open in desktop
File renamed without changes.
0 ...lic/2022-07-01/monitors/model_userinfo.go → ...lic/2024-03-01/monitors/model_userinfo.go
View file
Open in desktop
File renamed without changes.
0 ...7-01/monitors/model_vmextensionpayload.go → ...3-01/monitors/model_vmextensionpayload.go
View file
Open in desktop
File renamed without changes.
0 ...relic/2022-07-01/monitors/model_vminfo.go → ...relic/2024-03-01/monitors/model_vminfo.go
View file
Open in desktop
File renamed without changes.
0 ...ewrelic/2022-07-01/monitors/predicates.go → ...ewrelic/2024-03-01/monitors/predicates.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...r/newrelic/2022-07-01/monitors/version.go → ...r/newrelic/2024-03-01/monitors/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...er/newrelic/2022-07-01/tagrules/README.md → ...er/newrelic/2024-03-01/tagrules/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...er/newrelic/2022-07-01/tagrules/client.go → ...er/newrelic/2024-03-01/tagrules/client.go
View file
Open in desktop
File renamed without changes.
0 ...newrelic/2022-07-01/tagrules/constants.go → ...newrelic/2024-03-01/tagrules/constants.go
View file
Open in desktop
File renamed without changes.
0 ...ewrelic/2022-07-01/tagrules/id_monitor.go → ...ewrelic/2024-03-01/tagrules/id_monitor.go
View file
Open in desktop
File renamed without changes.
0 ...ewrelic/2022-07-01/tagrules/id_tagrule.go → ...ewrelic/2024-03-01/tagrules/id_tagrule.go
View file
Open in desktop
File renamed without changes.
0 ...2-07-01/tagrules/method_createorupdate.go → ...4-03-01/tagrules/method_createorupdate.go
View file
Open in desktop
File renamed without changes.
0 ...elic/2022-07-01/tagrules/method_delete.go → ...elic/2024-03-01/tagrules/method_delete.go
View file
Open in desktop
File renamed without changes.
0 ...ewrelic/2022-07-01/tagrules/method_get.go → ...ewrelic/2024-03-01/tagrules/method_get.go
View file
Open in desktop
File renamed without changes.
0 ...s/method_listbynewrelicmonitorresource.go → ...s/method_listbynewrelicmonitorresource.go
View file
Open in desktop
File renamed without changes.
0 ...elic/2022-07-01/tagrules/method_update.go → ...elic/2024-03-01/tagrules/method_update.go
View file
Open in desktop
File renamed without changes.
0 ...2022-07-01/tagrules/model_filteringtag.go → ...2024-03-01/tagrules/model_filteringtag.go
View file
Open in desktop
File renamed without changes.
0 ...lic/2022-07-01/tagrules/model_logrules.go → ...lic/2024-03-01/tagrules/model_logrules.go
View file
Open in desktop
File renamed without changes.
0 .../2022-07-01/tagrules/model_metricrules.go → .../2024-03-01/tagrules/model_metricrules.go
View file
Open in desktop
File renamed without changes.
0 ...les/model_monitoringtagrulesproperties.go → ...les/model_monitoringtagrulesproperties.go
View file
Open in desktop
File renamed without changes.
0 ...elic/2022-07-01/tagrules/model_tagrule.go → ...elic/2024-03-01/tagrules/model_tagrule.go
View file
Open in desktop
File renamed without changes.
0 ...022-07-01/tagrules/model_tagruleupdate.go → ...024-03-01/tagrules/model_tagruleupdate.go
View file
Open in desktop
File renamed without changes.
0 ...tagrules/model_tagruleupdateproperties.go → ...tagrules/model_tagruleupdateproperties.go
View file
Open in desktop
File renamed without changes.
0 ...ewrelic/2022-07-01/tagrules/predicates.go → ...ewrelic/2024-03-01/tagrules/predicates.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...r/newrelic/2022-07-01/tagrules/version.go → ...r/newrelic/2024-03-01/tagrules/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,8 +851,8 @@ github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-11-01/webapplica
github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-11-01/webcategories
github.com/hashicorp/go-azure-sdk/resource-manager/networkfunction/2022-11-01/azuretrafficcollectors
github.com/hashicorp/go-azure-sdk/resource-manager/networkfunction/2022-11-01/collectorpolicies
github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/monitors
github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2022-07-01/tagrules
github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/monitors
github.com/hashicorp/go-azure-sdk/resource-manager/newrelic/2024-03-01/tagrules
github.com/hashicorp/go-azure-sdk/resource-manager/nginx/2024-01-01-preview
github.com/hashicorp/go-azure-sdk/resource-manager/nginx/2024-01-01-preview/nginxcertificate
github.com/hashicorp/go-azure-sdk/resource-manager/nginx/2024-01-01-preview/nginxconfiguration
Expand Down
Loading