Skip to content

Handle env parameters as strings array #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KenanHH merged 1 commit into from
Apr 2, 2024
Merged

Handle env parameters as strings array #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions internal/commands/fastedge/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ func appPropertiesFlags(cmd *cobra.Command) {
cmd.Flags().String("file", "", "Wasm binary filename ('-' means stdin)")
cmd.Flags().String("plan", "", "Plan name")
cmd.Flags().Bool("disabled", false, "Set status to 'disabled'")
cmd.Flags().StringSlice("env", nil, "Environment, in name=value format")
cmd.Flags().StringArray("env", nil, "Environment, in name=value format")
cmd.Flags().StringSlice("rsp_headers", nil, "Response headers to add, in name=value format")
}

Expand Down Expand Up @@ -386,13 +386,13 @@ func parseAppProperties(cmd *cobra.Command) (sdk.App, error) {
app.Status = newPointer(1)
}

env, err := getMapParamP(cmd, "env")
env, err := getMapParamP("env", cmd.Flags().GetStringArray)
if err != nil {
return app, err
}
app.Env = &env

rspHeaders, err := getMapParamP(cmd, "rsp_headers")
rspHeaders, err := getMapParamP("rsp_headers", cmd.Flags().GetStringSlice)
if err != nil {
return app, err
}
Expand All @@ -401,9 +401,9 @@ func parseAppProperties(cmd *cobra.Command) (sdk.App, error) {
return app, nil
}

func getMapParamP(cmd *cobra.Command, name string) (map[string]string, error) {
func getMapParamP(name string, f func(name string) ([]string, error)) (map[string]string, error) {
ret := make(map[string]string)
slice, err := cmd.Flags().GetStringSlice(name)
slice, err := f(name)
if err != nil || slice == nil || len(slice) == 0 {
return ret, err
}
Expand Down