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_security_center_subscription_pricing: Upgrade to API 2023-01-01 #21531

Merged
merged 1 commit into from
Apr 25, 2023
Merged

azurerm_security_center_subscription_pricing: Upgrade to API 2023-01-01 #21531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions internal/services/securitycenter/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package client

import (
"github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v3.0/security" // nolint: staticcheck
pricings_v2022_03_01 "github.com/hashicorp/go-azure-sdk/resource-manager/security/2022-03-01/pricings"
pricings_v2023_01_01 "github.com/hashicorp/go-azure-sdk/resource-manager/security/2023-01-01/pricings"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

Expand All @@ -12,7 +12,7 @@ type Client struct {
ContactsClient *security.ContactsClient
DeviceSecurityGroupsClient *security.DeviceSecurityGroupsClient
IotSecuritySolutionClient *security.IotSecuritySolutionClient
PricingClient *pricings_v2022_03_01.PricingsClient
PricingClient *pricings_v2023_01_01.PricingsClient
WorkspaceClient *security.WorkspaceSettingsClient
AdvancedThreatProtectionClient *security.AdvancedThreatProtectionClient
AutoProvisioningClient *security.AutoProvisioningSettingsClient
Expand All @@ -39,7 +39,7 @@ func NewClient(o *common.ClientOptions) *Client {
IotSecuritySolutionClient := security.NewIotSecuritySolutionClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId, ascLocation)
o.ConfigureClient(&IotSecuritySolutionClient.Client, o.ResourceManagerAuthorizer)

PricingClient := pricings_v2022_03_01.NewPricingsClientWithBaseURI(o.ResourceManagerEndpoint)
PricingClient := pricings_v2023_01_01.NewPricingsClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&PricingClient.Client, o.ResourceManagerAuthorizer)

WorkspaceClient := security.NewWorkspaceSettingsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId, ascLocation)
Expand Down
12 changes: 6 additions & 6 deletions internal/services/securitycenter/security_center_subscription_pricing_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v3.0/security" // nolint: staticcheck
"github.com/hashicorp/go-azure-helpers/lang/response"
pricings_v2022_03_01 "github.com/hashicorp/go-azure-sdk/resource-manager/security/2022-03-01/pricings"
pricings_v2023_01_01 "github.com/hashicorp/go-azure-sdk/resource-manager/security/2023-01-01/pricings"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/securitycenter/migration"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/securitycenter/parse"
Expand Down Expand Up @@ -87,10 +87,10 @@ func resourceSecurityCenterSubscriptionPricingUpdate(d *pluginsdk.ResourceData,

// TODO: add a requires import check ensuring this is != Free (meaning we should likely remove Free as a SKU option?)

id := pricings_v2022_03_01.NewPricingID(subscriptionId, d.Get("resource_type").(string))
pricing := pricings_v2022_03_01.Pricing{
Properties: &pricings_v2022_03_01.PricingProperties{
PricingTier: pricings_v2022_03_01.PricingTier(d.Get("tier").(string)),
id := pricings_v2023_01_01.NewPricingID(subscriptionId, d.Get("resource_type").(string))
pricing := pricings_v2023_01_01.Pricing{
Properties: &pricings_v2023_01_01.PricingProperties{
PricingTier: pricings_v2023_01_01.PricingTier(d.Get("tier").(string)),
},
}

Expand All @@ -111,7 +111,7 @@ func resourceSecurityCenterSubscriptionPricingRead(d *pluginsdk.ResourceData, me
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

id, err := pricings_v2022_03_01.ParsePricingID(d.Id())
id, err := pricings_v2023_01_01.ParsePricingID(d.Id())
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/services/securitycenter/security_center_subscription_pricing_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

pricings_v2022_03_01 "github.com/hashicorp/go-azure-sdk/resource-manager/security/2022-03-01/pricings"
pricings_v2023_01_01 "github.com/hashicorp/go-azure-sdk/resource-manager/security/2023-01-01/pricings"
"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 Expand Up @@ -108,7 +108,7 @@ func TestAccSecurityCenterSubscriptionPricing_storageAccountSubplan(t *testing.T
}

func (SecurityCenterSubscriptionPricingResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
id, err := pricings_v2022_03_01.ParsePricingIDInsensitively(state.ID)
id, err := pricings_v2023_01_01.ParsePricingIDInsensitively(state.ID)
if err != nil {
return nil, err
}
Expand Down
34 changes: 0 additions & 34 deletions ...hub.com/hashicorp/go-azure-sdk/resource-manager/security/2022-03-01/pricings/constants.go
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...orp/go-azure-sdk/resource-manager/security/2022-03-01/pricings/model_pricingproperties.go
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...er/security/2022-03-01/pricings/README.md → ...er/security/2023-01-01/pricings/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/security/2022-03-01/pricings/client.go → ...er/security/2023-01-01/pricings/client.go
View file
Open in desktop
File renamed without changes.
90 changes: 90 additions & 0 deletions ...hub.com/hashicorp/go-azure-sdk/resource-manager/security/2023-01-01/pricings/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 ...ecurity/2022-03-01/pricings/id_pricing.go → ...ecurity/2023-01-01/pricings/id_pricing.go
View file
Open in desktop
File renamed without changes.
0 ...022-03-01/pricings/method_get_autorest.go → ...023-01-01/pricings/method_get_autorest.go
View file
Open in desktop
File renamed without changes.
0 ...22-03-01/pricings/method_list_autorest.go → ...23-01-01/pricings/method_list_autorest.go
View file
Open in desktop
File renamed without changes.
0 ...-03-01/pricings/method_update_autorest.go → ...-01-01/pricings/method_update_autorest.go
View file
Open in desktop
File renamed without changes.
11 changes: 11 additions & 0 deletions ...m/hashicorp/go-azure-sdk/resource-manager/security/2023-01-01/pricings/model_extension.go
View file
Open in desktop

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

9 changes: 9 additions & 0 deletions ...icorp/go-azure-sdk/resource-manager/security/2023-01-01/pricings/model_operationstatus.go
View file
Open in desktop

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

0 ...rity/2022-03-01/pricings/model_pricing.go → ...rity/2023-01-01/pricings/model_pricing.go
View file
Open in desktop
File renamed without changes.
0 .../2022-03-01/pricings/model_pricinglist.go → .../2023-01-01/pricings/model_pricinglist.go
View file
Open in desktop
File renamed without changes.
32 changes: 32 additions & 0 deletions ...orp/go-azure-sdk/resource-manager/security/2023-01-01/pricings/model_pricingproperties.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion ...r/security/2022-03-01/pricings/version.go → ...r/security/2023-01-01/pricings/version.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/adminkeys
github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/querykeys
github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/services
github.com/hashicorp/go-azure-sdk/resource-manager/search/2022-09-01/sharedprivatelinkresources
github.com/hashicorp/go-azure-sdk/resource-manager/security/2022-03-01/pricings
github.com/hashicorp/go-azure-sdk/resource-manager/security/2023-01-01/pricings
github.com/hashicorp/go-azure-sdk/resource-manager/securityinsights/2022-10-01-preview/alertrules
github.com/hashicorp/go-azure-sdk/resource-manager/securityinsights/2022-10-01-preview/automationrules
github.com/hashicorp/go-azure-sdk/resource-manager/securityinsights/2022-10-01-preview/metadata
Expand Down