Skip to content

Commit b794328

Browse files
committed
Regenerate, update implementation
1 parent d023e7b commit b794328

File tree

5 files changed

+9576
-21
lines changed

5 files changed

+9576
-21
lines changed

generated/fleet/fleet.gen.go

Lines changed: 82 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/fleet/agent_policy_resource.go

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,27 @@ func resourceAgentPolicyUpdate(ctx context.Context, d *schema.ResourceData, meta
252252
return diag.FromErr(fmt.Errorf("'global_data_tags' is supported only for Elasticsearch v%s and above", minVersionGlobalDataTags.String()))
253253
}
254254

255-
globalDataTags := make([]fleetapi.GlobalDataTag, 0, len(tagMap))
256-
for key, value := range tagMap {
257-
globalDataTags = append(globalDataTags, fleetapi.GlobalDataTag{
258-
Name: key,
259-
Value: value.(string),
255+
globalDataTags := []map[string]fleetapi.AgentPolicyUpdateRequest_GlobalDataTags_AdditionalProperties{}
256+
for key, val := range tagMap {
257+
var name, value fleetapi.AgentPolicyUpdateRequest_GlobalDataTags_AdditionalProperties
258+
err := name.FromAgentPolicyUpdateRequestGlobalDataTags0(key)
259+
if err != nil {
260+
return diag.FromErr(err)
261+
}
262+
263+
err = value.FromAgentPolicyUpdateRequestGlobalDataTags0(val.(string))
264+
if err != nil {
265+
return diag.FromErr(err)
266+
}
267+
268+
globalDataTags = append(globalDataTags, map[string]fleetapi.AgentPolicyUpdateRequest_GlobalDataTags_AdditionalProperties{
269+
"name": name,
270+
"value": value,
260271
})
261272
}
262-
req.GlobalDataTags = globalDataTags
273+
req.GlobalDataTags = &globalDataTags
263274
} else {
264-
req.GlobalDataTags = make([]fleetapi.GlobalDataTag, 0) // Ensure it's an empty array
275+
req.GlobalDataTags = &[]map[string]fleetapi.AgentPolicyUpdateRequest_GlobalDataTags_AdditionalProperties{} // Ensure it's an empty array
265276
}
266277

267278
_, diags = fleet.UpdateAgentPolicy(ctx, fleetClient, d.Id(), req)
@@ -351,9 +362,18 @@ func resourceAgentPolicyRead(ctx context.Context, d *schema.ResourceData, meta i
351362

352363
if agentPolicy.GlobalDataTags != nil {
353364

354-
globalDataTags := make(map[string]string, len(agentPolicy.GlobalDataTags))
355-
for _, tag := range agentPolicy.GlobalDataTags {
356-
globalDataTags[tag.Name] = tag.Value.(string)
365+
globalDataTags := make(map[string]string, len(*agentPolicy.GlobalDataTags))
366+
for _, tag := range *agentPolicy.GlobalDataTags {
367+
name, err := tag["name"].AsAgentPolicyGlobalDataTags0()
368+
if err != nil {
369+
return diag.FromErr(err)
370+
}
371+
372+
value, err := tag["value"].AsAgentPolicyGlobalDataTags0()
373+
if err != nil {
374+
return diag.FromErr(err)
375+
}
376+
globalDataTags[name] = value
357377
}
358378

359379
if err := d.Set("global_data_tags", globalDataTags); err != nil {

internal/fleet/integration_policy_resource.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
fleetapi "github.com/elastic/terraform-provider-elasticstack/generated/fleet"
1313
"github.com/elastic/terraform-provider-elasticstack/internal/clients/fleet"
14+
"github.com/elastic/terraform-provider-elasticstack/internal/utils"
1415
)
1516

1617
func ResourceIntegrationPolicy() *schema.Resource {
@@ -135,7 +136,7 @@ func resourceIntegrationPolicyCreate(ctx context.Context, d *schema.ResourceData
135136
}
136137

137138
req := fleetapi.CreatePackagePolicyJSONRequestBody{
138-
PolicyId: d.Get("agent_policy_id").(string),
139+
PolicyId: utils.Pointer(d.Get("agent_policy_id").(string)),
139140
Name: d.Get("name").(string),
140141
}
141142
req.Package.Name = d.Get("integration_name").(string)
@@ -215,7 +216,7 @@ func resourceIntegrationPolicyUpdate(ctx context.Context, d *schema.ResourceData
215216
}
216217

217218
req := fleetapi.UpdatePackagePolicyJSONRequestBody{
218-
PolicyId: d.Get("agent_policy_id").(string),
219+
PolicyId: utils.Pointer(d.Get("agent_policy_id").(string)),
219220
Name: d.Get("name").(string),
220221
}
221222
req.Package.Name = d.Get("integration_name").(string)

0 commit comments

Comments
 (0)