Skip to content

Commit

Permalink
Consumption - fix failed tests (#18354)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ms-zhenhua
ms-zhenhua authored Sep 15, 2022
1 parent 95e75ab commit d9ee27c
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 105 deletions.
151 changes: 79 additions & 72 deletions internal/services/consumption/consumption_budget_base.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"fmt"
"time"

"github.com/hashicorp/terraform-provider-azurerm/internal/features"

"github.com/Azure/go-autorest/autorest/date"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/consumption/2019-10-01/budgets"
Expand Down Expand Up @@ -127,78 +129,6 @@ func (br consumptionBudgetBaseResource) arguments(fields map[string]*pluginsdk.S
},
},
},
"not": {
Type: pluginsdk.TypeList,
Optional: true,
MaxItems: 1,
AtLeastOneOf: []string{"filter.0.dimension", "filter.0.tag", "filter.0.not"},
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"dimension": {
Type: pluginsdk.TypeList,
MaxItems: 1,
Optional: true,
ExactlyOneOf: []string{"filter.0.not.0.tag"},
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"name": {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(getDimensionNames(), false),
},
"operator": {
Type: pluginsdk.TypeString,
Optional: true,
Default: "In",
ValidateFunc: validation.StringInSlice([]string{
"In",
}, false),
},
"values": {
Type: pluginsdk.TypeList,
MinItems: 1,
Required: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
},
},
},
},
},
"tag": {
Type: pluginsdk.TypeList,
MaxItems: 1,
Optional: true,
ExactlyOneOf: []string{"filter.0.not.0.dimension"},
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"name": {
Type: pluginsdk.TypeString,
Required: true,
},
"operator": {
Type: pluginsdk.TypeString,
Optional: true,
Default: "In",
ValidateFunc: validation.StringInSlice([]string{
"In",
}, false),
},
"values": {
Type: pluginsdk.TypeList,
Required: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
},
},
},
},
},
},
},
},
},
},
},
Expand Down Expand Up @@ -311,6 +241,83 @@ func (br consumptionBudgetBaseResource) arguments(fields map[string]*pluginsdk.S
},
},
}

if !features.FourPointOhBeta() {
output["filter"].Elem.(*pluginsdk.Resource).Schema["not"] = &pluginsdk.Schema{
Type: pluginsdk.TypeList,
Optional: true,
MaxItems: 1,
Deprecated: "This property has been deprecated as the API no longer supports it and will be removed in version 4.0 of the provider.",
AtLeastOneOf: []string{"filter.0.dimension", "filter.0.tag", "filter.0.not"},
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"dimension": {
Type: pluginsdk.TypeList,
MaxItems: 1,
Optional: true,
ExactlyOneOf: []string{"filter.0.not.0.tag"},
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"name": {
Type: pluginsdk.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(getDimensionNames(), false),
},
"operator": {
Type: pluginsdk.TypeString,
Optional: true,
Default: "In",
ValidateFunc: validation.StringInSlice([]string{
"In",
}, false),
},
"values": {
Type: pluginsdk.TypeList,
MinItems: 1,
Required: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
},
},
},
},
},
"tag": {
Type: pluginsdk.TypeList,
MaxItems: 1,
Optional: true,
ExactlyOneOf: []string{"filter.0.not.0.dimension"},
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"name": {
Type: pluginsdk.TypeString,
Required: true,
},
"operator": {
Type: pluginsdk.TypeString,
Optional: true,
Default: "In",
ValidateFunc: validation.StringInSlice([]string{
"In",
}, false),
},
"values": {
Type: pluginsdk.TypeList,
Required: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
},
},
},
},
},
},
},
}
}

// Consumption Budgets for Management Groups have a different notification schema,
// here we override the notification schema in the base resource
for k, v := range fields {
Expand Down
10 changes: 0 additions & 10 deletions internal/services/consumption/consumption_budget_management_group_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,16 +299,6 @@ resource "azurerm_consumption_budget_management_group" "test" {
"baz",
]
}
not {
tag {
name = "zip"
values = [
"zap",
"zop"
]
}
}
}
notification {
Expand Down
10 changes: 0 additions & 10 deletions internal/services/consumption/consumption_budget_resource_group_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,16 +309,6 @@ resource "azurerm_consumption_budget_resource_group" "test" {
"baz",
]
}
not {
tag {
name = "zip"
values = [
"zap",
"zop"
]
}
}
}
notification {
Expand Down
10 changes: 0 additions & 10 deletions internal/services/consumption/consumption_budget_subscription_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,16 +294,6 @@ resource "azurerm_consumption_budget_subscription" "test" {
"baz",
]
}
not {
tag {
name = "zip"
values = [
"zap",
"zop"
]
}
}
}
notification {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/consumption_budget_management_group.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ A `filter` block supports the following:

* `tag` - (Optional) One or more `tag` blocks as defined below to filter the budget on.

* `not` - (Optional) A `not` block as defined below to filter the budget on.
* `not` - (Optional) A `not` block as defined below to filter the budget on. This is deprecated as the API no longer supports it and will be removed in version 4.0 of the provider.

---

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/consumption_budget_resource_group.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ A `filter` block supports the following:

* `tag` - (Optional) One or more `tag` blocks as defined below to filter the budget on.

* `not` - (Optional) A `not` block as defined below to filter the budget on.
* `not` - (Optional) A `not` block as defined below to filter the budget on. This is deprecated as the API no longer supports it and will be removed in version 4.0 of the provider.

---

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/consumption_budget_subscription.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ A `filter` block supports the following:

* `tag` - (Optional) One or more `tag` blocks as defined below to filter the budget on.

* `not` - (Optional) A `not` block as defined below to filter the budget on.
* `not` - (Optional) A `not` block as defined below to filter the budget on. This is deprecated as the API no longer supports it and will be removed in version 4.0 of the provider.

---

Expand Down

0 comments on commit d9ee27c

Please sign in to comment.