knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reference context from templates in main

This commit is contained in:
Luke K 2020-07-01 13:50:06 +00:00
parent fe970009a8
commit 5e621e583a
No known key found for this signature in database
GPG Key ID: 4896F75BAF2E1966
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/create.go
View File

@ -28,7 +28,7 @@ func init() {
createCmd.Flags().StringP("name", "n", "", "optionally specify an explicit name for the serive, overriding path-derivation. $FAAS_NAME") createCmd.Flags().StringP("name", "n", "", "optionally specify an explicit name for the serive, overriding path-derivation. $FAAS_NAME")
createCmd.Flags().StringP("registry", "r", "quay.io", "image registry (ex: quay.io). $FAAS_REGISTRY") createCmd.Flags().StringP("registry", "r", "quay.io", "image registry (ex: quay.io). $FAAS_REGISTRY")
createCmd.Flags().StringP("namespace", "s", "", "namespace at image registry (usually username or org name). $FAAS_NAMESPACE") createCmd.Flags().StringP("namespace", "s", "", "namespace at image registry (usually username or org name). $FAAS_NAMESPACE")
createCmd.Flags().StringP("context", "x", embedded.DefaultContext, "Function context (ex: 'http','events'). $FAAS_CONTEXT") createCmd.Flags().StringP("template", "t", embedded.DefaultTemplate, "Function template (ex: 'http','events'). $FAAS_TEMPLATE")
createCmd.Flags().StringP("templates", "", filepath.Join(configPath(), "faas", "templates"), "Extensible templates path. $FAAS_TEMPLATES") createCmd.Flags().StringP("templates", "", filepath.Join(configPath(), "faas", "templates"), "Extensible templates path. $FAAS_TEMPLATES")
createCmd.RegisterFlagCompletionFunc("registry", CompleteRegistryList) createCmd.RegisterFlagCompletionFunc("registry", CompleteRegistryList)
} }
@ -49,7 +49,7 @@ var createCmd = &cobra.Command{
viper.BindPFlag("name", cmd.Flags().Lookup("name")) viper.BindPFlag("name", cmd.Flags().Lookup("name"))
viper.BindPFlag("registry", cmd.Flags().Lookup("registry")) viper.BindPFlag("registry", cmd.Flags().Lookup("registry"))
viper.BindPFlag("namespace", cmd.Flags().Lookup("namespace")) viper.BindPFlag("namespace", cmd.Flags().Lookup("namespace"))
viper.BindPFlag("context", cmd.Flags().Lookup("context")) viper.BindPFlag("template", cmd.Flags().Lookup("template"))
viper.BindPFlag("templates", cmd.Flags().Lookup("templates")) viper.BindPFlag("templates", cmd.Flags().Lookup("templates"))
}, },
} }
@ -81,11 +81,11 @@ type createConfig struct {
// images will be stored by their canonical name. // images will be stored by their canonical name.
Namespace string Namespace string
// Context is the form of the resultant function, i.e. the function signature // Template is the form of the resultant function, i.e. the function signature
// and contextually avaialable resources. For example 'http' for a funciton // and contextually avaialable resources. For example 'http' for a funciton
// expected to be invoked via straight HTTP requests, or 'events' for a // expected to be invoked via straight HTTP requests, or 'events' for a
// function which will be invoked with CloudEvents. // function which will be invoked with CloudEvents.
Context string Template string
// Templates is an optional path that, if it exists, will be used as a source // Templates is an optional path that, if it exists, will be used as a source
// for additional templates not included in the binary. If not provided // for additional templates not included in the binary. If not provided
@ -118,8 +118,8 @@ func create(cmd *cobra.Command, args []string) (err error) {
Name: viper.GetString("name"), Name: viper.GetString("name"),
Registry: viper.GetString("registry"), Registry: viper.GetString("registry"),
Namespace: viper.GetString("namespace"), Namespace: viper.GetString("namespace"),
Context: viper.GetString("context"), Template: viper.GetString("template"), // to use
Templates: viper.GetString("templates"), Templates: viper.GetString("templates"), // extendex repos
Language: args[0], Language: args[0],
Path: ".", // will be expanded to current working dir. Path: ".", // will be expanded to current working dir.
} }
@ -185,7 +185,7 @@ func create(cmd *cobra.Command, args []string) (err error) {
// Returns the final address. // Returns the final address.
// Name can be empty string (path-dervation will be attempted) // Name can be empty string (path-dervation will be attempted)
// Path can be empty, defaulting to current working directory. // Path can be empty, defaulting to current working directory.
return client.Create(config.Language, config.Context, config.Name, config.Path) return client.Create(config.Language, config.Template, config.Name, config.Path)
} }
func gatherFromUser(config createConfig) (c createConfig, err error) { func gatherFromUser(config createConfig) (c createConfig, err error) {
@ -199,7 +199,7 @@ func gatherFromUser(config createConfig) (c createConfig, err error) {
config.Registry = prompt.ForString("Image registry", config.Registry) config.Registry = prompt.ForString("Image registry", config.Registry)
config.Namespace = prompt.ForString("Namespace at registry", config.Namespace) config.Namespace = prompt.ForString("Namespace at registry", config.Namespace)
config.Language = prompt.ForString("Language of source", config.Language) config.Language = prompt.ForString("Language of source", config.Language)
config.Context = prompt.ForString("Function Context", config.Context) config.Template = prompt.ForString("Function Template", config.Template)
return config, nil return config, nil
} }