fix import problem

trocco-io · Feb 28, 2025 · 208f461 · 208f461
1 parent 2dfb2f3
commit 208f461
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/internal/provider/job_definition_resource.go b/internal/provider/job_definition_resource.go
@@ -198,7 +198,7 @@ type jobDefinitionResourceModel struct {
 	FilterUnixTimeConversions []filter.FilterUnixTimeConversion           `tfsdk:"filter_unixtime_conversions"`
 	Notifications             []job_definitions.JobDefinitionNotification `tfsdk:"notifications"`
 	Schedules                 []model.Schedule                            `tfsdk:"schedules"`
-	Labels                    []model.LabelModel                          `tfsdk:"labels"`
+	Labels                    []job_definitions.Label                     `tfsdk:"labels"`
 }
 
 func (m *jobDefinitionResourceModel) ToCreateJobDefinitionInput() *client.CreateJobDefinitionInput {
@@ -325,7 +325,7 @@ func (r *jobDefinitionResource) Update(ctx context.Context, request resource.Upd
 		FilterUnixTimeConversions: filter.NewFilterUnixTimeConversions(jobDefinition.FilterUnixTimeConversions),
 		Notifications:             job_definitions.NewJobDefinitionNotifications(jobDefinition.Notifications),
 		Schedules:                 model.NewSchedules(jobDefinition.Schedules),
-		Labels:                    model.NewLabels(jobDefinition.Labels),
+		Labels:                    job_definitions.NewLabels(jobDefinition.Labels),
 	}
 	response.Diagnostics.Append(response.State.Set(ctx, newState)...)
 }
@@ -450,7 +450,7 @@ func (r *jobDefinitionResource) Create(
 		FilterUnixTimeConversions: filter.NewFilterUnixTimeConversions(jobDefinition.FilterUnixTimeConversions),
 		Notifications:             job_definitions.NewJobDefinitionNotifications(jobDefinition.Notifications),
 		Schedules:                 model.NewSchedules(jobDefinition.Schedules),
-		Labels:                    model.NewLabels(jobDefinition.Labels),
+		Labels:                    job_definitions.NewLabels(jobDefinition.Labels),
 	}
 	resp.Diagnostics.Append(resp.State.Set(ctx, newState)...)
 }
@@ -497,8 +497,9 @@ func (r *jobDefinitionResource) Read(
 		FilterUnixTimeConversions: filter.NewFilterUnixTimeConversions(jobDefinition.FilterUnixTimeConversions),
 		Notifications:             job_definitions.NewJobDefinitionNotifications(jobDefinition.Notifications),
 		Schedules:                 model.NewSchedules(jobDefinition.Schedules),
-		Labels:                    model.NewLabels(jobDefinition.Labels),
+		Labels:                    job_definitions.NewLabels(jobDefinition.Labels),
 	}
+
 	resp.Diagnostics.Append(resp.State.Set(ctx, newState)...)
 }
 

diff --git a/internal/provider/model/job_definition/label.go b/internal/provider/model/job_definition/label.go
@@ -0,0 +1,28 @@
+package job_definitions
+
+import (
+	"terraform-provider-trocco/internal/client/entity"
+
+	"github.com/hashicorp/terraform-plugin-framework/types"
+)
+
+type Label struct {
+	ID   types.Int64  `tfsdk:"id"`
+	Name types.String `tfsdk:"name"`
+}
+
+func NewLabels(labels []entity.Label) []Label {
+	if labels == nil {
+		return nil
+	}
+
+	outputs := make([]Label, 0, len(labels))
+	for _, input := range labels {
+		label := Label{
+			ID:   types.Int64Value(input.ID),
+			Name: types.StringValue(input.Name),
+		}
+		outputs = append(outputs, label)
+	}
+	return outputs
+}