Skip to content

Commit bc8388e

Browse files
Copilottobio
Copilot
and
tobio
committed
Fix linting issues and regenerate documentation
Co-authored-by: tobio <[email protected]>
1 parent 668e370 commit bc8388e

File tree

4 files changed

+78
-68
lines changed

4 files changed

+78
-68
lines changed

‎docs/resources/fleet_agent_policy.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
5757
- `monitor_metrics` (Boolean) Enable collection of agent metrics.
5858
- `monitoring_output_id` (String) The identifier for monitoring output.
5959
- `policy_id` (String) Unique identifier of the agent policy.
60+
- `required_versions` (Set of Object) Specifies target agent versions for automatic upgrade. Each entry contains a version string and a percentage of agents to upgrade to that version. Multiple entries with the same version are not allowed. (see [below for nested schema](#nestedatt--required_versions))
6061
- `skip_destroy` (Boolean) Set to true if you do not wish the agent policy to be deleted at destroy time, and instead just remove the agent policy from the Terraform state.
6162
- `space_ids` (Set of String) The Kibana space IDs that this agent policy should be available in. When not specified, defaults to ["default"]. Note: The order of space IDs does not matter as this is a set.
6263
- `supports_agentless` (Boolean) Set to true to enable agentless data collection.
@@ -75,6 +76,15 @@ Optional:
7576
- `number_value` (Number) Number value for the field. If this is set, string_value must not be defined.
7677
- `string_value` (String) String value for the field. If this is set, number_value must not be defined.
7778

79+
80+
<a id="nestedatt--required_versions"></a>
81+
### Nested Schema for `required_versions`
82+
83+
Optional:
84+
85+
- `percentage` (Number)
86+
- `version` (String)
87+
7888
## Import
7989

8090
Import is supported using the following syntax:

‎internal/fleet/agent_policy/acc_test.go‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -801,71 +801,71 @@ resource "elasticstack_fleet_agent_policy" "test_policy" {
801801
}
802802

803803
func TestAccResourceAgentPolicyWithRequiredVersions(t *testing.T) {
804-
policyName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlphaNum)
805-
806-
resource.Test(t, resource.TestCase{
807-
PreCheck: func() { acctest.PreCheck(t) },
808-
CheckDestroy: checkResourceAgentPolicyDestroy,
809-
ProtoV6ProviderFactories: acctest.Providers,
810-
Steps: []resource.TestStep{
811-
{
812-
SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
813-
Config: testAccResourceAgentPolicyCreateWithRequiredVersions(policyName),
814-
Check: resource.ComposeTestCheckFunc(
815-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Policy %s", policyName)),
816-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
817-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "required_versions.#", "1"),
818-
resource.TestCheckTypeSetElemNestedAttrs("elasticstack_fleet_agent_policy.test_policy", "required_versions.*", map[string]string{
819-
"version": "8.15.0",
820-
"percentage": "100",
821-
}),
822-
),
823-
},
824-
{
825-
SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
826-
Config: testAccResourceAgentPolicyUpdateRequiredVersionsPercentage(policyName),
827-
Check: resource.ComposeTestCheckFunc(
828-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Policy %s", policyName)),
829-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
830-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "required_versions.#", "1"),
831-
resource.TestCheckTypeSetElemNestedAttrs("elasticstack_fleet_agent_policy.test_policy", "required_versions.*", map[string]string{
832-
"version": "8.15.0",
833-
"percentage": "50",
834-
}),
835-
),
836-
},
837-
{
838-
SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
839-
Config: testAccResourceAgentPolicyAddRequiredVersion(policyName),
840-
Check: resource.ComposeTestCheckFunc(
841-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Policy %s", policyName)),
842-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
843-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "required_versions.#", "2"),
844-
resource.TestCheckTypeSetElemNestedAttrs("elasticstack_fleet_agent_policy.test_policy", "required_versions.*", map[string]string{
845-
"version": "8.15.0",
846-
"percentage": "50",
847-
}),
848-
resource.TestCheckTypeSetElemNestedAttrs("elasticstack_fleet_agent_policy.test_policy", "required_versions.*", map[string]string{
849-
"version": "8.16.0",
850-
"percentage": "50",
851-
}),
852-
),
853-
},
854-
{
855-
SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
856-
Config: testAccResourceAgentPolicyRemoveRequiredVersions(policyName),
857-
Check: resource.ComposeTestCheckFunc(
858-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Policy %s", policyName)),
859-
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
860-
resource.TestCheckNoResourceAttr("elasticstack_fleet_agent_policy.test_policy", "required_versions"),
861-
),
862-
},
863-
},
864-
})
804+
policyName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlphaNum)
805+
806+
resource.Test(t, resource.TestCase{
807+
PreCheck: func() { acctest.PreCheck(t) },
808+
CheckDestroy: checkResourceAgentPolicyDestroy,
809+
ProtoV6ProviderFactories: acctest.Providers,
810+
Steps: []resource.TestStep{
811+
{
812+
SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
813+
Config: testAccResourceAgentPolicyCreateWithRequiredVersions(policyName),
814+
Check: resource.ComposeTestCheckFunc(
815+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Policy %s", policyName)),
816+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
817+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "required_versions.#", "1"),
818+
resource.TestCheckTypeSetElemNestedAttrs("elasticstack_fleet_agent_policy.test_policy", "required_versions.*", map[string]string{
819+
"version": "8.15.0",
820+
"percentage": "100",
821+
}),
822+
),
823+
},
824+
{
825+
SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
826+
Config: testAccResourceAgentPolicyUpdateRequiredVersionsPercentage(policyName),
827+
Check: resource.ComposeTestCheckFunc(
828+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Policy %s", policyName)),
829+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
830+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "required_versions.#", "1"),
831+
resource.TestCheckTypeSetElemNestedAttrs("elasticstack_fleet_agent_policy.test_policy", "required_versions.*", map[string]string{
832+
"version": "8.15.0",
833+
"percentage": "50",
834+
}),
835+
),
836+
},
837+
{
838+
SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
839+
Config: testAccResourceAgentPolicyAddRequiredVersion(policyName),
840+
Check: resource.ComposeTestCheckFunc(
841+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Policy %s", policyName)),
842+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
843+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "required_versions.#", "2"),
844+
resource.TestCheckTypeSetElemNestedAttrs("elasticstack_fleet_agent_policy.test_policy", "required_versions.*", map[string]string{
845+
"version": "8.15.0",
846+
"percentage": "50",
847+
}),
848+
resource.TestCheckTypeSetElemNestedAttrs("elasticstack_fleet_agent_policy.test_policy", "required_versions.*", map[string]string{
849+
"version": "8.16.0",
850+
"percentage": "50",
851+
}),
852+
),
853+
},
854+
{
855+
SkipFunc: versionutils.CheckIfVersionIsUnsupported(minVersionAgentPolicy),
856+
Config: testAccResourceAgentPolicyRemoveRequiredVersions(policyName),
857+
Check: resource.ComposeTestCheckFunc(
858+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "name", fmt.Sprintf("Policy %s", policyName)),
859+
resource.TestCheckResourceAttr("elasticstack_fleet_agent_policy.test_policy", "namespace", "default"),
860+
resource.TestCheckNoResourceAttr("elasticstack_fleet_agent_policy.test_policy", "required_versions"),
861+
),
862+
},
863+
},
864+
})
865865
}
866866

