Skip to content

Commit

Permalink
chore: PC-13868 Fix composite 2.0 block uniqueness (#285)
Browse files Browse the repository at this point in the history
  • Loading branch information
BSski authored Aug 22, 2024
1 parent 181ffdd commit 08fb472
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ NAMESPACE=nobl9
NAME=nobl9
BIN_DIR=./bin
BINARY=$(BIN_DIR)/terraform-provider-$(NAME)
VERSION=0.28.0
VERSION=0.29.0
BUILD_FLAGS="-X github.com/nobl9/terraform-provider-nobl9/nobl9.Version=$(VERSION)"
OS_ARCH?=linux_amd64

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ terraform {
required_providers {
nobl9 = {
source = "nobl9/nobl9"
version = "0.28.0"
version = "0.29.0"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions docs/resources/slo.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ Required:

Optional:

- `composite` (Block Set) An assembly of objectives from different SLOs reflecting their combined performance. (see [below for nested schema](#nestedblock--objective--composite))
- `composite` (Block Set, Max: 1) An assembly of objectives from different SLOs reflecting their combined performance. (see [below for nested schema](#nestedblock--objective--composite))
- `count_metrics` (Block Set) Compares two time series, calculating the ratio of either good or bad values to the total number of values. Fill either the 'good' or 'bad' series, but not both. (see [below for nested schema](#nestedblock--objective--count_metrics))
- `display_name` (String) Name to be displayed.
- `name` (String) Objective's name. This field is computed if not provided.
Expand All @@ -247,14 +247,14 @@ Required:

Optional:

- `components` (Block Set) Objectives to be assembled in your composite SLO. (see [below for nested schema](#nestedblock--objective--composite--components))
- `components` (Block Set, Max: 1) Objectives to be assembled in your composite SLO. (see [below for nested schema](#nestedblock--objective--composite--components))

<a id="nestedblock--objective--composite--components"></a>
### Nested Schema for `objective.composite.components`

Optional:

- `objectives` (Block Set) An additional nesting for the components of your composite SLO. (see [below for nested schema](#nestedblock--objective--composite--components--objectives))
- `objectives` (Block Set, Max: 1) An additional nesting for the components of your composite SLO. (see [below for nested schema](#nestedblock--objective--composite--components--objectives))

<a id="nestedblock--objective--composite--components--objectives"></a>
### Nested Schema for `objective.composite.components.objectives`
Expand Down
1 change: 1 addition & 0 deletions nobl9/resource_slo.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ func resourceObjective() *schema.Resource {
Type: schema.TypeSet,
Optional: true,
Description: "An assembly of objectives from different SLOs reflecting their combined performance.",
MaxItems: 1,
Elem: resourceComposite(),
},
"display_name": {
Expand Down
2 changes: 2 additions & 0 deletions nobl9/resource_slo_composite.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ func resourceComposite() *schema.Resource {
Type: schema.TypeSet,
Optional: true,
Description: "Objectives to be assembled in your composite SLO.",
MaxItems: 1,
Elem: resourceCompositeComponents(),
},
},
Expand All @@ -33,6 +34,7 @@ func resourceCompositeComponents() *schema.Resource {
Type: schema.TypeSet,
Optional: true,
Description: "An additional nesting for the components of your composite SLO.",
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"composite_objective": {
Expand Down

0 comments on commit 08fb472

Please sign in to comment.