Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

convert: handle unknown values #50

Merged
merged 1 commit into from
Mar 11, 2025
Merged

convert: handle unknown values #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions internal/provider/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func FromStringMap(m map[string]string) types.Map {

// ToStringList converts a types.List to Settings_StringList and handles diagnostics internally
func ToStringListFromSet(ctx context.Context, dst **pb.Settings_StringList, set types.Set, diagnostics *diag.Diagnostics) {
if set.IsNull() {
if set.IsNull() || set.IsUnknown() {
*dst = nil
return
}
Expand All @@ -90,7 +90,7 @@ func ToStringListFromSet(ctx context.Context, dst **pb.Settings_StringList, set

// ToStringMap converts a types.Map to map[string]string and handles diagnostics internally
func ToStringMap(ctx context.Context, dst *map[string]string, m types.Map, diagnostics *diag.Diagnostics) {
if m.IsNull() {
if m.IsNull() || m.IsUnknown() {
*dst = nil
return
}
Expand All @@ -103,25 +103,28 @@ func ToStringMap(ctx context.Context, dst *map[string]string, m types.Map, diagn
}

func ToStringSliceFromSet(ctx context.Context, dst *[]string, set types.Set, diagnostics *diag.Diagnostics) {
*dst = make([]string, 0)
if !set.IsNull() {
var values []string
diagnostics.Append(set.ElementsAs(ctx, &values, false)...)
if !diagnostics.HasError() {
*dst = values
}
if set.IsNull() || set.IsUnknown() {
*dst = nil
return
}
var values []string
diagnostics.Append(set.ElementsAs(ctx, &values, false)...)
if !diagnostics.HasError() {
*dst = values
}
}

// ToStringSliceFromList converts a types.List to string slice and handles diagnostics internally
func ToStringSliceFromList(ctx context.Context, dst *[]string, list types.List, diagnostics *diag.Diagnostics) {
*dst = make([]string, 0)
if !list.IsNull() {
var values []string
diagnostics.Append(list.ElementsAs(ctx, &values, false)...)
if !diagnostics.HasError() {
*dst = values
}
if list.IsNull() || list.IsUnknown() {
*dst = nil
return
}

var values []string
diagnostics.Append(list.ElementsAs(ctx, &values, false)...)
if !diagnostics.HasError() {
*dst = values
}
}

Expand Down
42 changes: 32 additions & 10 deletions internal/provider/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ func TestToStringListFromSet(t *testing.T) {
assert.Nil(t, s)
},
},
{
name: "unknown set",
input: types.SetUnknown(types.StringType),
validate: func(t *testing.T, s *pb.Settings_StringList) {
assert.Nil(t, s)
},
},
{
name: "empty list",
input: types.SetValueMust(types.StringType, []attr.Value{}),
Expand Down Expand Up @@ -491,11 +498,16 @@ func TestToStringSliceFromSet(t *testing.T) {
{
name: "null set",
input: types.SetNull(types.StringType),
expected: []string{},
expected: nil,
},
{
name: "unknown set",
input: types.SetUnknown(types.StringType),
expected: nil,
},
{
name: "empty set",
input: types.SetValueMust(types.StringType, []attr.Value{}),
input: types.SetValueMust(types.StringType, nil),
expected: []string{},
},
{
Expand Down Expand Up @@ -595,7 +607,12 @@ func TestToStringSliceFromList(t *testing.T) {
{
name: "null list",
input: types.ListNull(types.StringType),
expected: []string{},
expected: nil,
},
{
name: "unknown list",
input: types.ListUnknown(types.StringType),
expected: nil,
},
{
name: "empty list",
Expand Down Expand Up @@ -633,7 +650,12 @@ func TestToStringMap(t *testing.T) {
{
name: "null map",
input: types.MapNull(types.StringType),
expected: nil, // Changed from empty map to nil to match implementation
expected: nil,
},
{
name: "unknown map",
input: types.MapUnknown(types.StringType),
expected: nil,
},
{
name: "empty map",
Expand Down Expand Up @@ -780,10 +802,10 @@ func TestToRouteStringList(t *testing.T) {
0,
},
{
"invalid",
types.SetValueMust(types.BoolType, []attr.Value{types.BoolValue(true)}),
"unknown",
types.SetUnknown(types.StringType),
nil,
1,
0,
},
{
"empty",
Expand Down Expand Up @@ -827,10 +849,10 @@ func TestToSettingsStringList(t *testing.T) {
0,
},
{
"invalid",
types.SetValueMust(types.BoolType, []attr.Value{types.BoolValue(true)}),
"unknown",
types.SetUnknown(types.StringType),
nil,
1,
0,
},
{
"empty",
Expand Down