either use embedded configs or FS configs, never both

smartcontractkit · Jun 11, 2024 · cb8e165 · cb8e165
1 parent 1b8dfb6
commit cb8e165
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml
@@ -7,7 +7,7 @@ inputs:
     default: chainlink-tests
     required: false
   tag:
-    description: The tag to use by default and to use for checking image existance
+    description: The tag to use by default and to use for checking image existence
     default: ${{ github.sha }}
     required: false
   other_tags:

diff --git a/integration-tests/testconfig/testconfig.go b/integration-tests/testconfig/testconfig.go
@@ -312,34 +312,34 @@ func GetConfig(configurationName string, product Product) (TestConfig, error) {
 				logger.Warn().Msgf("Number of Seth networks: %d", len(testConfig.Seth.Networks))
 			}
 		}
-	}
-
-	logger.Info().Msg("Reading configs from file system")
-	for _, fileName := range fileNames {
-		logger.Debug().Msgf("Looking for config file %s", fileName)
-		filePath, err := osutil.FindFile(fileName, osutil.DEFAULT_STOP_FILE_NAME, 3)
+	} else {
+		logger.Info().Msg("Reading configs from file system")
+		for _, fileName := range fileNames {
+			logger.Debug().Msgf("Looking for config file %s", fileName)
+			filePath, err := osutil.FindFile(fileName, osutil.DEFAULT_STOP_FILE_NAME, 3)
 
-		if err != nil && errors.Is(err, os.ErrNotExist) {
-			logger.Debug().Msgf("Config file %s not found", fileName)
-			continue
-		} else if err != nil {
-			return TestConfig{}, errors.Wrapf(err, "error looking for file %s", filePath)
-		}
-		logger.Debug().Str("location", filePath).Msgf("Found config file %s", fileName)
+			if err != nil && errors.Is(err, os.ErrNotExist) {
+				logger.Debug().Msgf("Config file %s not found", fileName)
+				continue
+			} else if err != nil {
+				return TestConfig{}, errors.Wrapf(err, "error looking for file %s", filePath)
+			}
+			logger.Debug().Str("location", filePath).Msgf("Found config file %s", fileName)
 
-		content, err := readFile(filePath)
-		if err != nil {
-			return TestConfig{}, errors.Wrapf(err, "error reading file %s", filePath)
-		}
+			content, err := readFile(filePath)
+			if err != nil {
+				return TestConfig{}, errors.Wrapf(err, "error reading file %s", filePath)
+			}
 
-		err = handleSpecialOverrides(logger, fileName, configurationName, &testConfig, content, product)
-		if err != nil {
-			return TestConfig{}, errors.Wrapf(err, "error reading file %s", filePath)
-		}
+			err = handleSpecialOverrides(logger, fileName, configurationName, &testConfig, content, product)
+			if err != nil {
+				return TestConfig{}, errors.Wrapf(err, "error reading file %s", filePath)
+			}
 
-		if testConfig.Seth != nil {
-			logger.Warn().Msgf("Ephemeral keys: %d", *testConfig.Seth.EphemeralAddrs)
-			logger.Warn().Msgf("Number of Seth networks: %d", len(testConfig.Seth.Networks))
+			if testConfig.Seth != nil {
+				logger.Warn().Msgf("Ephemeral keys: %d", *testConfig.Seth.EphemeralAddrs)
+				logger.Warn().Msgf("Number of Seth networks: %d", len(testConfig.Seth.Networks))
+			}
 		}
 	}