Bug Fix: Fix auto-loading search (algorand#1065)

Author: AlgoStephenAkiki

README.md

@@ -144,6 +144,8 @@ Below is a snippet of the output from `algorand-indexer api-config`:
 
 Seeing this we know that the `/v2/accounts` endpoint will return an error if either `currency-greater-than` or `currency-less-than` is provided.  Additionally, because a "required" parameter is provided for `/v2/assets/{asset-id}/transactions` then we know this entire endpoint is disabled.  The optional parameters are provided so that you can understand what else is disabled if you enable all "required" parameters.
 
+**NOTE: An empty parameter configuration file results in all parameters being ENABLED.**
+
 For more information on disabling parameters see the [Disabling Parameters Guide](docs/DisablingParametersGuide.md).
 
 ## Metrics
@@ -212,6 +214,8 @@ The Indexer data directory is the location where the Indexer can store and/or lo
 
 **It is a required argument for Indexer daemon operation. Supply it to the Indexer via the `--data-dir` flag.**
 
+**It is HIGHLY recommended placing the data directory in a separate, stateful directory for production usage of the Indexer.**
+
 
 ### Auto-Loading Configuration
 

cmd/algorand-indexer/daemon.go

@@ -109,6 +109,7 @@ var daemonCmd = &cobra.Command{
 				maybeFail(err, "invalid config file (%s): %v", viper.ConfigFileUsed(), err)
 			}
 			fmt.Printf("Using configuration file: %s\n", configFile)
+			config.BindFlags(cmd)
 		}
 
 		if paramConfigFound {
@@ -119,7 +120,7 @@ var daemonCmd = &cobra.Command{
 				panic(exit{1})
 			}
 			suppliedAPIConfigFile = filepath.Join(indexerDataDir, autoLoadParameterConfigName)
-			fmt.Printf("Auto-loading parameter configuration file: %s", suppliedAPIConfigFile)
+			fmt.Printf("Auto-loading parameter configuration file: %s\n", suppliedAPIConfigFile)
 
 		}
 
@@ -343,7 +344,14 @@ func makeOptions() (options api.ExtraOptions) {
 			fmt.Fprintf(os.Stderr, "failed to created disabled map config from file: %v", err)
 			panic(exit{1})
 		}
+
+		if len((*potentialDisabledMapConfig).Data) == 0 {
+			logger.Warnf("All parameters are enabled since the provided parameter configuration file (%s) is empty.", suppliedAPIConfigFile)
+		}
+
 		options.DisabledMapConfig = potentialDisabledMapConfig
+	} else {
+		logger.Infof("Enable all parameters flag is set to: %v", enableAllParameters)
 	}
 
 	return

cmd/algorand-indexer/main.go

@@ -136,22 +136,8 @@ func init() {
 	// Setup configuration file
 	viper.SetConfigName(config.FileName)
 	viper.SetConfigType(config.FileType)
-	for _, k := range config.ConfigPaths {
-		viper.AddConfigPath(k)
-	}
 	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
 
-	if err := viper.ReadInConfig(); err != nil {
-		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
-			// Config file not found, not an error since it may be set on the CLI.
-		} else {
-			fmt.Fprintf(os.Stderr, "invalid config file (%s): %v", viper.ConfigFileUsed(), err)
-			panic(exit{1})
-		}
-	} else {
-		fmt.Printf("Using configuration file: %s\n", viper.ConfigFileUsed())
-	}
-
 	viper.SetEnvPrefix(config.EnvPrefix)
 	viper.AutomaticEnv()
 

config/config.go

@@ -19,9 +19,6 @@ const FileType = "yml"
 // gets confused and thinks the binary is a config file with no extension.
 const FileName = "indexer"
 
-// ConfigPaths are the different locations that algorand-indexer should look for config files.
-var ConfigPaths = [...]string{".", "$HOME", "$HOME/.algorand-indexer/", "$HOME/.config/algorand-indexer/", "/etc/algorand-indexer/"}
-
 // BindFlags glues the cobra and viper libraries together.
 func BindFlags(cmd *cobra.Command) {
 	cmd.Flags().VisitAll(func(f *pflag.Flag) {

docs/DisablingParametersGuide.md

@@ -45,6 +45,8 @@ The first "level" is a key-value pair where the key is the REST path to the endp
 
 As a concrete example: in the above snippet the endpoint `/v2/accounts` has two optional parameters that are disabled: `currency-greater-than` and `currency-less-than`.  Querying that endpoint and providing either of those two parameters would result in an error being returned.
 
+**NOTE: An empty parameter configuration file results in all parameters being ENABLED.**
+
 ### Error Return Value
 
 If you query an endpoint with a required parameter you will receive a `400` response with a json message explaining the error.