Exit with an error if the explicitly passed .tflint.hcl does not ex…

…ist (#1940)
terraform-linters · Dec 16, 2023 · 7cb16fb · 7cb16fb
1 parent 9259d0e
commit 7cb16fb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cmd/option.go b/cmd/option.go
@@ -14,7 +14,7 @@ type Options struct {
 	Init                   bool     `long:"init" description:"Install plugins"`
 	Langserver             bool     `long:"langserver" description:"Start language server"`
 	Format                 string   `short:"f" long:"format" description:"Output format" choice:"default" choice:"json" choice:"checkstyle" choice:"junit" choice:"compact" choice:"sarif"`
-	Config                 string   `short:"c" long:"config" description:"Config file name" value-name:"FILE" default:".tflint.hcl"`
+	Config                 string   `short:"c" long:"config" description:"Config file name (default: .tflint.hcl)" value-name:"FILE"`
 	IgnoreModules          []string `long:"ignore-module" description:"Ignore module sources" value-name:"SOURCE"`
 	EnableRules            []string `long:"enable-rule" description:"Enable rules from the command line" value-name:"RULE_NAME"`
 	DisableRules           []string `long:"disable-rule" description:"Disable rules from the command line" value-name:"RULE_NAME"`

diff --git a/tflint/config.go b/tflint/config.go
@@ -139,7 +139,7 @@ func EmptyConfig() *Config {
 // plugin block is not explicitly declared.
 func LoadConfig(fs afero.Afero, file string) (*Config, error) {
 	// Load the file passed by the --config option
-	if file != defaultConfigFile {
+	if file != "" {
 		log.Printf("[INFO] Load config: %s", file)
 		f, err := fs.Open(file)
 		if err != nil {
@@ -168,8 +168,8 @@ func LoadConfig(fs afero.Afero, file string) (*Config, error) {
 	}
 
 	// Load the default config file
-	log.Printf("[INFO] Load config: %s", file)
-	if f, err := fs.Open(file); err == nil {
+	log.Printf("[INFO] Load config: %s", defaultConfigFile)
+	if f, err := fs.Open(defaultConfigFile); err == nil {
 		cfg, err := loadConfig(f)
 		if err != nil {
 			return nil, err

diff --git a/tflint/config_test.go b/tflint/config_test.go
@@ -134,7 +134,7 @@ plugin "baz" {
 		},
 		{
 			name: "TFLINT_CONFIG_FILE",
-			file: ".tflint.hcl",
+			file: "",
 			files: map[string]string{
 				"env.hcl": `
 config {
@@ -166,7 +166,7 @@ config {
 		},
 		{
 			name: "default home config",
-			file: ".tflint.hcl",
+			file: "",
 			files: map[string]string{
 				"/root/.tflint.hcl": `
 config {
@@ -195,7 +195,7 @@ config {
 		},
 		{
 			name:     "no config",
-			file:     ".tflint.hcl",
+			file:     "",
 			want:     EmptyConfig().enableBundledPlugin(),
 			errCheck: neverHappend,
 		},
@@ -234,7 +234,7 @@ plugin "terraform" {
 		},
 		{
 			name: "file not found with TFLINT_CONFIG_FILE",
-			file: ".tflint.hcl",
+			file: "",
 			envs: map[string]string{
 				"TFLINT_CONFIG_FILE": "not_found.hcl",
 			},