Follow up of the EnsureNoError deprecation (#268)

terraform-linters · Apr 23, 2023 · 96740a2 · 96740a2
1 parent 53362d0
commit 96740a2
Show file tree

Hide file tree

Showing 240 changed files with 480 additions and 1,291 deletions.
diff --git a/rules/apispec/azurerm_analysis_services_server_invalid_querypool_connection_mode.go b/rules/apispec/azurerm_analysis_services_server_invalid_querypool_connection_mode.go
@@ -67,10 +67,7 @@ func (r *AzurermAnalysisServicesServerInvalidQuerypoolConnectionModeRule) Check(
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -85,7 +82,7 @@ func (r *AzurermAnalysisServicesServerInvalidQuerypoolConnectionModeRule) Check(
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_application_insights_analytics_item_invalid_scope.go b/rules/apispec/azurerm_application_insights_analytics_item_invalid_scope.go
@@ -67,10 +67,7 @@ func (r *AzurermApplicationInsightsAnalyticsItemInvalidScopeRule) Check(runner t
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -85,7 +82,7 @@ func (r *AzurermApplicationInsightsAnalyticsItemInvalidScopeRule) Check(runner t
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_application_insights_analytics_item_invalid_type.go b/rules/apispec/azurerm_application_insights_analytics_item_invalid_type.go
@@ -69,10 +69,7 @@ func (r *AzurermApplicationInsightsAnalyticsItemInvalidTypeRule) Check(runner tf
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -87,7 +84,7 @@ func (r *AzurermApplicationInsightsAnalyticsItemInvalidTypeRule) Check(runner tf
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_application_insights_web_test_invalid_kind.go b/rules/apispec/azurerm_application_insights_web_test_invalid_kind.go
@@ -67,10 +67,7 @@ func (r *AzurermApplicationInsightsWebTestInvalidKindRule) Check(runner tflint.R
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -85,7 +82,7 @@ func (r *AzurermApplicationInsightsWebTestInvalidKindRule) Check(runner tflint.R
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_automation_account_invalid_sku_name.go b/rules/apispec/azurerm_automation_account_invalid_sku_name.go
@@ -67,10 +67,7 @@ func (r *AzurermAutomationAccountInvalidSkuNameRule) Check(runner tflint.Runner)
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -85,7 +82,7 @@ func (r *AzurermAutomationAccountInvalidSkuNameRule) Check(runner tflint.Runner)
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_automation_runbook_invalid_runbook_type.go b/rules/apispec/azurerm_automation_runbook_invalid_runbook_type.go
@@ -73,10 +73,7 @@ func (r *AzurermAutomationRunbookInvalidRunbookTypeRule) Check(runner tflint.Run
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -91,7 +88,7 @@ func (r *AzurermAutomationRunbookInvalidRunbookTypeRule) Check(runner tflint.Run
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_automation_schedule_invalid_frequency.go b/rules/apispec/azurerm_automation_schedule_invalid_frequency.go
@@ -71,10 +71,7 @@ func (r *AzurermAutomationScheduleInvalidFrequencyRule) Check(runner tflint.Runn
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -89,7 +86,7 @@ func (r *AzurermAutomationScheduleInvalidFrequencyRule) Check(runner tflint.Runn
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_batch_account_invalid_name.go b/rules/apispec/azurerm_batch_account_invalid_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBatchAccountInvalidNameRule) Check(runner tflint.Runner) error {
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBatchAccountInvalidNameRule) Check(runner tflint.Runner) error {
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_batch_account_invalid_pool_allocation_mode.go b/rules/apispec/azurerm_batch_account_invalid_pool_allocation_mode.go
@@ -67,10 +67,7 @@ func (r *AzurermBatchAccountInvalidPoolAllocationModeRule) Check(runner tflint.R
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -85,7 +82,7 @@ func (r *AzurermBatchAccountInvalidPoolAllocationModeRule) Check(runner tflint.R
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_batch_application_invalid_account_name.go b/rules/apispec/azurerm_batch_application_invalid_account_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBatchApplicationInvalidAccountNameRule) Check(runner tflint.Runn
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBatchApplicationInvalidAccountNameRule) Check(runner tflint.Runn
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_batch_application_invalid_name.go b/rules/apispec/azurerm_batch_application_invalid_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBatchApplicationInvalidNameRule) Check(runner tflint.Runner) err
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBatchApplicationInvalidNameRule) Check(runner tflint.Runner) err
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_batch_certificate_invalid_account_name.go b/rules/apispec/azurerm_batch_certificate_invalid_account_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBatchCertificateInvalidAccountNameRule) Check(runner tflint.Runn
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBatchCertificateInvalidAccountNameRule) Check(runner tflint.Runn
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_batch_certificate_invalid_format.go b/rules/apispec/azurerm_batch_certificate_invalid_format.go
@@ -67,10 +67,7 @@ func (r *AzurermBatchCertificateInvalidFormatRule) Check(runner tflint.Runner) e
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			found := false
 			for _, item := range r.enum {
 				if item == val {
@@ -85,7 +82,7 @@ func (r *AzurermBatchCertificateInvalidFormatRule) Check(runner tflint.Runner) e
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_batch_pool_invalid_account_name.go b/rules/apispec/azurerm_batch_pool_invalid_account_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBatchPoolInvalidAccountNameRule) Check(runner tflint.Runner) err
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBatchPoolInvalidAccountNameRule) Check(runner tflint.Runner) err
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_batch_pool_invalid_name.go b/rules/apispec/azurerm_batch_pool_invalid_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBatchPoolInvalidNameRule) Check(runner tflint.Runner) error {
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBatchPoolInvalidNameRule) Check(runner tflint.Runner) error {
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_bot_channel_directline_invalid_bot_name.go b/rules/apispec/azurerm_bot_channel_directline_invalid_bot_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBotChannelDirectlineInvalidBotNameRule) Check(runner tflint.Runn
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBotChannelDirectlineInvalidBotNameRule) Check(runner tflint.Runn
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_bot_channel_directline_invalid_resource_group_name.go b/rules/apispec/azurerm_bot_channel_directline_invalid_resource_group_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBotChannelDirectlineInvalidResourceGroupNameRule) Check(runner t
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBotChannelDirectlineInvalidResourceGroupNameRule) Check(runner t
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_bot_channel_email_invalid_bot_name.go b/rules/apispec/azurerm_bot_channel_email_invalid_bot_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBotChannelEmailInvalidBotNameRule) Check(runner tflint.Runner) e
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBotChannelEmailInvalidBotNameRule) Check(runner tflint.Runner) e
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}

diff --git a/rules/apispec/azurerm_bot_channel_email_invalid_resource_group_name.go b/rules/apispec/azurerm_bot_channel_email_invalid_resource_group_name.go
@@ -65,10 +65,7 @@ func (r *AzurermBotChannelEmailInvalidResourceGroupNameRule) Check(runner tflint
 		if !exists {
 			continue
 		}
-		var val string
-		err := runner.EvaluateExpr(attribute.Expr, &val, nil)
-
-		err = runner.EnsureNoError(err, func() error {
+		err := runner.EvaluateExpr(attribute.Expr, func (val string) error {
 			if !r.pattern.MatchString(val) {
 				runner.EmitIssue(
 					r,
@@ -77,7 +74,7 @@ func (r *AzurermBotChannelEmailInvalidResourceGroupNameRule) Check(runner tflint
 				)
 			}
 			return nil
-		})
+		}, nil)
 		if err != nil {
 			return err
 		}