Allow a default source path to be specified via envvar#397
Allow a default source path to be specified via envvar#397bobh66 merged 4 commits intocrossplane-contrib:mainfrom
Conversation
fn_test.go
Outdated
| for name, tc := range cases { | ||
| t.Run(name, func(t *testing.T) { | ||
| // NOTE: This means we can't run tests in parallel. | ||
| defaultSource = tc.args.defaultSource |
There was a problem hiding this comment.
is there an alternative approach you were considering that doesn't rely on global variables?
There was a problem hiding this comment.
Not sure why I didn't do this initially, but we can read the envvar when we construct the Function and store it in a field. This is tidier than the global variable for sure. Updated to do things that way.
main.go
Outdated
| fsys: &osFS{}, | ||
| log: log, | ||
| fsys: &osFS{}, | ||
| defaultSource: os.Getenv("FUNCTION_GO_TEMPLATING_DEFAULT_SOURCE"), |
There was a problem hiding this comment.
awesome, i like this approach of resolving the value in main.go and passing it into the function more than a global var, thanks for that consideration!
now i'm also wondering if this should be exposed as a command line arg, in addition to the env var, similar to TLSCertsDir. i'm not sure if it should be exposed at that level also, but it's something else to consider here 🤔
There was a problem hiding this comment.
I think it's probably cleaner to make it a command line argument with an env var like TLSCertsDir, since it needs to be rebased anyway?
There was a problem hiding this comment.
Finally coming back to this - I agree, making it a flag is much better. Done (and rebased).
adamwg
force-pushed
the
awg/default-source
branch
from
d1fa2e3 to
e81a2f3
Compare
|
Kick CI |
Signed-off-by: Adam Wolfe Gordon <awg@upbound.io>
Read the default source envvar as part of initialization in `main` and store it in the `Function` struct rather than using a global variable. This is tidier and lets us run our tests in parallel. Signed-off-by: Adam Wolfe Gordon <awg@upbound.io>
Signed-off-by: Adam Wolfe Gordon <awg@upbound.io>
Signed-off-by: Bob Haddleton <bob.haddleton@nokia.com>
bobh66
force-pushed
the
awg/default-source
branch
from
e81a2f3 to
437e94c
Compare
3 participants
Description of your changes
Enable function-go-templating to be used as a base image for custom functions with go templates included in the image by allowing the function input to be empty when a default source is set via environment variable. A user can build a custom function on top of function-go-templating by adding a directory containing go templates to the image and setting the environment variable
FUNCTION_GO_TEMPLATING_DEFAULT_SOURCEto the template directory's path. The behavior of the function will be the same as if the templates were mounted into the function pod and theFilesysteminput source used.I have: