refactor

anton.voskresensky · anton.voskresensky · commit a93919a43a0f · 2025-11-05T23:17:01.000+03:00
diff --git a/commands/coldstorage.go b/commands/coldstorage.go
@@ -34,7 +34,7 @@ func runColdStorage(cmd *cobra.Command, args []string) error {
 	logger := logging.NewLogger()
 	logger.Info(fmt.Sprintf("Starting cold storage migration hotCount=%d coldAttribute=%s dryRun=%t", hotCount, coldAttribute, dryRun))
 
-	client, err := utils.NewOSClientFromCommandConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
@@ -55,7 +55,7 @@ func runColdStorage(cmd *cobra.Command, args []string) error {
 
 	var candidates []string
 	for _, index := range allIndices {
-		if shouldMoveToColdStorage(index.Index, cutoffDate, dateFormat) {
+		if utils.IsOlderThanCutoff(index.Index, cutoffDate, dateFormat) {
 			candidates = append(candidates, index.Index)
 		}
 	}
@@ -112,7 +112,3 @@ func runColdStorage(cmd *cobra.Command, args []string) error {
 	logger.Info(fmt.Sprintf("Cold storage migration completed processed=%d skipped_already_cold=%d", len(coldIndices), len(alreadyCold)))
 	return nil
 }
-
-func shouldMoveToColdStorage(index, cutoffDate, dateFormat string) bool {
-	return utils.IsOlderThanCutoff(index, cutoffDate, dateFormat)
-}
diff --git a/commands/danglingchecker.go b/commands/danglingchecker.go
@@ -35,7 +35,7 @@ func runDanglingChecker(cmd *cobra.Command, args []string) error {
 	}
 
 	logger := logging.NewLogger()
-	client, err := utils.NewOSClientFromCommandConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/datasource.go b/commands/datasource.go
@@ -47,7 +47,7 @@ func runDataSource(cmd *cobra.Command, args []string) error {
 
 	logger := logging.NewLogger()
 	dryRun := cfg.GetDryRun()
-	_, err := utils.NewOSClientFromCommandConfig(cfg)
+	_, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/dereplicator.go b/commands/dereplicator.go
@@ -40,7 +40,7 @@ func runDereplicator(cmd *cobra.Command, args []string) error {
 	logger := logging.NewLogger()
 	logger.Info(fmt.Sprintf("Starting dereplication process daysCount=%d useSnapshot=%t snapRepo=%s dryRun=%t", daysCount, useSnapshot, snapRepo, dryRun))
 
-	client, err := utils.NewOSClientFromCommandConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/extracteddelete.go b/commands/extracteddelete.go
@@ -30,7 +30,7 @@ func runExtractedDelete(cmd *cobra.Command, args []string) error {
 	dryRun := cfg.GetDryRun()
 
 	logger := logging.NewLogger()
-	client, err := utils.NewOSClientFromCommandConfigWithError(cfg, cfg.GetOpenSearchRecovererURL())
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchRecovererURL())
 	if err != nil {
 		return err
 	}
@@ -57,7 +57,7 @@ func runExtractedDelete(cmd *cobra.Command, args []string) error {
 
 	var extractedIndices []string
 	for _, index := range allIndices {
-		if shouldDeleteExtractedIndex(index.Index, cutoffDate, dateFormat) {
+		if utils.IsOlderThanCutoff(index.Index, cutoffDate, dateFormat) {
 			extractedIndices = append(extractedIndices, index.Index)
 		}
 	}
@@ -88,7 +88,3 @@ func runExtractedDelete(cmd *cobra.Command, args []string) error {
 	logger.Info(fmt.Sprintf("Extracted indices deletion completed processed=%d", len(extractedIndices)))
 	return nil
 }
-
-func shouldDeleteExtractedIndex(index, cutoffDate, dateFormat string) bool {
-	return utils.IsOlderThanCutoff(index, cutoffDate, dateFormat)
-}
diff --git a/commands/indexpatterns.go b/commands/indexpatterns.go
@@ -37,7 +37,7 @@ func runIndexPatterns(cmd *cobra.Command, args []string) error {
 	dryRun := cfg.GetDryRun()
 
 	logger := logging.NewLogger()
-	osClient, err := utils.NewOSClientFromCommandConfig(cfg)
+	osClient, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/indicesdelete.go b/commands/indicesdelete.go
@@ -35,7 +35,7 @@ func runIndicesDelete(cmd *cobra.Command, args []string) error {
 
 	logger.Info(fmt.Sprintf("Starting indices deletion indicesCount=%d unknownDays=%d", len(indicesConfig), unknownConfig.DaysCount))
 
-	client, err := utils.NewOSClientFromCommandConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/retention.go b/commands/retention.go
@@ -40,7 +40,7 @@ func runRetention(cmd *cobra.Command, args []string) error {
 	logger := logging.NewLogger()
 	logger.Info(fmt.Sprintf("Starting retention process threshold=%.2f snapRepo=%s dryRun=%t", threshold, snapRepo, dryRun))
 
-	client, err := utils.NewOSClientFromCommandConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/sharding.go b/commands/sharding.go
@@ -32,7 +32,7 @@ func runSharding(cmd *cobra.Command, args []string) error {
 
 	logger := logging.NewLogger()
 	dryRun := cfg.GetDryRun()
-	client, err := utils.NewOSClientFromCommandConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/snapshot-manual.go b/commands/snapshot-manual.go
@@ -43,7 +43,7 @@ func runSnapshotManual(cmd *cobra.Command, args []string) error {
 
 	logger.Info(fmt.Sprintf("Starting manual snapshot creation kind=%s value=%s name=%s system=%t", kind, value, name, system))
 
-	client, err := utils.NewOSClientFromConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return err
 	}
diff --git a/commands/snapshots.go b/commands/snapshots.go
@@ -37,7 +37,7 @@ func runSnapshot(cmd *cobra.Command, args []string) error {
 
 	logger.Info(fmt.Sprintf("Starting snapshot creation indicesCount=%d unknownSnapshot=%t", len(indicesConfig), unknownConfig.Snapshot))
 
-	client, err := utils.NewOSClientFromCommandConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/snapshotschecker.go b/commands/snapshotschecker.go
@@ -31,7 +31,7 @@ func runSnapshotsChecker(cmd *cobra.Command, args []string) error {
 
 	logger.Info("Starting snapshot checking")
 
-	client, err := utils.NewOSClientFromCommandConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
diff --git a/commands/snapshotsdelete.go b/commands/snapshotsdelete.go
@@ -37,7 +37,7 @@ func runSnapshotsDelete(cmd *cobra.Command, args []string) error {
 
 	logger.Info(fmt.Sprintf("Starting snapshot deletion indicesCount=%d allDays=%d unknownDays=%d", len(indicesConfig), s3Config.UnitCount.All, s3Config.UnitCount.Unknown))
 
-	client, err := utils.NewOSClientFromConfig(cfg)
+	client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())
 	if err != nil {
 		return err
 	}
diff --git a/pkg/utils/helpers.go b/pkg/utils/helpers.go
@@ -7,26 +7,14 @@ import (
 	"strings"
 )
 
-func NewOSClientFromCommandConfig(cfg *config.CommandConfig) (*opensearch.Client, error) {
-	return opensearch.NewClient(cfg.GetOpenSearchURL(), cfg.GetCertFile(), cfg.GetKeyFile(), cfg.GetCAFile(), cfg.GetTimeout(), cfg.GetRetryAttempts())
-}
-
-func NewOSClientFromCommandConfigWithError(cfg *config.CommandConfig, url string) (*opensearch.Client, error) {
+func NewOSClientWithURL(cfg *config.Config, url string) (*opensearch.Client, error) {
 	client, err := opensearch.NewClient(url, cfg.GetCertFile(), cfg.GetKeyFile(), cfg.GetCAFile(), cfg.GetTimeout(), cfg.GetRetryAttempts())
 	if err != nil {
 		return nil, fmt.Errorf("failed to create OpenSearch client: %v", err)
 	}
 	return client, nil
 }
 
-func NewOSClientFromConfig(cfg *config.Config) (*opensearch.Client, error) {
-	client, err := opensearch.NewClient(cfg.GetOpenSearchURL(), cfg.GetCertFile(), cfg.GetKeyFile(), cfg.GetCAFile(), cfg.GetTimeout(), cfg.GetRetryAttempts())
-	if err != nil {
-		return nil, fmt.Errorf("failed to create OpenSearch client: %v", err)
-	}
-	return client, nil
-}
-
 func NormalizeURL(url string) string {
 	if url != "" && !strings.HasPrefix(url, "http://") && !strings.HasPrefix(url, "https://") {
 		return "https://" + url

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func runColdStorage(cmd *cobra.Command, args []string) error {`
`34`	`34`	`logger := logging.NewLogger()`
`35`	`35`	`logger.Info(fmt.Sprintf("Starting cold storage migration hotCount=%d coldAttribute=%s dryRun=%t", hotCount, coldAttribute, dryRun))`
`36`	`36`
`37`		`- client, err := utils.NewOSClientFromCommandConfig(cfg)`
	`37`	`+ client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`38`	`38`	`if err != nil {`
`39`	`39`	`return fmt.Errorf("failed to create OpenSearch client: %v", err)`
`40`	`40`	`}`
`@@ -55,7 +55,7 @@ func runColdStorage(cmd *cobra.Command, args []string) error {`
`55`	`55`
`56`	`56`	`var candidates []string`
`57`	`57`	`for _, index := range allIndices {`
`58`		`- if shouldMoveToColdStorage(index.Index, cutoffDate, dateFormat) {`
	`58`	`+ if utils.IsOlderThanCutoff(index.Index, cutoffDate, dateFormat) {`
`59`	`59`	`candidates = append(candidates, index.Index)`
`60`	`60`	`}`
`61`	`61`	`}`
`@@ -112,7 +112,3 @@ func runColdStorage(cmd *cobra.Command, args []string) error {`
`112`	`112`	`logger.Info(fmt.Sprintf("Cold storage migration completed processed=%d skipped_already_cold=%d", len(coldIndices), len(alreadyCold)))`
`113`	`113`	`return nil`
`114`	`114`	`}`
`115`		`-`
`116`		`-func shouldMoveToColdStorage(index, cutoffDate, dateFormat string) bool {`
`117`		`- return utils.IsOlderThanCutoff(index, cutoffDate, dateFormat)`
`118`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func runDanglingChecker(cmd *cobra.Command, args []string) error {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`logger := logging.NewLogger()`
`38`		`- client, err := utils.NewOSClientFromCommandConfig(cfg)`
	`38`	`+ client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`39`	`39`	`if err != nil {`
`40`	`40`	`return fmt.Errorf("failed to create OpenSearch client: %v", err)`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func runDataSource(cmd *cobra.Command, args []string) error {`
`47`	`47`
`48`	`48`	`logger := logging.NewLogger()`
`49`	`49`	`dryRun := cfg.GetDryRun()`
`50`		`- _, err := utils.NewOSClientFromCommandConfig(cfg)`
	`50`	`+ _, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`51`	`51`	`if err != nil {`
`52`	`52`	`return fmt.Errorf("failed to create OpenSearch client: %v", err)`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func runDereplicator(cmd *cobra.Command, args []string) error {`
`40`	`40`	`logger := logging.NewLogger()`
`41`	`41`	`logger.Info(fmt.Sprintf("Starting dereplication process daysCount=%d useSnapshot=%t snapRepo=%s dryRun=%t", daysCount, useSnapshot, snapRepo, dryRun))`
`42`	`42`
`43`		`- client, err := utils.NewOSClientFromCommandConfig(cfg)`
	`43`	`+ client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`44`	`44`	`if err != nil {`
`45`	`45`	`return fmt.Errorf("failed to create OpenSearch client: %v", err)`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func runExtractedDelete(cmd *cobra.Command, args []string) error {`
`30`	`30`	`dryRun := cfg.GetDryRun()`
`31`	`31`
`32`	`32`	`logger := logging.NewLogger()`
`33`		`- client, err := utils.NewOSClientFromCommandConfigWithError(cfg, cfg.GetOpenSearchRecovererURL())`
	`33`	`+ client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchRecovererURL())`
`34`	`34`	`if err != nil {`
`35`	`35`	`return err`
`36`	`36`	`}`
`@@ -57,7 +57,7 @@ func runExtractedDelete(cmd *cobra.Command, args []string) error {`
`57`	`57`
`58`	`58`	`var extractedIndices []string`
`59`	`59`	`for _, index := range allIndices {`
`60`		`- if shouldDeleteExtractedIndex(index.Index, cutoffDate, dateFormat) {`
	`60`	`+ if utils.IsOlderThanCutoff(index.Index, cutoffDate, dateFormat) {`
`61`	`61`	`extractedIndices = append(extractedIndices, index.Index)`
`62`	`62`	`}`
`63`	`63`	`}`
`@@ -88,7 +88,3 @@ func runExtractedDelete(cmd *cobra.Command, args []string) error {`
`88`	`88`	`logger.Info(fmt.Sprintf("Extracted indices deletion completed processed=%d", len(extractedIndices)))`
`89`	`89`	`return nil`
`90`	`90`	`}`
`91`		`-`
`92`		`-func shouldDeleteExtractedIndex(index, cutoffDate, dateFormat string) bool {`
`93`		`- return utils.IsOlderThanCutoff(index, cutoffDate, dateFormat)`
`94`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func runIndexPatterns(cmd *cobra.Command, args []string) error {`
`37`	`37`	`dryRun := cfg.GetDryRun()`
`38`	`38`
`39`	`39`	`logger := logging.NewLogger()`
`40`		`- osClient, err := utils.NewOSClientFromCommandConfig(cfg)`
	`40`	`+ osClient, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`41`	`41`	`if err != nil {`
`42`	`42`	`return fmt.Errorf("failed to create OpenSearch client: %v", err)`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func runIndicesDelete(cmd *cobra.Command, args []string) error {`
`35`	`35`
`36`	`36`	`logger.Info(fmt.Sprintf("Starting indices deletion indicesCount=%d unknownDays=%d", len(indicesConfig), unknownConfig.DaysCount))`
`37`	`37`
`38`		`- client, err := utils.NewOSClientFromCommandConfig(cfg)`
	`38`	`+ client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`39`	`39`	`if err != nil {`
`40`	`40`	`return fmt.Errorf("failed to create OpenSearch client: %v", err)`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func runRetention(cmd *cobra.Command, args []string) error {`
`40`	`40`	`logger := logging.NewLogger()`
`41`	`41`	`logger.Info(fmt.Sprintf("Starting retention process threshold=%.2f snapRepo=%s dryRun=%t", threshold, snapRepo, dryRun))`
`42`	`42`
`43`		`- client, err := utils.NewOSClientFromCommandConfig(cfg)`
	`43`	`+ client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`44`	`44`	`if err != nil {`
`45`	`45`	`return fmt.Errorf("failed to create OpenSearch client: %v", err)`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func runSharding(cmd *cobra.Command, args []string) error {`
`32`	`32`
`33`	`33`	`logger := logging.NewLogger()`
`34`	`34`	`dryRun := cfg.GetDryRun()`
`35`		`- client, err := utils.NewOSClientFromCommandConfig(cfg)`
	`35`	`+ client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`36`	`36`	`if err != nil {`
`37`	`37`	`return fmt.Errorf("failed to create OpenSearch client: %v", err)`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func runSnapshotManual(cmd *cobra.Command, args []string) error {`
`43`	`43`
`44`	`44`	`logger.Info(fmt.Sprintf("Starting manual snapshot creation kind=%s value=%s name=%s system=%t", kind, value, name, system))`
`45`	`45`
`46`		`- client, err := utils.NewOSClientFromConfig(cfg)`
	`46`	`+ client, err := utils.NewOSClientWithURL(cfg, cfg.GetOpenSearchURL())`
`47`	`47`	`if err != nil {`
`48`	`48`	`return err`
`49`	`49`	`}`