diff --git a/internal/provider/waypoint/data_source_waypoint_add_on.go b/internal/provider/waypoint/data_source_waypoint_add_on.go index 62f5a50e2..ca8a986e8 100644 --- a/internal/provider/waypoint/data_source_waypoint_add_on.go +++ b/internal/provider/waypoint/data_source_waypoint_add_on.go @@ -269,7 +269,7 @@ func (d *DataSourceAddOn) Read(ctx context.Context, req datasource.ReadRequest, } } - diags = ReadOutputs(ctx, addOn, &state) + diags = readOutputs(ctx, addOn, &state) resp.Diagnostics.Append(diags...) if resp.Diagnostics.HasError() { return diff --git a/internal/provider/waypoint/resource_waypoint_add_on.go b/internal/provider/waypoint/resource_waypoint_add_on.go index e52b2cc18..32d0a1deb 100644 --- a/internal/provider/waypoint/resource_waypoint_add_on.go +++ b/internal/provider/waypoint/resource_waypoint_add_on.go @@ -388,7 +388,7 @@ func (r *AddOnResource) Create(ctx context.Context, req resource.CreateRequest, plan.Count = types.Int64Value(installedCount) } - diags = ReadOutputs(ctx, addOn, plan) + diags = readOutputs(ctx, addOn, plan) resp.Diagnostics.Append(diags...) if resp.Diagnostics.HasError() { return @@ -502,7 +502,7 @@ func (r *AddOnResource) Read(ctx context.Context, req resource.ReadRequest, resp } } - diags = ReadOutputs(ctx, addOn, state) + diags = readOutputs(ctx, addOn, state) resp.Diagnostics.Append(diags...) if resp.Diagnostics.HasError() { return @@ -631,7 +631,7 @@ func (r *AddOnResource) Update(ctx context.Context, req resource.UpdateRequest, plan.Count = types.Int64Value(installedCount) } - diags = ReadOutputs(ctx, addOn, plan) + diags = readOutputs(ctx, addOn, plan) resp.Diagnostics.Append(diags...) if resp.Diagnostics.HasError() { return @@ -696,7 +696,7 @@ func (r *AddOnResource) ImportState(ctx context.Context, req resource.ImportStat resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp) } -func ReadOutputs(ctx context.Context, addOn *waypointmodels.HashicorpCloudWaypointAddOn, plan *AddOnResourceModel) diag.Diagnostics { +func readOutputs(ctx context.Context, addOn *waypointmodels.HashicorpCloudWaypointAddOn, plan *AddOnResourceModel) diag.Diagnostics { var diags diag.Diagnostics if addOn.OutputValues != nil { outputList := make([]*outputValue, len(addOn.OutputValues)) @@ -709,11 +709,8 @@ func ReadOutputs(ctx context.Context, addOn *waypointmodels.HashicorpCloudWaypoi } outputList[i] = output } - if len(outputList) > 0 || len(outputList) != len(plan.OutputValues.Elements()) { + if len(outputList) > 0 { plan.OutputValues, diags = types.ListValueFrom(ctx, types.ObjectType{AttrTypes: outputValue{}.attrTypes()}, outputList) - if diags.HasError() { - return diags - } } else { plan.OutputValues = types.ListNull(types.ObjectType{AttrTypes: outputValue{}.attrTypes()}) }