-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow to set security center pricing tier for a particular resource type
At the moment, only Virtual Machines are set with the security center standard or free pricing tiers when using `azurerm_security_center_subscription_pricing`. This change adds the field `resource_type`, which allows to specify the resource type for which we want to update the pricing tier. The v1 security center pricing client only allows to get the pricing tier of the default resource type (Virtual Machines) to check whether the subscription has standard or free security center pricing tier. However, a partial standard pricing tier (where one or more resource types have standar tier enabled) allows for a security center workspace to be created. This commit changes the client to v3 and checks if any resource type in the subscription has standard pricing tier enabled, and if so, it allows the creation of a security center workspace.
- Loading branch information
Showing
60 changed files
with
36,651 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
azurerm/internal/services/securitycenter/parse/security_center_subscription_pricing.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package parse | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" | ||
| ) | ||
|
|
||
| type SecurityCenterSubscriptionPricingId struct { | ||
| ResourceType string | ||
| } | ||
|
|
||
| func SecurityCenterSubscriptionPricingID(input string) (*SecurityCenterSubscriptionPricingId, error) { | ||
| id, err := azure.ParseAzureResourceID(input) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to parse Security Center Subscription Pricing ID %q: %+v", input, err) | ||
| } | ||
|
|
||
| pricing := SecurityCenterSubscriptionPricingId{} | ||
|
|
||
| if pricing.ResourceType, err = id.PopSegment("pricings"); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err := id.ValidateNoEmptySegments(input); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &pricing, nil | ||
| } |
54 changes: 54 additions & 0 deletions
54
azurerm/internal/services/securitycenter/parse/security_center_subscription_pricing_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package parse | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestSecurityCenterSubscriptionPricingID(t *testing.T) { | ||
| testData := []struct { | ||
| ResourceType string | ||
| Input string | ||
| Error bool | ||
| Expect *SecurityCenterSubscriptionPricingId | ||
| }{ | ||
| { | ||
| ResourceType: "Empty", | ||
| Input: "", | ||
| Error: true, | ||
| }, | ||
| { | ||
| ResourceType: "No Pricings Segment", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000", | ||
| Error: true, | ||
| }, | ||
| { | ||
| ResourceType: "No Pricings Value", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/pricings/", | ||
| Error: true, | ||
| }, | ||
| { | ||
| ResourceType: "Security Center Subscription Pricing ID", | ||
| Input: "/subscriptions/00000000-0000-0000-0000-000000000000/pricings/VirtualMachines", | ||
| Expect: &SecurityCenterSubscriptionPricingId{ | ||
| ResourceType: "VirtualMachines", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, v := range testData { | ||
| t.Logf("[DEBUG] Testing %q", v.ResourceType) | ||
|
|
||
| actual, err := SecurityCenterSubscriptionPricingID(v.Input) | ||
| if err != nil { | ||
| if v.Error { | ||
| continue | ||
| } | ||
|
|
||
| t.Fatalf("Expected a value but got an error: %s", err) | ||
| } | ||
|
|
||
| if actual.ResourceType != v.Expect.ResourceType { | ||
| t.Fatalf("Expected %q but got %q for ResourceType", v.Expect.ResourceType, actual.ResourceType) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...al/services/securitycenter/resource_arm_security_center_subscription_pricing_migration.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package securitycenter | ||
|
|
||
| import ( | ||
| "log" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/preview/security/mgmt/v3.0/security" | ||
| "github.com/hashicorp/terraform-plugin-sdk/helper/schema" | ||
| "github.com/hashicorp/terraform-plugin-sdk/helper/validation" | ||
| ) | ||
|
|
||
| func ResourceArmSecurityCenterSubscriptionPricingV0() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "tier": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validation.StringInSlice([]string{ | ||
| string(security.Free), | ||
| string(security.Standard), | ||
| }, false), | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func ResourceArmSecurityCenterSubscriptionPricingUpgradeV0ToV1(rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) { | ||
| log.Println("[DEBUG] Migrating ResourceType from v0 to v1 format") | ||
|
|
||
| rawState["resource_type"] = "VirtualMachines" | ||
|
|
||
| return rawState, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.