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.

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

internal/framework/types: surface ARN validation errors #40008

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/40008.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:note
provider: validation of arguments implementing the custom `ARNType` will properly surface validation errors
```
9 changes: 3 additions & 6 deletions internal/framework/types/arn.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,9 @@ func (t arnType) ValueFromString(_ context.Context, in types.String) (basetypes.
return ARNUnknown(), diags
}

valueString := in.ValueString()
if _, err := arn.Parse(valueString); err != nil {
return ARNUnknown(), diags // Must not return validation errors.
}

return ARNValue(valueString), diags
// The ValidateAttribute method will surface errors if the value is an invalid
// ARN. This method simply passes the value through.
return ARNValue(in.ValueString()), diags
}

func (t arnType) ValueFromTerraform(ctx context.Context, in tftypes.Value) (attr.Value, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/framework/types/arn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestARNTypeValueFromTerraform(t *testing.T) {
},
"invalid ARN": {
val: tftypes.NewValue(tftypes.String, "not ok"),
expected: fwtypes.ARNUnknown(),
expected: fwtypes.ARNValue("not ok"),
},
}

Expand Down
Loading