Skip to content

Commit

Permalink
Merge hashicorp#4704: sha256 interpolation function
Browse files Browse the repository at this point in the history
  • Loading branch information
apparentlymart committed Jan 17, 2016
2 parents 394a106 + c17a6ce commit e8006f1
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ FEATURES:

IMPROVEMENTS:

* core: Add `sha256()` interpolation function [GH-4704]
* provider/aws: Add new parameters `az_mode` and `availability_zone(s)` in ElastiCache [GH-4631]
* provider/aws: Allow ap-northeast-2 (Seoul) as valid region [GH-4637]
* provider/aws: Limit SNS Topic Subscription protocols [GH-4639]
Expand Down
16 changes: 16 additions & 0 deletions config/interpolate_funcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package config
import (
"bytes"
"crypto/sha1"
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"errors"
Expand Down Expand Up @@ -39,6 +40,7 @@ func Funcs() map[string]ast.Function {
"replace": interpolationFuncReplace(),
"split": interpolationFuncSplit(),
"sha1": interpolationFuncSha1(),
"sha256": interpolationFuncSha256(),
"base64encode": interpolationFuncBase64Encode(),
"base64decode": interpolationFuncBase64Decode(),
"upper": interpolationFuncUpper(),
Expand Down Expand Up @@ -601,3 +603,17 @@ func interpolationFuncSha1() ast.Function {
},
}
}

func interpolationFuncSha256() ast.Function {
return ast.Function{
ArgTypes: []ast.Type{ast.TypeString},
ReturnType: ast.TypeString,
Callback: func(args []interface{}) (interface{}, error) {
s := args[0].(string)
h := sha256.New()
h.Write([]byte(s))
hash := hex.EncodeToString(h.Sum(nil))
return hash, nil
},
}
}
12 changes: 12 additions & 0 deletions config/interpolate_funcs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,18 @@ func TestInterpolateFuncSha1(t *testing.T) {
})
}

func TestInterpolateFuncSha256(t *testing.T) {
testFunction(t, testFunctionConfig{
Cases: []testFunctionCase{
{
`${sha256("test")}`,
"9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08",
false,
},
},
})
}

type testFunctionConfig struct {
Cases []testFunctionCase
Vars map[string]ast.Variable
Expand Down
6 changes: 5 additions & 1 deletion website/source/docs/configuration/interpolation.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,14 @@ The supported built-in functions are:
* `base64encode(string)` - Returns a base64-encoded representation of the
given string.

* `sha1(string)` - Returns a sha1 hash representation of the
* `sha1(string)` - Returns a SHA-1 hash representation of the
given string.
Example: `"${sha1(concat(aws_vpc.default.tags.customer, "-s3-bucket"))}"`

* `sha256(string)` - Returns a SHA-256 hash representation of the
given string.
Example: `"${sha256(concat(aws_vpc.default.tags.customer, "-s3-bucket"))}"`

* `cidrhost(iprange, hostnum)` - Takes an IP address range in CIDR notation
and creates an IP address with the given host number. For example,
``cidrhost("10.0.0.0/8", 2)`` returns ``10.0.0.2``.
Expand Down

0 comments on commit e8006f1

Please sign in to comment.