Add --tuf-channel flag to set tuf prefix path
This commit is contained in:
@@ -33,6 +33,9 @@ spec:
|
|||||||
{{- if .Values.tufRoot }}
|
{{- if .Values.tufRoot }}
|
||||||
- --tuf-root={{ .Values.tufRoot }}
|
- --tuf-root={{ .Values.tufRoot }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.tufChannel }}
|
||||||
|
- --tuf-channel={{ .Values.tufChannel }}
|
||||||
|
{{- end }}
|
||||||
{{- if .Values.handlerTimeout }}
|
{{- if .Values.handlerTimeout }}
|
||||||
- --handler-timeout={{ .Values.handlerTimeout }}
|
- --handler-timeout={{ .Values.handlerTimeout }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ replicas: 1
|
|||||||
# tufTargetsSource: registry-1.docker.io/docker/tuf-targets-staging
|
# tufTargetsSource: registry-1.docker.io/docker/tuf-targets-staging
|
||||||
|
|
||||||
tufRoot: prod
|
tufRoot: prod
|
||||||
|
tufChannel: ""
|
||||||
tufMetadataSource: registry-1.docker.io/docker/tuf-metadata
|
tufMetadataSource: registry-1.docker.io/docker/tuf-metadata
|
||||||
tufTargetsSource: registry-1.docker.io/docker/tuf-targets
|
tufTargetsSource: registry-1.docker.io/docker/tuf-targets
|
||||||
|
|
||||||
|
|||||||
8
main.go
8
main.go
@@ -37,6 +37,7 @@ var (
|
|||||||
handlerTimeoutSeconds int
|
handlerTimeoutSeconds int
|
||||||
|
|
||||||
tufRoot string
|
tufRoot string
|
||||||
|
tufChannel string
|
||||||
tufoutputPath string
|
tufoutputPath string
|
||||||
metadataURL string
|
metadataURL string
|
||||||
targetsURL string
|
targetsURL string
|
||||||
@@ -51,6 +52,7 @@ var (
|
|||||||
const (
|
const (
|
||||||
defaultMetadataURL = "registry-1.docker.io/docker/tuf-metadata:latest"
|
defaultMetadataURL = "registry-1.docker.io/docker/tuf-metadata:latest"
|
||||||
defaultTargetsURL = "registry-1.docker.io/docker/tuf-targets"
|
defaultTargetsURL = "registry-1.docker.io/docker/tuf-targets"
|
||||||
|
defaultTUFChannel = ""
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -69,6 +71,7 @@ func init() {
|
|||||||
flag.IntVar(&handlerTimeoutSeconds, "handler-timeout", 25, "timeout for handler in seconds")
|
flag.IntVar(&handlerTimeoutSeconds, "handler-timeout", 25, "timeout for handler in seconds")
|
||||||
|
|
||||||
flag.StringVar(&tufRoot, "tuf-root", "prod", "specify embedded tuf root [dev, staging, prod], default [prod]")
|
flag.StringVar(&tufRoot, "tuf-root", "prod", "specify embedded tuf root [dev, staging, prod], default [prod]")
|
||||||
|
flag.StringVar(&tufChannel, "tuf-channel", defaultTUFChannel, "release channel [prod, testing], default [prod]")
|
||||||
flag.StringVar(&metadataURL, "tuf-metadata-source", defaultMetadataURL, "source (URL or repo) for TUF metadata")
|
flag.StringVar(&metadataURL, "tuf-metadata-source", defaultMetadataURL, "source (URL or repo) for TUF metadata")
|
||||||
flag.StringVar(&targetsURL, "tuf-targets-source", defaultTargetsURL, "source (URL or repo) for TUF targets")
|
flag.StringVar(&targetsURL, "tuf-targets-source", defaultTargetsURL, "source (URL or repo) for TUF targets")
|
||||||
flag.StringVar(&tufoutputPath, "tuf-output-path", defaultTUFOutputPath, "local dir to store TUF repo metadata")
|
flag.StringVar(&tufoutputPath, "tuf-output-path", defaultTUFOutputPath, "local dir to store TUF repo metadata")
|
||||||
@@ -88,8 +91,13 @@ func main() {
|
|||||||
|
|
||||||
ctx := useragent.Set(context.Background(), "attest-provider/"+version+" (docker)")
|
ctx := useragent.Set(context.Background(), "attest-provider/"+version+" (docker)")
|
||||||
|
|
||||||
|
if tufChannel == "prod" {
|
||||||
|
tufChannel = ""
|
||||||
|
}
|
||||||
|
|
||||||
validateHandler, err := handler.NewValidateHandler(ctx, &handler.ValidateHandlerOptions{
|
validateHandler, err := handler.NewValidateHandler(ctx, &handler.ValidateHandlerOptions{
|
||||||
TUFRoot: tufRoot,
|
TUFRoot: tufRoot,
|
||||||
|
TUFChannel: tufChannel,
|
||||||
TUFOutputPath: tufoutputPath,
|
TUFOutputPath: tufoutputPath,
|
||||||
TUFMetadataURL: metadataURL,
|
TUFMetadataURL: metadataURL,
|
||||||
TUFTargetsURL: targetsURL,
|
TUFTargetsURL: targetsURL,
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ type ValidationResult struct {
|
|||||||
|
|
||||||
type ValidateHandlerOptions struct {
|
type ValidateHandlerOptions struct {
|
||||||
TUFRoot string
|
TUFRoot string
|
||||||
|
TUFChannel string
|
||||||
TUFOutputPath string
|
TUFOutputPath string
|
||||||
TUFMetadataURL string
|
TUFMetadataURL string
|
||||||
TUFTargetsURL string
|
TUFTargetsURL string
|
||||||
@@ -74,6 +75,7 @@ func (h *validateHandler) newVerifier(ctx context.Context) (attest.Verifier, err
|
|||||||
LocalStorageDir: h.opts.TUFOutputPath,
|
LocalStorageDir: h.opts.TUFOutputPath,
|
||||||
MetadataSource: h.opts.TUFMetadataURL,
|
MetadataSource: h.opts.TUFMetadataURL,
|
||||||
TargetsSource: h.opts.TUFTargetsURL,
|
TargetsSource: h.opts.TUFTargetsURL,
|
||||||
|
PathPrefix: h.opts.TUFChannel,
|
||||||
VersionChecker: tuf.NewDefaultVersionChecker(),
|
VersionChecker: tuf.NewDefaultVersionChecker(),
|
||||||
},
|
},
|
||||||
LocalTargetsDir: h.opts.PolicyCacheDir,
|
LocalTargetsDir: h.opts.PolicyCacheDir,
|
||||||
|
|||||||
Reference in New Issue
Block a user