Skip to content

Commit

Permalink
feat: host builder certs layer
Browse files Browse the repository at this point in the history
  • Loading branch information
lkingland committed Jun 23, 2023
1 parent 8a078ce commit 6985264
Show file tree
Hide file tree
Showing 11 changed files with 22,601 additions and 11,970 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/cmd/func.yaml
/templates/typescript/cloudevents/build
/templates/typescript/http/build
/templates/go/cloudevents/go.sum
/coverage.out
/coverage.txt
/.coverage
Expand Down
15 changes: 12 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ KVER ?= $(shell git describe --tags --match 'knative-*')
LDFLAGS := "-X main.date=$(DATE) -X main.vers=$(VERS) -X main.kver=$(KVER) -X main.hash=$(HASH)"

# All Code prerequisites, including generated files, etc.
CODE := $(shell find . -name '*.go') generate/zz_filesystem_generated.go go.mod schema/func_yaml-schema.json
TEMPLATES := $(shell find templates -name '*' -type f)
CODE := $(shell find . -name '*.go') \
generate/zz_filesystem_generated.go \
schema/func_yaml-schema.json \
templates/certs/ca-certificates.crt \

.PHONY: test docs

Expand Down Expand Up @@ -88,7 +90,7 @@ clean_templates:

.PHONY: generate/zz_filesystem_generated.go

generate/zz_filesystem_generated.go: clean_templates
generate/zz_filesystem_generated.go: clean_templates templates/certs/ca-certificates.crt
go generate pkg/functions/templates_embedded.go

.PHONY: clean
Expand All @@ -97,6 +99,7 @@ clean: clean_templates ## Remove generated artifacts such as binaries and schema
rm -f $(BIN) $(BIN_WINDOWS) $(BIN_LINUX) $(BIN_DARWIN_AMD64) $(BIN_DARWIN_ARM64)
rm -f schema/func_yaml-schema.json
rm -f coverage.txt
rm -f templates/certs/ca-certificates.crt

docs:
# Generating command reference doc
Expand Down Expand Up @@ -153,6 +156,11 @@ update-runtimes: ## Update Scaffolding Runtimes
cd templates/go/scaffolding/instanced-cloudevents && go get -u github.com/lkingland/func-runtime-go/cloudevents
cd templates/go/scaffolding/static-cloudevents && go get -u github.com/lkingland/func-runtime-go/cloudevents

.PHONY: certs templates/certs/ca-certificates.crt
certs: templates/certs/ca-certificates.crt ## Update root certificates
templates/certs/ca-certificates.crt:
# Updating root certificates
curl --output templates/certs/ca-certificates.crt https://curl.se/ca/cacert.pem

###################
##@ Extended Testing (cluster required)
Expand Down Expand Up @@ -219,6 +227,7 @@ $(BIN_WINDOWS): generate/zz_filesystem_generated.go
######################
##@ Schemas
######################

schema-generate: schema/func_yaml-schema.json ## Generate func.yaml schema
schema/func_yaml-schema.json: pkg/functions/function.go pkg/functions/function_*.go
go run schema/generator/main.go
Expand Down
27,776 changes: 15,819 additions & 11,957 deletions generate/zz_filesystem_generated.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/filesystem/filesystem_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func loadLocalFiles(root string) ([]FileInfo, error) {
}
case fs.ModeSymlink:
t, _ := os.Readlink(path)
bs = []byte(t)
bs = []byte(filepath.ToSlash(t))
}
path, err = filepath.Rel(root, path)
if err != nil {
Expand Down
4 changes: 4 additions & 0 deletions pkg/functions/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@ func repositoryRuntimes(fs filesystem.Filesystem, repoName string, repoConfig re
if !fi.IsDir() || strings.HasPrefix(fi.Name(), ".") {
continue
}
// ignore the reserved word "certs"
if fi.Name() == "certs" {
continue
}
// Runtime, defaulted to values inherited from the repository
runtime := Runtime{
Name: fi.Name(),
Expand Down

This file was deleted.

11 changes: 11 additions & 0 deletions pkg/scaffolding/testdata/testwrite/certs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Test Certs

This directory mocks the existence of a 'certs' directory peer to the various
languages in the templates directory. This directory is required for the
error-free execution of Scaffolding Write tests, since it is used to
create the certificates container layer.

The actual certs used are located in templates/certs, and are refreshed
by running `make certs` or by running a `make clean`
before a `make`.

3,363 changes: 3,363 additions & 0 deletions pkg/scaffolding/testdata/testwrite/certs/ca-certificates.crt

Large diffs are not rendered by default.

21 changes: 19 additions & 2 deletions templates/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
# Templates

Contains all example source code, scaffolding, certificates and metadata used
by func when creating and building function instances.

To rebuild run `make templates` (which caches). To force a full rebuild run
`make clean && make`

## Layout

Each directory within `templates` corresponds to a known language runtime.
The `certs` directory is a reserved word containing root SSL certificates.
Each directory within a runtime directory corresponds to a named templaate.
The `scaffolding` directory within the runtime directory is a reserved word
containing the adapter code that converts a function with a given method
signature into a service by way of the external function runtime libraries.

## Packaging

When updates are made to these templates, they must be packaged (serialized as a Go byte array)
by running `make generate/zz_filesystem_generated.go`, and checking in the resultant `./generate/zz_filesystem_generated.go` file.
When updates are made to these templates, they must be packaged (serialized as
a Go byte array) by running `make templates` (which rebuilds
`generate/zz_filesystem_generated.go`, and checking in the resultant
`./generate/zz_filesystem_generated.go` file.

## How it works

Expand Down
8 changes: 8 additions & 0 deletions templates/certs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Certs

This directory contains the SSL root certificates used when creating
function images.

The certs can be updated by running `make certs` or by running `make clean`
before `make`.

Loading

0 comments on commit 6985264

Please sign in to comment.