remove default option filenames.

fujiwara · fujiwara · commit 76cafbc58177 · 2024-12-17T17:49:02.000+09:00
diff --git a/cli.go b/cli.go
@@ -85,7 +85,7 @@ func ParseCLI(args []string) (string, *CLIOptions, func(), error) {
 
 	// load default options
 	if optionFilePath != "" {
-		defaultOpt, err := loadDefinitionFile[Option](nil, optionFilePath, DefaultOptionFilenames)
+		defaultOpt, err := loadDefinitionFile[Option](nil, optionFilePath, nil)
 		if err != nil {
 			return "", nil, nil, fmt.Errorf("failed to load option file: %w", err)
 		}
diff --git a/lambroll.go b/lambroll.go
@@ -72,12 +72,6 @@ var (
 		"function_url.jsonnet",
 	}
 
-	// DefaultOptionFilenames defines file name for option definition.
-	DefaultOptionFilenames = []string{
-		"lambroll.json",
-		"lambroll.jsonnet",
-	}
-
 	// FunctionZipFilename defines file name for zip archive downloaded at init.
 	FunctionZipFilename = "function.zip"
 
@@ -88,8 +82,6 @@ var (
 		DefaultFunctionFilenames[1],
 		DefaultFunctionURLFilenames[0],
 		DefaultFunctionURLFilenames[1],
-		DefaultOptionFilenames[0],
-		DefaultOptionFilenames[1],
 		FunctionZipFilename,
 		".git/*",
 		".terraform/*",

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func ParseCLI(args []string) (string, *CLIOptions, func(), error) {`
`85`	`85`
`86`	`86`	`// load default options`
`87`	`87`	`if optionFilePath != "" {`
`88`		`- defaultOpt, err := loadDefinitionFile[Option](nil, optionFilePath, DefaultOptionFilenames)`
	`88`	`+ defaultOpt, err := loadDefinitionFile[Option](nil, optionFilePath, nil)`
`89`	`89`	`if err != nil {`
`90`	`90`	`return "", nil, nil, fmt.Errorf("failed to load option file: %w", err)`
`91`	`91`	`}`