867867
func testAccResourceAgentPolicyCreateWithRequiredVersions(id string) string {
868-
return fmt.Sprintf(`
868+
return fmt.Sprintf(`
869869
provider "elasticstack" {
870870
elasticsearch {}
871871
kibana {}
@@ -893,7 +893,7 @@ data "elasticstack_fleet_enrollment_tokens" "test_policy" {
893893
}
894894

895895
func testAccResourceAgentPolicyUpdateRequiredVersionsPercentage(id string) string {
896-
return fmt.Sprintf(`
896+
return fmt.Sprintf(`
897897
provider "elasticstack" {
898898
elasticsearch {}
899899
kibana {}
@@ -921,7 +921,7 @@ data "elasticstack_fleet_enrollment_tokens" "test_policy" {
921921
}
922922

923923
func testAccResourceAgentPolicyAddRequiredVersion(id string) string {
924-
return fmt.Sprintf(`
924+
return fmt.Sprintf(`
925925
provider "elasticstack" {
926926
elasticsearch {}
927927
kibana {}
@@ -953,7 +953,7 @@ data "elasticstack_fleet_enrollment_tokens" "test_policy" {
953953
}
954954

955955
func testAccResourceAgentPolicyRemoveRequiredVersions(id string) string {
956-
return fmt.Sprintf(`
956+
return fmt.Sprintf(`
957957
provider "elasticstack" {
958958
elasticsearch {}
959959
kibana {}

‎internal/fleet/agent_policy/models.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func (model *agentPolicyModel) populateFromAPI(ctx context.Context, data *kbapi.
139139
if data.RequiredVersions != nil && len(*data.RequiredVersions) > 0 {
140140
elemType := getRequiredVersionsElementType()
141141
elements := make([]attr.Value, 0, len(*data.RequiredVersions))
142-
142+
143143
for _, rv := range *data.RequiredVersions {
144144
objValue, d := types.ObjectValue(
145145
map[string]attr.Type{
@@ -156,7 +156,7 @@ func (model *agentPolicyModel) populateFromAPI(ctx context.Context, data *kbapi.
156156
}
157157
elements = append(elements, objValue)
158158
}
159-
159+
160160
reqVersions, d := NewRequiredVersionsValue(elemType, elements)
161161
if d.HasError() {
162162
return d

‎internal/fleet/agent_policy/required_versions_value.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type RequiredVersionsValue struct {
2424
func (v RequiredVersionsValue) Type(ctx context.Context) attr.Type {
2525
return RequiredVersionsType{
2626
SetType: basetypes.SetType{
27-
ElemType: v.SetValue.ElementType(ctx),
27+
ElemType: v.ElementType(ctx),
2828
},
2929
}
3030
}

0 commit comments

Comments
 (0)