Merge pull request #127 from ditrit/improvement/required_attribute

Improvement: required attribute

changelog.md

@@ -12,11 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Default attributes for metadata.
 - Error management.
 - I18n management.
-- Unknown definition attribute.
+- New attribute for Unknown component definition.
 
 ### Changed
 
-- Update plugin-core to version 0.26.0.
+- Update plugin-core to version 0.26.2.
 
 ## [0.10.0] - 2024/07/11
 

package.json

@@ -33,7 +33,7 @@
   "homepage": "https://github.com/ditrit/terrator-plugin#readme",
   "dependencies": {
     "antlr4": "=4.13.1",
-    "leto-modelizer-plugin-core": "github:ditrit/leto-modelizer-plugin-core#0.26.1",
+    "leto-modelizer-plugin-core": "github:ditrit/leto-modelizer-plugin-core#0.26.2",
     "nunjucks": "=3.2.4"
   },
   "devDependencies": {

src/parser/TerraformListener.js

@@ -40,6 +40,11 @@ class TerraformListener extends antlr4.tree.ParseTreeListener {
     });
   }
 
+  checkMissingAttributes(ctx) {
+    this.currentComponent.validateRequiredAttributes()
+      .forEach((error) => this.addError(ctx, error));
+  }
+
   addComponent() {
     this.currentComponent.path = this.currentFile.path;
     this.pluginData.components.push(this.currentComponent);
@@ -120,7 +125,8 @@ class TerraformListener extends antlr4.tree.ParseTreeListener {
   }
 
   // Exit a parse tree produced by terraformParser#resource.
-  exitResource() {
+  exitResource(ctx) {
+    this.checkMissingAttributes(ctx);
     this.addComponent();
   }
 
@@ -131,7 +137,8 @@ class TerraformListener extends antlr4.tree.ParseTreeListener {
   }
 
   // Exit a parse tree produced by terraformParser#data.
-  exitData() {
+  exitData(ctx) {
+    this.checkMissingAttributes(ctx);
     this.addComponent();
   }
 
@@ -142,7 +149,8 @@ class TerraformListener extends antlr4.tree.ParseTreeListener {
   }
 
   // Exit a parse tree produced by terraformParser#provider.
-  exitProvider() {
+  exitProvider(ctx) {
+    this.checkMissingAttributes(ctx);
     this.addComponent();
   }
 
@@ -179,7 +187,8 @@ class TerraformListener extends antlr4.tree.ParseTreeListener {
   }
 
   // Exit a parse tree produced by terraformParser#module.
-  exitModule() {
+  exitModule(ctx) {
+    this.checkMissingAttributes(ctx);
     this.addComponent();
   }
 
@@ -552,12 +561,6 @@ class TerraformListener extends antlr4.tree.ParseTreeListener {
       this.currentField.type = type;
     }
 
-    this.currentField.validateDefinitionType();
-    this.currentField.validateType();
-    this.currentField.validateRequired();
-    this.currentField.validateRuleMinMax();
-    this.currentField.validateRuleValues();
-    this.currentField.validateRuleRegex();
     this.currentField.getErrors()
       .forEach((error) => this.addError(ctx, error));
   }

tests/resources/js/parserError.js

@@ -75,6 +75,18 @@ const errors = [
     severity: ParserLog.SEVERITY_ERROR,
     initialErrorMessage: null,
   }),
+  new ParserLog({
+    path: 'parserError.tf',
+    componentId: 'id_5',
+    attribute: 'region',
+    startLineNumber: 15,
+    startColumn: 1,
+    endLineNumber: 15,
+    endColumn: 32,
+    message: 'parser.error.required',
+    severity: ParserLog.SEVERITY_ERROR,
+    initialErrorMessage: null,
+  }),
 ];
 
 export default errors;

tests/resources/tf/parserError.tf

@@ -11,3 +11,5 @@ resource "unknown" "test3" {}
 resource "aws_lb_target_group" "" {}
 
 blabla "test" {}
+
+provider "aws" {}