changes:

- added unit tests
    - put all subcmds into one file
    - use io.Writer for output, better for testing
    - added upload form support
    - added api docs
    - generalized db engine
    - added mail notify support for forms
    - enhanced server/SetupAuthStore() to also look up form ids
    - added form template (put into .go file by Makefile
    - renamed project

upctl/cmd/delete.go

@@ -1,47 +0,0 @@
-/*
-Copyright © 2023 Thomas von Dein
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-package cmd
-
-import (
-	"errors"
-	"github.com/spf13/cobra"
-	"github.com/tlinden/cenophane/upctl/cfg"
-	"github.com/tlinden/cenophane/upctl/lib"
-)
-
-func DeleteCommand(conf *cfg.Config) *cobra.Command {
-	var deleteCmd = &cobra.Command{
-		Use:   "delete [options] <id>",
-		Short: "Delete an upload",
-		Long:  `Delete an upload identified by its id`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("No id specified to delete!")
-			}
-
-			// errors at this stage do not cause the usage to be shown
-			cmd.SilenceUsage = true
-
-			return lib.Delete(conf, args)
-		},
-	}
-
-	deleteCmd.Aliases = append(deleteCmd.Aliases, "rm")
-	deleteCmd.Aliases = append(deleteCmd.Aliases, "d")
-
-	return deleteCmd
-}

upctl/cmd/describe.go

@@ -1,48 +0,0 @@
-/*
-Copyright © 2023 Thomas von Dein
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-package cmd
-
-import (
-	"errors"
-	"github.com/spf13/cobra"
-	"github.com/tlinden/cenophane/upctl/cfg"
-	"github.com/tlinden/cenophane/upctl/lib"
-)
-
-func DescribeCommand(conf *cfg.Config) *cobra.Command {
-	var listCmd = &cobra.Command{
-		Use:   "describe [options] upload-id",
-		Long:  "Show detailed informations about an upload object.",
-		Short: `Describe an upload.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("No id specified to delete!")
-			}
-
-			// errors at this stage do not cause the usage to be shown
-			cmd.SilenceUsage = true
-
-			return lib.Describe(conf, args)
-		},
-	}
-
-	listCmd.Aliases = append(listCmd.Aliases, "des")
-	listCmd.Aliases = append(listCmd.Aliases, "info")
-	listCmd.Aliases = append(listCmd.Aliases, "i")
-
-	return listCmd
-}

upctl/cmd/download.go

@@ -1,49 +0,0 @@
-/*
-Copyright © 2023 Thomas von Dein
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-package cmd
-
-import (
-	"errors"
-	"github.com/spf13/cobra"
-	"github.com/tlinden/cenophane/upctl/cfg"
-	"github.com/tlinden/cenophane/upctl/lib"
-)
-
-func DownloadCommand(conf *cfg.Config) *cobra.Command {
-	var listCmd = &cobra.Command{
-		Use:   "download [options] upload-id",
-		Long:  "Download the file associated with an upload object.",
-		Short: `Download a file.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("No id specified to delete!")
-			}
-
-			// errors at this stage do not cause the usage to be shown
-			cmd.SilenceUsage = true
-
-			return lib.Download(conf, args)
-		},
-	}
-
-	listCmd.Aliases = append(listCmd.Aliases, "down")
-	listCmd.Aliases = append(listCmd.Aliases, "get")
-	listCmd.Aliases = append(listCmd.Aliases, "g")
-	listCmd.Aliases = append(listCmd.Aliases, "fetch")
-
-	return listCmd
-}

upctl/cmd/formcommands.go

@@ -0,0 +1,73 @@
+/*
+Copyright © 2023 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package cmd
+
+import (
+	//"errors"
+	"github.com/spf13/cobra"
+	"github.com/tlinden/ephemerup/upctl/cfg"
+	"github.com/tlinden/ephemerup/upctl/lib"
+	"os"
+)
+
+func FormCommand(conf *cfg.Config) *cobra.Command {
+	var formCmd = &cobra.Command{
+		Use:   "form {create|delete|modify|list}",
+		Short: "Form commands",
+		Long:  `Manage upload forms.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// errors at this stage do not cause the usage to be shown
+			//cmd.SilenceUsage = true
+			if len(args) == 0 {
+				cmd.Help()
+				os.Exit(0)
+			}
+			return nil
+		},
+	}
+
+	formCmd.Aliases = append(formCmd.Aliases, "frm")
+	formCmd.Aliases = append(formCmd.Aliases, "f")
+
+	formCmd.AddCommand(FormCreateCommand(conf))
+
+	return formCmd
+}
+
+func FormCreateCommand(conf *cfg.Config) *cobra.Command {
+	var formCreateCmd = &cobra.Command{
+		Use:   "create [options]",
+		Short: "Create a new form",
+		Long:  `Create a new form for consumers so they can upload something.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// errors at this stage do not cause the usage to be shown
+			cmd.SilenceUsage = true
+
+			return lib.CreateForm(os.Stdout, conf)
+		},
+	}
+
+	// options
+	formCreateCmd.PersistentFlags().StringVarP(&conf.Expire, "expire", "e", "", "Expire setting: asap or duration (accepted shortcuts: dmh)")
+	formCreateCmd.PersistentFlags().StringVarP(&conf.Description, "description", "D", "", "Description of the form")
+	formCreateCmd.PersistentFlags().StringVarP(&conf.Notify, "notify", "n", "", "Email address to get notified when consumer has uploaded files")
+
+	formCreateCmd.Aliases = append(formCreateCmd.Aliases, "add")
+	formCreateCmd.Aliases = append(formCreateCmd.Aliases, "+")
+
+	return formCreateCmd
+}

upctl/cmd/list.go

@@ -1,45 +0,0 @@
-/*
-Copyright © 2023 Thomas von Dein
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-package cmd
-
-import (
-	"github.com/spf13/cobra"
-	"github.com/tlinden/cenophane/upctl/cfg"
-	"github.com/tlinden/cenophane/upctl/lib"
-)
-
-func ListCommand(conf *cfg.Config) *cobra.Command {
-	var listCmd = &cobra.Command{
-		Use:   "list [options] [file ..]",
-		Short: "List uploads",
-		Long:  `List uploads.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			// errors at this stage do not cause the usage to be shown
-			cmd.SilenceUsage = true
-
-			return lib.List(conf, args)
-		},
-	}
-
-	// options
-	listCmd.PersistentFlags().StringVarP(&conf.Apicontext, "apicontext", "", "", "Filter by given API context")
-
-	listCmd.Aliases = append(listCmd.Aliases, "ls")
-	listCmd.Aliases = append(listCmd.Aliases, "l")
-
-	return listCmd
-}

upctl/cmd/maincommands.go

@@ -0,0 +1,145 @@
+/*
+Copyright © 2023 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package cmd
+
+import (
+	"errors"
+	"github.com/spf13/cobra"
+	"github.com/tlinden/ephemerup/upctl/cfg"
+	"github.com/tlinden/ephemerup/upctl/lib"
+	"os"
+)
+
+func UploadCommand(conf *cfg.Config) *cobra.Command {
+	var uploadCmd = &cobra.Command{
+		Use:   "upload [options] [file ..]",
+		Short: "Upload files",
+		Long:  `Upload files to an upload api.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) == 0 {
+				return errors.New("No files specified to upload!")
+			}
+
+			// errors at this stage do not cause the usage to be shown
+			cmd.SilenceUsage = true
+
+			return lib.UploadFiles(os.Stdout, conf, args)
+		},
+	}
+
+	// options
+	uploadCmd.PersistentFlags().StringVarP(&conf.Expire, "expire", "e", "", "Expire setting: asap or duration (accepted shortcuts: dmh)")
+
+	uploadCmd.Aliases = append(uploadCmd.Aliases, "up")
+	uploadCmd.Aliases = append(uploadCmd.Aliases, "u")
+
+	return uploadCmd
+}
+
+func ListCommand(conf *cfg.Config) *cobra.Command {
+	var listCmd = &cobra.Command{
+		Use:   "list [options] [file ..]",
+		Short: "List uploads",
+		Long:  `List uploads.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// errors at this stage do not cause the usage to be shown
+			cmd.SilenceUsage = true
+
+			return lib.List(os.Stdout, conf, args)
+		},
+	}
+
+	// options
+	listCmd.PersistentFlags().StringVarP(&conf.Apicontext, "apicontext", "", "", "Filter by given API context")
+
+	listCmd.Aliases = append(listCmd.Aliases, "ls")
+	listCmd.Aliases = append(listCmd.Aliases, "l")
+
+	return listCmd
+}
+
+func DeleteCommand(conf *cfg.Config) *cobra.Command {
+	var deleteCmd = &cobra.Command{
+		Use:   "delete [options] <id>",
+		Short: "Delete an upload",
+		Long:  `Delete an upload identified by its id`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) == 0 {
+				return errors.New("No id specified to delete!")
+			}
+
+			// errors at this stage do not cause the usage to be shown
+			cmd.SilenceUsage = true
+
+			return lib.Delete(os.Stdout, conf, args)
+		},
+	}
+
+	deleteCmd.Aliases = append(deleteCmd.Aliases, "rm")
+	deleteCmd.Aliases = append(deleteCmd.Aliases, "d")
+
+	return deleteCmd
+}
+
+func DescribeCommand(conf *cfg.Config) *cobra.Command {
+	var listCmd = &cobra.Command{
+		Use:   "describe [options] upload-id",
+		Long:  "Show detailed informations about an upload object.",
+		Short: `Describe an upload.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) == 0 {
+				return errors.New("No id specified to delete!")
+			}
+
+			// errors at this stage do not cause the usage to be shown
+			cmd.SilenceUsage = true
+
+			return lib.Describe(os.Stdout, conf, args)
+		},
+	}
+
+	listCmd.Aliases = append(listCmd.Aliases, "des")
+	listCmd.Aliases = append(listCmd.Aliases, "info")
+	listCmd.Aliases = append(listCmd.Aliases, "i")
+
+	return listCmd
+}
+
+func DownloadCommand(conf *cfg.Config) *cobra.Command {
+	var listCmd = &cobra.Command{
+		Use:   "download [options] upload-id",
+		Long:  "Download the file associated with an upload object.",
+		Short: `Download a file.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) == 0 {
+				return errors.New("No id specified to delete!")
+			}
+
+			// errors at this stage do not cause the usage to be shown
+			cmd.SilenceUsage = true
+
+			return lib.Download(os.Stdout, conf, args)
+		},
+	}
+
+	listCmd.Aliases = append(listCmd.Aliases, "down")
+	listCmd.Aliases = append(listCmd.Aliases, "get")
+	listCmd.Aliases = append(listCmd.Aliases, "g")
+	listCmd.Aliases = append(listCmd.Aliases, "fetch")
+
+	return listCmd
+}

upctl/cmd/root.go

@@ -22,7 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"github.com/tlinden/cenophane/upctl/cfg"
+	"github.com/tlinden/ephemerup/upctl/cfg"
 	"os"
 	"strings"
 )
@@ -92,6 +92,7 @@ func Execute() {
 	rootCmd.AddCommand(DeleteCommand(&conf))
 	rootCmd.AddCommand(DescribeCommand(&conf))
 	rootCmd.AddCommand(DownloadCommand(&conf))
+	rootCmd.AddCommand(FormCommand(&conf))
 
 	err := rootCmd.Execute()
 	if err != nil {

upctl/cmd/upload.go

@@ -1,50 +0,0 @@
-/*
-Copyright © 2023 Thomas von Dein
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-package cmd
-
-import (
-	"errors"
-	"github.com/spf13/cobra"
-	"github.com/tlinden/cenophane/upctl/cfg"
-	"github.com/tlinden/cenophane/upctl/lib"
-)
-
-func UploadCommand(conf *cfg.Config) *cobra.Command {
-	var uploadCmd = &cobra.Command{
-		Use:   "upload [options] [file ..]",
-		Short: "Upload files",
-		Long:  `Upload files to an upload api.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("No files specified to upload!")
-			}
-
-			// errors at this stage do not cause the usage to be shown
-			cmd.SilenceUsage = true
-
-			return lib.UploadFiles(conf, args)
-		},
-	}
-
-	// options
-	uploadCmd.PersistentFlags().StringVarP(&conf.Expire, "expire", "e", "", "Expire setting: asap or duration (accepted shortcuts: dmh)")
-
-	uploadCmd.Aliases = append(uploadCmd.Aliases, "up")
-	uploadCmd.Aliases = append(uploadCmd.Aliases, "u")
-
-	return uploadCmd
-}