IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

internal/lang: wrap formatted errors (#444)

Browse Source
This commit is contained in:
Lars Lehtonen 2023-09-20 01:39:52 -07:00 committed by GitHub
parent 8a1ec44073
commit ff3d0b2c61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/lang/funcs/cidr.go
View File

@ -36,7 +36,7 @@ var CidrHostFunc = function.New(&function.Spec{
}
_, network, err := ipaddr.ParseCIDR(args[0].AsString())
if err != nil {
return cty.UnknownVal(cty.String), fmt.Errorf("invalid CIDR expression: %s", err)
return cty.UnknownVal(cty.String), fmt.Errorf("invalid CIDR expression: %w", err)
}
ip, err := cidr.HostBig(network, hostNum)
@ -62,7 +62,7 @@ var CidrNetmaskFunc = function.New(&function.Spec{
Impl: func(args []cty.Value, retType cty.Type) (ret cty.Value, err error) {
_, network, err := ipaddr.ParseCIDR(args[0].AsString())
if err != nil {
return cty.UnknownVal(cty.String), fmt.Errorf("invalid CIDR expression: %s", err)
return cty.UnknownVal(cty.String), fmt.Errorf("invalid CIDR expression: %w", err)
}
if network.IP.To4() == nil {
@ -104,7 +104,7 @@ var CidrSubnetFunc = function.New(&function.Spec{
_, network, err := ipaddr.ParseCIDR(args[0].AsString())
if err != nil {
return cty.UnknownVal(cty.String), fmt.Errorf("invalid CIDR expression: %s", err)
return cty.UnknownVal(cty.String), fmt.Errorf("invalid CIDR expression: %w", err)
}
newNetwork, err := cidr.SubnetBig(network, newbits, netnum)

2
internal/lang/funcs/collection.go
View File

@ -456,7 +456,7 @@ var OneFunc = function.New(&function.Spec{
// It would be very strange to get here, because that would
// suggest that the length is either not a number or isn't
// an integer, which would suggest a bug in cty.
return cty.NilVal, fmt.Errorf("invalid collection length: %s", err)
return cty.NilVal, fmt.Errorf("invalid collection length: %w", err)
}
switch l {
case 0:

6
internal/lang/funcs/crypto.go
View File

@ -65,7 +65,7 @@ var UUIDV5Func = function.New(&function.Spec{
namespace = uuidv5.NameSpaceX500
default:
if namespace, err = uuidv5.Parse(args[0].AsString()); err != nil {
return cty.UnknownVal(cty.String), fmt.Errorf("uuidv5() doesn't support namespace %s (%v)", args[0].AsString(), err)
return cty.UnknownVal(cty.String), fmt.Errorf("uuidv5() doesn't support namespace %s (%w)", args[0].AsString(), err)
}
}
val := args[1].AsString()
@ -125,7 +125,7 @@ var BcryptFunc = function.New(&function.Spec{
input := args[0].AsString()
out, err := bcrypt.GenerateFromPassword([]byte(input), defaultCost)
if err != nil {
return cty.UnknownVal(cty.String), fmt.Errorf("error occurred generating password %s", err.Error())
return cty.UnknownVal(cty.String), fmt.Errorf("error occurred generating password %w", err)
}
return cty.StringVal(string(out)), nil
@ -184,7 +184,7 @@ var RsaDecryptFunc = function.New(&function.Spec{
out, err := rsa.DecryptPKCS1v15(nil, privateKey, b)
if err != nil {
return cty.UnknownVal(cty.String), fmt.Errorf("failed to decrypt: %s", err)
return cty.UnknownVal(cty.String), fmt.Errorf("failed to decrypt: %w", err)
}
return cty.StringVal(string(out)), nil

4
internal/lang/funcs/datetime.go
View File

@ -156,9 +156,7 @@ func parseTimestamp(ts string) (time.Time, error) {
// the timestamp portions by name rather than by Go's example
// values.
if err.LayoutElem == "" && err.ValueElem == "" && err.Message != "" {
// For some reason err.Message is populated with a ": " prefix
// by the time package.
return time.Time{}, fmt.Errorf("not a valid RFC3339 timestamp%s", err.Message)
return time.Time{}, fmt.Errorf("not a valid RFC3339 timestamp: %w", err)
}
var what string
switch err.LayoutElem {