feat: add --overwrite flag

Author: srevinsaju

cmd/go-cat/main.go

@@ -25,6 +25,7 @@ func main() {
 
 		&cli.StringFlag{Name: "title", Usage: "Title of the infrastructure"},
 		&cli.BoolFlag{Name: "archive", Usage: "Add archive infra.json file"},
+		&cli.BoolFlag{Name: "overwrite", Usage: "Replace infra.json, and do not perform deep merge"},
 	}
 	infraFlags := []cli.Flag{
 		&cli.StringFlag{Name: "name", Usage: "Name of the service or endpoint"},

config/base.go

@@ -16,8 +16,9 @@ type GlobalConfig struct {
 	GitUsername string
 	GitPassword string
 
-	Title   string
-	Archive bool
+	Title     string
+	Archive   bool
+	Overwrite bool
 }
 
 func NewGlobalConfigFromCliContext(context *cli.Context) GlobalConfig {
@@ -26,7 +27,8 @@ func NewGlobalConfigFromCliContext(context *cli.Context) GlobalConfig {
 		GitUsername:   context.String("git.username"),
 		GitPassword:   context.String("git.password"),
 
-		Title:   context.String("title"),
-		Archive: context.Bool("archive"),
+		Title:     context.String("title"),
+		Archive:   context.Bool("archive"),
+		Overwrite: context.Bool("overwrite"),
 	}
 }

ops/push.go

@@ -52,15 +52,17 @@ func PushWithDbQueue(cfg config.GlobalConfig, queueDB string) error {
 }
 
 func PushFromStorage(repo *git.Repository, fs billy.Filesystem, infraMetaQueue *infrastructure.MetadataGroup, cfg config.GlobalConfig) error {
-	infraJson, err := storage.ReadInfraDb(fs)
-	if err != nil {
-		return err
-	}
-
 	infraMeta := &infrastructure.MetadataGroup{}
-	err = json.Unmarshal(infraJson, infraMeta)
-	if err != nil {
-		return err
+
+	if !cfg.Overwrite {
+		infraJson, err := storage.ReadInfraDb(fs)
+		if err != nil {
+			return err
+		}
+		err = json.Unmarshal(infraJson, infraMeta)
+		if err != nil {
+			return err
+		}
 	}
 
 	logger.Info("Adding infrastructure")

ui/go-cat-ui/src/App.svelte

@@ -24,8 +24,8 @@
   const relativeTime = new RelativeTime(); 
 	
   import infra_json from './infra.json';
-import Monitoring from './Monitoring.svelte';
-import InfraType from './InfraType.svelte';
+  import Monitoring from './Monitoring.svelte';
+  import InfraType from './InfraType.svelte';
 
   let data = infra_json["infra"];
   let catalog_name = import.meta.env.VITE_APP_CATALOG_NAME;
@@ -81,7 +81,7 @@ import InfraType from './InfraType.svelte';
 <section class="section">
   <div class="container">
 
-    <h1 class="title">{catalog_name}</h1>
+    <h1 class="title">{infra_json["title"]} | {catalog_name}</h1>
     <p id="last_updated" class="subtitle is-loading">
         Last updated <strong>{relativeTime.from(new Date(infra_json["updated_at"]))}</strong>. 
     </p>