From 76ea838459bfb877acba47e883fdcb0c7a5ca20c Mon Sep 17 00:00:00 2001
From: swatign <SwatiGanesh.Naik@Progress.com>
Date: Fri, 14 Feb 2025 13:13:42 +0530
Subject: [PATCH] checking path

Signed-off-by: swatign <SwatiGanesh.Naik@Progress.com>
---
 .../ingest-service/cmd/ingest-service/commands/serve.go  | 9 ++++++---
 components/ingest-service/grpc/grpc.go                   | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/ingest-service/cmd/ingest-service/commands/serve.go b/components/ingest-service/cmd/ingest-service/commands/serve.go
index e14286bbd4a..2a285a341b6 100644
--- a/components/ingest-service/cmd/ingest-service/commands/serve.go
+++ b/components/ingest-service/cmd/ingest-service/commands/serve.go
@@ -2,6 +2,7 @@ package commands
 
 import (
 	"fmt"
+	"log"
 	"os"
 
 	"github.com/sirupsen/logrus"
@@ -101,6 +102,7 @@ func readCliParams() *serveropts.Opts {
 		nodesMissingRunningDefault = false
 	}
 
+	log.Printf("-------------------Schema Path: %s", viper.GetString("schema-path"))
 	return &serveropts.Opts{
 		Host:                          viper.GetString("host"),
 		Port:                          viper.GetInt("port"),
@@ -131,11 +133,12 @@ func readCliParams() *serveropts.Opts {
 			MissingNodesForDeletionRunningDefault: missingNodesForDeletionRunningDefault,
 			NodesMissingRunningDefault:            nodesMissingRunningDefault,
 		},
-		Storage: serveropts.StorageConfig{ //Added Storage Configuration
+		//Added Storage Configuration
+		Storage: serveropts.StorageConfig{
+			SchemaPath: viper.GetString("schema-path"),
 			// 	URI:          viper.GetString("postgresql-url"),
 			// 	DBUser:       viper.GetString("postgresql-user"),
 			// 	Database:     viper.GetString("postgresql-database"),
-			SchemaPath: viper.GetString("schema-path"),
 			// 	MaxOpenConns: viper.GetInt("postgresql-max-open-conns"),
 			// 	MaxIdleConns: viper.GetInt("postgresql-max-idle-conns"),
 		},
@@ -156,7 +159,7 @@ func init() {
 	serveCmd.Flags().String("nodemanager-address", "localhost:10120", "address of nodemanager (domain:<port>)")
 	serveCmd.Flags().String("config-mgmt-address", "localhost:10119", "address of config-mgmt-service (domain:<port>)")
 	serveCmd.Flags().String("postgresql-url", "", "PG URI (postgres://host:port)")
-	serveCmd.Flags().String("schema-path", "", "../../../storage/schema")
+	serveCmd.Flags().String("schema-path", "", "../../../storage/schema/sql")
 	serveCmd.Flags().String("postgresql-database", "chef_ingest_service", "PG Database name")
 	serveCmd.Flags().Int32("converge-history-days", 30, "Number of days to keep converge history for. A number less than or equal to 0 means data should never be deleted")
 	serveCmd.Flags().Int32("actions-days", 30, "Number of days to keep actions for. A number less than or equal to 0 means data should never be deleted")
diff --git a/components/ingest-service/grpc/grpc.go b/components/ingest-service/grpc/grpc.go
index a4124a2044b..c456545cfbe 100644
--- a/components/ingest-service/grpc/grpc.go
+++ b/components/ingest-service/grpc/grpc.go
@@ -83,9 +83,12 @@ func Spawn(opts *serveropts.Opts) error {
 	if err != nil {
 		return errors.Wrapf(err, "Failed to open database with uri: %s", pgURL)
 	}
+
+	log.Printf("********************Schema Path: %s", opts.Storage.SchemaPath)
 	storageConfig := &config.Storage{
 		URI:        pgURL,
 		SchemaPath: opts.Storage.SchemaPath,
+		//SchemaPath: "../storage/schema",
 	}
 
 	err = storage.RunMigrations(storageConfig) // Call the migration function