Skip to content

Commit d8b5820

Browse files
zacharyblasczykzacharyblasczyk
committedMar 18, 2025·
update ReleaseChannels to DeploymentVersionChannels
1 parent aa6c527 commit d8b5820

File tree

5 files changed

+130
-128
lines changed

5 files changed

+130
-128
lines changed
 

‎internal/integration/environment_test.go

+88-88
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ var _ = Describe("Environment API", func() {
5555
})
5656

5757
It("should create an environment without a resource filter", func() {
58-
releaseChannels := []string{}
58+
deploymentVersionChannels := []string{}
5959
metadata := map[string]string{
6060
"test": "true",
6161
"env": "integration",
6262
}
6363
description := "Test environment without resource filter"
6464
envResp, err := apiClient.CreateEnvironmentWithResponse(ctx, client.CreateEnvironmentJSONRequestBody{
65-
Name: envName,
66-
Description: &description,
67-
SystemId: systemID.String(),
68-
PolicyId: nil,
69-
Metadata: &metadata,
70-
ResourceFilter: nil,
71-
ReleaseChannels: &releaseChannels,
65+
Name: envName,
66+
Description: &description,
67+
SystemId: systemID.String(),
68+
PolicyId: nil,
69+
Metadata: &metadata,
70+
ResourceFilter: nil,
71+
DeploymentVersionChannels: &deploymentVersionChannels,
7272
})
7373

7474
Expect(err).NotTo(HaveOccurred(), "Failed to create environment")
@@ -117,20 +117,20 @@ var _ = Describe("Environment API", func() {
117117
shortUUID := uuid.New().String()[:6]
118118
envName = fmt.Sprintf("env-empty-filter-%s", shortUUID)
119119

120-
releaseChannels := []string{}
120+
deploymentVersionChannels := []string{}
121121
metadata := map[string]string{
122122
"test": "true",
123123
"env": "integration",
124124
}
125125
description := "Test environment with resource filter"
126126
envResp, err := apiClient.CreateEnvironmentWithResponse(ctx, client.CreateEnvironmentJSONRequestBody{
127-
Name: envName,
128-
Description: &description,
129-
SystemId: systemID.String(),
130-
PolicyId: nil,
131-
Metadata: &metadata,
132-
ResourceFilter: &filter,
133-
ReleaseChannels: &releaseChannels,
127+
Name: envName,
128+
Description: &description,
129+
SystemId: systemID.String(),
130+
PolicyId: nil,
131+
Metadata: &metadata,
132+
ResourceFilter: &filter,
133+
DeploymentVersionChannels: &deploymentVersionChannels,
134134
})
135135

136136
Expect(err).NotTo(HaveOccurred(), "Failed to create environment")
@@ -175,7 +175,7 @@ var _ = Describe("Environment API", func() {
175175

176176
defer func() { safeDeleteTestSystem(ctx, apiClient, systemID) }()
177177

178-
releaseChannels := []string{}
178+
deploymentVersionChannels := []string{}
179179
envName := fmt.Sprintf("env-comparison-%s", uuid.New().String()[:6])
180180
filter := map[string]interface{}{
181181
"type": "kind",
@@ -188,13 +188,13 @@ var _ = Describe("Environment API", func() {
188188
}
189189
description := "Test environment with comparison filter"
190190
envReq := client.CreateEnvironmentJSONRequestBody{
191-
Name: envName,
192-
Description: &description,
193-
SystemId: systemID.String(),
194-
PolicyId: nil,
195-
Metadata: &metadata,
196-
ResourceFilter: &filter,
197-
ReleaseChannels: &releaseChannels,
191+
Name: envName,
192+
Description: &description,
193+
SystemId: systemID.String(),
194+
PolicyId: nil,
195+
Metadata: &metadata,
196+
ResourceFilter: &filter,
197+
DeploymentVersionChannels: &deploymentVersionChannels,
198198
}
199199

200200
Logger.Debug("creating environment with comparison filter",
@@ -249,7 +249,7 @@ var _ = Describe("Environment API", func() {
249249
Expect(err).NotTo(HaveOccurred())
250250
defer safeDeleteTestSystem(ctx, apiClient, systemID)
251251

252-
releaseChannels := []string{}
252+
deploymentVersionChannels := []string{}
253253
envName := fmt.Sprintf("env-metadata-%s", uuid.New().String()[:6])
254254
filter := map[string]interface{}{
255255
"type": "metadata",
@@ -263,13 +263,13 @@ var _ = Describe("Environment API", func() {
263263
}
264264
description := "Test environment with metadata filter"
265265
envReq := client.CreateEnvironmentJSONRequestBody{
266-
Name: envName,
267-
Description: &description,
268-
SystemId: systemID.String(),
269-
PolicyId: nil,
270-
Metadata: &metadata,
271-
ResourceFilter: &filter,
272-
ReleaseChannels: &releaseChannels,
266+
Name: envName,
267+
Description: &description,
268+
SystemId: systemID.String(),
269+
PolicyId: nil,
270+
Metadata: &metadata,
271+
ResourceFilter: &filter,
272+
DeploymentVersionChannels: &deploymentVersionChannels,
273273
}
274274

275275
Logger.Debug("creating environment with metadata filter",
@@ -326,7 +326,7 @@ var _ = Describe("Environment API", func() {
326326

327327
defer func() { safeDeleteTestSystem(ctx, apiClient, systemID) }()
328328

329-
releaseChannels := []string{}
329+
deploymentVersionChannels := []string{}
330330
envName := fmt.Sprintf("env-simple-filter-%s", uuid.New().String()[:6])
331331
filter := map[string]interface{}{
332332
"type": "metadata",
@@ -340,13 +340,13 @@ var _ = Describe("Environment API", func() {
340340
}
341341
description := "Test environment with simple filter"
342342
envReq := client.CreateEnvironmentJSONRequestBody{
343-
Name: envName,
344-
Description: &description,
345-
SystemId: systemID.String(),
346-
PolicyId: nil,
347-
Metadata: &metadata,
348-
ResourceFilter: &filter,
349-
ReleaseChannels: &releaseChannels,
343+
Name: envName,
344+
Description: &description,
345+
SystemId: systemID.String(),
346+
PolicyId: nil,
347+
Metadata: &metadata,
348+
ResourceFilter: &filter,
349+
DeploymentVersionChannels: &deploymentVersionChannels,
350350
}
351351

352352
Logger.Debug("creating environment with simple filter",
@@ -399,7 +399,7 @@ var _ = Describe("Environment API", func() {
399399
Expect(err).NotTo(HaveOccurred())
400400
defer safeDeleteTestSystem(ctx, apiClient, systemID)
401401

402-
releaseChannels := []string{}
402+
deploymentVersionChannels := []string{}
403403
envName := fmt.Sprintf("env-complex-filter-%s", uuid.New().String()[:6])
404404
filter := map[string]interface{}{
405405
"not": false,
@@ -425,13 +425,13 @@ var _ = Describe("Environment API", func() {
425425
}
426426
description := "Test environment with complex filter"
427427
envReq := client.CreateEnvironmentJSONRequestBody{
428-
Name: envName,
429-
Description: &description,
430-
SystemId: systemID.String(),
431-
PolicyId: nil,
432-
Metadata: &metadata,
433-
ResourceFilter: &filter,
434-
ReleaseChannels: &releaseChannels,
428+
Name: envName,
429+
Description: &description,
430+
SystemId: systemID.String(),
431+
PolicyId: nil,
432+
Metadata: &metadata,
433+
ResourceFilter: &filter,
434+
DeploymentVersionChannels: &deploymentVersionChannels,
435435
}
436436

437437
Logger.Debug("creating environment with complex filter",
@@ -500,7 +500,7 @@ var _ = Describe("Environment API", func() {
500500
Expect(err).NotTo(HaveOccurred())
501501
defer safeDeleteTestSystem(ctx, apiClient, systemID)
502502

503-
releaseChannels := []string{}
503+
deploymentVersionChannels := []string{}
504504
envName := fmt.Sprintf("env-date-filter-%s", uuid.New().String()[:6])
505505

506506
// Create a resource filter with a date condition
@@ -533,13 +533,13 @@ var _ = Describe("Environment API", func() {
533533
}
534534
description := "Test environment with date condition filter"
535535
envReq := client.CreateEnvironmentJSONRequestBody{
536-
Name: envName,
537-
Description: &description,
538-
SystemId: systemID.String(),
539-
PolicyId: nil,
540-
Metadata: &metadata,
541-
ResourceFilter: &filter,
542-
ReleaseChannels: &releaseChannels,
536+
Name: envName,
537+
Description: &description,
538+
SystemId: systemID.String(),
539+
PolicyId: nil,
540+
Metadata: &metadata,
541+
ResourceFilter: &filter,
542+
DeploymentVersionChannels: &deploymentVersionChannels,
543543
}
544544

545545
Logger.Debug("creating environment with date condition filter",
@@ -650,7 +650,7 @@ var _ = Describe("Environment API", func() {
650650
}
651651

652652
createdEnvs := make([]uuid.UUID, 0, len(environments))
653-
releaseChannels := []string{}
653+
deploymentVersionChannels := []string{}
654654

655655
for _, env := range environments {
656656
description := fmt.Sprintf("Test environment for %s", env.name)
@@ -660,13 +660,13 @@ var _ = Describe("Environment API", func() {
660660
}
661661

662662
envReq := client.CreateEnvironmentJSONRequestBody{
663-
Name: env.name,
664-
Description: &description,
665-
SystemId: systemID.String(),
666-
PolicyId: nil,
667-
Metadata: &metadata,
668-
ResourceFilter: &env.filter,
669-
ReleaseChannels: &releaseChannels,
663+
Name: env.name,
664+
Description: &description,
665+
SystemId: systemID.String(),
666+
PolicyId: nil,
667+
Metadata: &metadata,
668+
ResourceFilter: &env.filter,
669+
DeploymentVersionChannels: &deploymentVersionChannels,
670670
}
671671

672672
Logger.Debug("creating environment",
@@ -697,7 +697,7 @@ var _ = Describe("Environment API", func() {
697697
Expect(err).NotTo(HaveOccurred())
698698
defer safeDeleteTestSystem(ctx, apiClient, systemID)
699699

700-
releaseChannels := []string{}
700+
deploymentVersionChannels := []string{}
701701
envName := fmt.Sprintf("env-nested-comp-%s", uuid.New().String()[:6])
702702

703703
// Create a resource filter with nested comparison conditions
@@ -737,13 +737,13 @@ var _ = Describe("Environment API", func() {
737737
}
738738
description := "Test environment with nested comparison conditions"
739739
envReq := client.CreateEnvironmentJSONRequestBody{
740-
Name: envName,
741-
Description: &description,
742-
SystemId: systemID.String(),
743-
PolicyId: nil,
744-
Metadata: &metadata,
745-
ResourceFilter: &filter,
746-
ReleaseChannels: &releaseChannels,
740+
Name: envName,
741+
Description: &description,
742+
SystemId: systemID.String(),
743+
PolicyId: nil,
744+
Metadata: &metadata,
745+
ResourceFilter: &filter,
746+
DeploymentVersionChannels: &deploymentVersionChannels,
747747
}
748748

749749
Logger.Debug("creating environment with nested comparison conditions",
@@ -800,7 +800,7 @@ var _ = Describe("Environment API", func() {
800800
Expect(err).NotTo(HaveOccurred())
801801
defer safeDeleteTestSystem(ctx, apiClient, systemID)
802802

803-
releaseChannels := []string{}
803+
deploymentVersionChannels := []string{}
804804
envName := fmt.Sprintf("env-mixed-conditions-%s", uuid.New().String()[:6])
805805

806806
// Create a resource filter with mixed condition types
@@ -834,13 +834,13 @@ var _ = Describe("Environment API", func() {
834834
}
835835
description := "Test environment with mixed condition types"
836836
envReq := client.CreateEnvironmentJSONRequestBody{
837-
Name: envName,
838-
Description: &description,
839-
SystemId: systemID.String(),
840-
PolicyId: nil,
841-
Metadata: &metadata,
842-
ResourceFilter: &filter,
843-
ReleaseChannels: &releaseChannels,
837+
Name: envName,
838+
Description: &description,
839+
SystemId: systemID.String(),
840+
PolicyId: nil,
841+
Metadata: &metadata,
842+
ResourceFilter: &filter,
843+
DeploymentVersionChannels: &deploymentVersionChannels,
844844
}
845845

846846
Logger.Debug("creating environment with mixed condition types",
@@ -906,7 +906,7 @@ var _ = Describe("Environment API", func() {
906906
Expect(err).NotTo(HaveOccurred())
907907
defer safeDeleteTestSystem(ctx, apiClient, systemID)
908908

909-
releaseChannels := []string{}
909+
deploymentVersionChannels := []string{}
910910
envName := fmt.Sprintf("env-deep-nesting-%s", uuid.New().String()[:6])
911911

912912
// Create a resource filter with 3 levels of nesting
@@ -957,13 +957,13 @@ var _ = Describe("Environment API", func() {
957957
}
958958
description := "Test environment with deeply nested conditions"
959959
envReq := client.CreateEnvironmentJSONRequestBody{
960-
Name: envName,
961-
Description: &description,
962-
SystemId: systemID.String(),
963-
PolicyId: nil,
964-
Metadata: &metadata,
965-
ResourceFilter: &filter,
966-
ReleaseChannels: &releaseChannels,
960+
Name: envName,
961+
Description: &description,
962+
SystemId: systemID.String(),
963+
PolicyId: nil,
964+
Metadata: &metadata,
965+
ResourceFilter: &filter,
966+
DeploymentVersionChannels: &deploymentVersionChannels,
967967
}
968968

969969
Logger.Debug("creating environment with deeply nested conditions",

‎internal/provider/environment_data_source.go

+2
Original file line numberDiff line numberDiff line change
@@ -172,5 +172,7 @@ func (d *EnvironmentDataSource) Read(ctx context.Context, req datasource.ReadReq
172172
}
173173
}
174174

175+
data.DeploymentVersionChannels = []types.String{}
176+
175177
resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
176178
}

‎internal/provider/environment_model.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ import (
88
)
99

1010
type EnvironmentModel struct {
11-
ID types.String `tfsdk:"id"`
12-
Name types.String `tfsdk:"name"`
13-
Description types.String `tfsdk:"description"`
14-
SystemID types.String `tfsdk:"system_id"`
15-
PolicyID types.String `tfsdk:"policy_id"`
16-
Metadata types.Map `tfsdk:"metadata"`
17-
ResourceFilter *ResourceFilterModel `tfsdk:"resource_filter"`
18-
ResourceFilterID types.String `tfsdk:"resource_filter_id"`
19-
ReleaseChannels []types.String `tfsdk:"release_channels"`
11+
ID types.String `tfsdk:"id"`
12+
Name types.String `tfsdk:"name"`
13+
Description types.String `tfsdk:"description"`
14+
SystemID types.String `tfsdk:"system_id"`
15+
PolicyID types.String `tfsdk:"policy_id"`
16+
Metadata types.Map `tfsdk:"metadata"`
17+
ResourceFilter *ResourceFilterModel `tfsdk:"resource_filter"`
18+
ResourceFilterID types.String `tfsdk:"resource_filter_id"`
19+
DeploymentVersionChannels []types.String `tfsdk:"deployment_version_channels"`
2020
}
2121

2222
type EnvironmentDataSourceModel struct {
23-
ID types.String `tfsdk:"id"`
24-
Name types.String `tfsdk:"name"`
25-
Description types.String `tfsdk:"description"`
26-
SystemID types.String `tfsdk:"system_id"`
27-
PolicyID types.String `tfsdk:"policy_id"`
28-
Metadata types.Map `tfsdk:"metadata"`
29-
ResourceFilter *ResourceFilterModel `tfsdk:"resource_filter"`
30-
ReleaseChannels []types.String `tfsdk:"release_channels"`
23+
ID types.String `tfsdk:"id"`
24+
Name types.String `tfsdk:"name"`
25+
Description types.String `tfsdk:"description"`
26+
SystemID types.String `tfsdk:"system_id"`
27+
PolicyID types.String `tfsdk:"policy_id"`
28+
Metadata types.Map `tfsdk:"metadata"`
29+
ResourceFilter *ResourceFilterModel `tfsdk:"resource_filter"`
30+
DeploymentVersionChannels []types.String `tfsdk:"deployment_version_channels"`
3131
}
3232

3333
func (e *EnvironmentModel) SetDefaults() {
@@ -37,8 +37,8 @@ func (e *EnvironmentModel) SetDefaults() {
3737
if e.Metadata.IsNull() {
3838
e.Metadata = types.MapNull(types.StringType)
3939
}
40-
if e.ReleaseChannels == nil {
41-
e.ReleaseChannels = []types.String{}
40+
if e.DeploymentVersionChannels == nil {
41+
e.DeploymentVersionChannels = []types.String{}
4242
}
4343
}
4444

@@ -49,7 +49,7 @@ func (e *EnvironmentDataSourceModel) SetDefaults() {
4949
if e.Metadata.IsNull() {
5050
e.Metadata = types.MapNull(types.StringType)
5151
}
52-
if e.ReleaseChannels == nil {
53-
e.ReleaseChannels = []types.String{}
52+
if e.DeploymentVersionChannels == nil {
53+
e.DeploymentVersionChannels = []types.String{}
5454
}
5555
}

‎internal/provider/environment_resource.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -170,29 +170,29 @@ func (r *EnvironmentResource) Create(ctx context.Context, req resource.CreateReq
170170
})
171171
}
172172

173-
releaseChannels := make([]string, 0)
174-
for _, ch := range data.ReleaseChannels {
173+
deploymentVersionChannels := make([]string, 0)
174+
for _, ch := range data.DeploymentVersionChannels {
175175
if !ch.IsNull() && !ch.IsUnknown() {
176-
releaseChannels = append(releaseChannels, ch.ValueString())
176+
deploymentVersionChannels = append(deploymentVersionChannels, ch.ValueString())
177177
}
178178
}
179179

180180
createReq := client.CreateEnvironmentJSONRequestBody{
181-
Name: data.Name.ValueString(),
182-
Description: stringToPtr(data.Description.ValueString()),
183-
SystemId: data.SystemID.ValueString(),
184-
Metadata: &metadata,
185-
ResourceFilter: resourceFilter,
186-
ReleaseChannels: &releaseChannels,
181+
Name: data.Name.ValueString(),
182+
Description: stringToPtr(data.Description.ValueString()),
183+
SystemId: data.SystemID.ValueString(),
184+
Metadata: &metadata,
185+
ResourceFilter: resourceFilter,
186+
DeploymentVersionChannels: &deploymentVersionChannels,
187187
}
188188

189189
tflog.Info(ctx, "API request details", map[string]interface{}{
190-
"name": data.Name.ValueString(),
191-
"description": data.Description.ValueString(),
192-
"system_id": data.SystemID.ValueString(),
193-
"metadata": metadata,
194-
"resource_filter": fmt.Sprintf("%+v", resourceFilter),
195-
"release_channels": releaseChannels,
190+
"name": data.Name.ValueString(),
191+
"description": data.Description.ValueString(),
192+
"system_id": data.SystemID.ValueString(),
193+
"metadata": metadata,
194+
"resource_filter": fmt.Sprintf("%+v", resourceFilter),
195+
"deployment_version_channels": deploymentVersionChannels,
196196
})
197197

198198
createResp, err := r.client.CreateEnvironmentWithResponse(ctx, createReq)

‎internal/provider/environment_schema.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ func GetEnvironmentResourceSchema() resourceschema.Schema {
5858
},
5959
Attributes: GetResourceFilterSchema(), // This function is defined in resource_filter_schema.go
6060
},
61-
"release_channels": resourceschema.ListAttribute{
62-
Description: "Release channels for the environment.",
61+
"deployment_version_channels": resourceschema.ListAttribute{
62+
Description: "Deployment version channels for the environment.",
6363
Optional: true,
6464
ElementType: types.StringType,
6565
},
@@ -130,8 +130,8 @@ func GetEnvironmentDataSourceSchema() dschema.Schema {
130130
},
131131
},
132132
},
133-
"release_channels": dschema.ListAttribute{
134-
Description: "Release channels for the environment.",
133+
"deployment_version_channels": dschema.ListAttribute{
134+
Description: "Deployment version channels for the environment.",
135135
Computed: true,
136136
ElementType: types.StringType,
137137
},

0 commit comments

Comments
 (0)
Please sign in to comment.