Merge pull request #35 from CGI-FR/feat-ingress-descriptor-argument

feat(id): add option to change ingress-descriptor filename

Author: Youen Péron

CHANGELOG.md

@@ -14,6 +14,10 @@ Types of changes
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+## [1.6.0]
+
+- `Added` option to change ingress-descriptor filename
+
 ## [1.5.0]
 
 - `Added` update Pimo to v1.8.0

README.md

@@ -135,6 +135,11 @@ IngressDescriptor:
             name: public.language
 ```
 
+### `--ingress-descriptor` argument
+
+Ingress descriptor filename is parameterized with the `--ingress-descriptor` argument or its short alias `-i`.
+this argument is present for all commands below.
+
 ### Display plan
 
 The `display-plan` utilities explain the `lino`'s plan to extract data from database.

cmd/lino/dep_id.go

@@ -24,14 +24,14 @@ import (
 	domain "github.com/cgi-fr/lino/pkg/id"
 )
 
-func idStorage() domain.Storage {
-	return infra.NewMultiStorage(infra.NewYAMLStorage(), infra.NewDOTStorage())
+func idStorageFile(filename string) domain.Storage {
+	return infra.NewMultiStorage(infra.NewYAMLStorage(filename), infra.NewDOTStorage())
 }
 
-func idStorageFactory() func(string) domain.Storage {
-	return func(table string) domain.Storage {
+func idStorageFactory() func(string, string) domain.Storage {
+	return func(table string, filename string) domain.Storage {
 		if table == "" {
-			return idStorage()
+			return idStorageFile(filename)
 		}
 		return infra.NewTableStorage(domain.NewTable(table))
 	}

cmd/lino/main.go

@@ -97,7 +97,6 @@ func main() {
 	   	pprof.StartCPUProfile(f)
 	   	defer pprof.StopCPUProfile() */
 	// CPU profiling code ends here
-
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
@@ -166,7 +165,7 @@ func initConfig() {
 	dataconnector.Inject(dataconnectorStorage(), dataPingerFactory())
 	relation.Inject(dataconnectorStorage(), relationStorage(), relationExtractorFactory())
 	table.Inject(dataconnectorStorage(), tableStorage(), tableExtractorFactory())
-	id.Inject(idStorage(), relationStorage(), idExporter(), idJSONStorage(*os.Stdout))
+	id.Inject(idStorageFile, relationStorage(), idExporter(), idJSONStorage(*os.Stdout))
 	pull.Inject(dataconnectorStorage(), relationStorage(), tableStorage(), idStorageFactory(), pullDataSourceFactory(), pullRowExporterFactory(), pullRowReaderFactory(), traceListner(os.Stderr))
 	push.Inject(dataconnectorStorage(), relationStorage(), tableStorage(), idStorageFactory(), pushDataDestinationFactory(), pushRowIteratorFactory(), pushRowExporterFactory())
 }

internal/app/http/cli.go

@@ -31,7 +31,10 @@ import (
 
 // NewCommand implements the cli http command
 func NewCommand(fullName string, err *os.File, out *os.File, in *os.File) *cobra.Command {
-	var port uint
+	var (
+		port              uint
+		ingressDescriptor string
+	)
 
 	cmd := &cobra.Command{
 		Use:     "http",
@@ -46,23 +49,23 @@ func NewCommand(fullName string, err *os.File, out *os.File, in *os.File) *cobra
 
 			api.Path("/data/{dataSource}").
 				Methods(http.MethodGet).
-				HandlerFunc(pull.Handler)
+				HandlerFunc(pull.HandlerFactory(ingressDescriptor))
 
 			api.Path("/data/{dataDestination}").
 				Queries("mode", "delete").
-				HandlerFunc(push.DeleteHandler)
+				HandlerFunc(push.DeleteHandlerFactory(ingressDescriptor))
 
 			api.Path("/data/{dataDestination}").
 				Queries("mode", "insert").
-				HandlerFunc(push.InsertHandler)
+				HandlerFunc(push.InsertHandlerFactory(ingressDescriptor))
 
 			api.Path("/data/{dataDestination}").
 				Queries("mode", "truncate").
-				HandlerFunc(push.TruncatHandler)
+				HandlerFunc(push.TruncatHandlerFactory(ingressDescriptor))
 
 			api.Path("/data/{dataDestination}").
 				Methods(http.MethodPost).
-				HandlerFunc(push.TruncatHandler)
+				HandlerFunc(push.TruncatHandlerFactory(ingressDescriptor))
 
 			http.Handle("/", r)
 			bind := fmt.Sprintf(":%d", port)
@@ -75,6 +78,7 @@ func NewCommand(fullName string, err *os.File, out *os.File, in *os.File) *cobra
 		},
 	}
 	cmd.Flags().UintVarP(&port, "port", "p", 8000, "HTTP Port to bind")
+	cmd.Flags().StringVarP(&ingressDescriptor, "ingress-descriptor", "i", "ingress-descriptor.yaml", "Ingress descriptor filename")
 	cmd.SetOut(out)
 	cmd.SetErr(err)
 	cmd.SetIn(in)

internal/app/id/cli.go

@@ -28,15 +28,16 @@ import (
 )
 
 var (
-	idStorage      id.Storage
-	relStorage     relation.Storage
-	idExporter     id.Exporter
-	idJSONExporter id.Storage
+	idStorageFactory  func(string) id.Storage
+	relStorage        relation.Storage
+	idExporter        id.Exporter
+	idJSONExporter    id.Storage
+	ingressDescriptor string
 )
 
 // Inject dependencies
-func Inject(ids id.Storage, rels relation.Storage, ex id.Exporter, jSONEx id.Storage) {
-	idStorage = ids
+func Inject(ids func(string) id.Storage, rels relation.Storage, ex id.Exporter, jSONEx id.Storage) {
+	idStorageFactory = ids
 	relStorage = rels
 	idExporter = ex
 	idJSONExporter = jSONEx
@@ -57,6 +58,7 @@ func NewCommand(fullName string, err *os.File, out *os.File, in *os.File) *cobra
 	cmd.AddCommand(newSetStartTableCommand(fullName, err, out, in))
 	cmd.AddCommand(newSetChildLookupCommand(fullName, err, out, in))
 	cmd.AddCommand(newSetParentLookupCommand(fullName, err, out, in))
+	cmd.PersistentFlags().StringVarP(&ingressDescriptor, "ingress-descriptor", "i", "ingress-descriptor.yaml", "Ingress descriptor filename")
 	cmd.SetOut(out)
 	cmd.SetErr(err)
 	cmd.SetIn(in)

internal/app/id/create.go

@@ -45,7 +45,7 @@ func newCreateCommand(fullName string, err *os.File, out *os.File, in *os.File)
 
 			reader := infra.NewRelationReader(relations)
 
-			e := id.Create(table, reader, idStorage)
+			e := id.Create(table, reader, idStorageFactory(ingressDescriptor))
 			if e != nil {
 				fmt.Fprintln(err, e.Description)
 				os.Exit(1)

internal/app/id/displayplan.go

@@ -34,7 +34,7 @@ func newDisplayPlanCommand(fullName string, err *os.File, out *os.File, in *os.F
 		Example: fmt.Sprintf("  %[1]s id display-plan", fullName),
 		Args:    cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			result, e := id.GetPullerPlan(idStorage)
+			result, e := id.GetPullerPlan(idStorageFactory(ingressDescriptor))
 			if e != nil {
 				fmt.Fprintln(err, e.Description)
 				os.Exit(1)

internal/app/id/export.go

@@ -33,7 +33,7 @@ func newExportCommand(fullName string, err *os.File, out *os.File, in *os.File)
 		Example: fmt.Sprintf("  %[1]s id export", fullName),
 		Args:    cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			id, e := idStorage.Read()
+			id, e := idStorageFactory(ingressDescriptor).Read()
 			if e != nil {
 				fmt.Fprintln(err, e.Description)
 				os.Exit(1)

internal/app/id/set_child_lookup.go

@@ -41,7 +41,7 @@ func newSetChildLookupCommand(fullName string, err *os.File, out *os.File, in *o
 				os.Exit(1)
 			}
 
-			e := id.SetChildLookup(relation, flag, idStorage)
+			e := id.SetChildLookup(relation, flag, idStorageFactory(ingressDescriptor))
 			if e != nil {
 				fmt.Fprintln(err, e.Description)
 				os.Exit(1)