Add support for additional terraform definitions

Author: ahornace

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java

@@ -453,11 +453,32 @@ private void addTerraformSupport(List<String> command) {
          * equivalent of {Identifier} from HCL.lexh, so we must approximate with
          * the possibility of leaving out some matches.
          */
-        command.add("--kinddef-terraform=s,struct,Resource\\ names");
+        command.add("--kinddef-terraform=r,resource,Resource\\ names");
+        command.add("--kinddef-terraform=d,dataSource,Data\\ sources");
+        command.add("--kinddef-terraform=m,module,Modules");
+        command.add("--kinddef-terraform=o,outputValue,Output\\ values");
+        command.add("--kinddef-terraform=p,provider,Providers");
+        command.add("--kinddef-terraform=v,variable,Variables");
         command.add("--regex-terraform=" +
                 "/^[[:space:]]*resource[[:space:]]*\\\"([[:alpha:]][-_[:alpha:]]*)\\\"[[:space:]]*" +
                 "\\\"([[:alpha:]][-_[:alpha:]]*)\\\"[[:space:]]*\\{/" +
-                "\\1.\\2/s/");
+                "\\1.\\2/r/");
+        command.add("--regex-terraform=" +
+                "/^[[:space:]]*data[[:space:]]*\\\"([[:alpha:]][-_[:alpha:]]*)\\\"[[:space:]]*" +
+                "\\\"([[:alpha:]][-_[:alpha:]]*)\\\"[[:space:]]*\\{/" +
+                "\\1.\\2/d/");
+        command.add("--regex-terraform=" +
+                "/^[[:space:]]*module[[:space:]]*\\\"([[:alpha:]][-_[:alpha:]]*)\\\"[[:space:]]*\\{/" +
+                "\\1/m/");
+        command.add("--regex-terraform=" +
+                "/^[[:space:]]*output[[:space:]]*\\\"([[:alpha:]][-_[:alpha:]]*)\\\"[[:space:]]*\\{/" +
+                "\\1/o/");
+        command.add("--regex-terraform=" +
+                "/^[[:space:]]*provider[[:space:]]*\\\"([[:alpha:]][-_[:alpha:]]*)\\\"[[:space:]]*\\{/" +
+                "\\1/p/");
+        command.add("--regex-terraform=" +
+                "/^[[:space:]]*variable[[:space:]]*\\\"([[:alpha:]][-_[:alpha:]]*)\\\"[[:space:]]*\\{/" +
+                "\\1/v/");
     }
 
     /**

opengrok-indexer/src/test/java/org/opengrok/indexer/analysis/CtagsTest.java

@@ -24,10 +24,13 @@
 package org.opengrok.indexer.analysis;
 
 import java.io.File;
+import java.util.List;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.opengrok.indexer.util.TestRepository;
 
 import static org.junit.jupiter.api.Assertions.assertAll;
@@ -138,12 +141,38 @@ void bug19195() throws Exception {
         assertEquals(names.length, count, "function count");
     }
 
-    @Test
-    void testTfTags() throws Exception {
-        var defs = getDefs("terraform/test.tf");
+    @ParameterizedTest
+    @MethodSource("terraformTestParams")
+    void testTfTags(final SingleTagTestData data) throws Exception {
+        var defs = getDefs("terraform/" + data.file + ".tf");
         assertAll(
                 () -> assertEquals(1, defs.getTags().size()),
-                () -> assertEquals("oci_core_vcn.test_vcn", defs.getTags().get(0).symbol)
+                () -> assertEquals(data.symbol, defs.getTags().get(0).symbol),
+                () -> assertEquals(data.type, defs.getTags().get(0).type)
         );
     }
+
+    private static List<SingleTagTestData> terraformTestParams() {
+        return List.of(
+                new SingleTagTestData("data_source", "aws_ami.example", "dataSource"),
+                new SingleTagTestData("module", "servers", "module"),
+                new SingleTagTestData("output_value", "instance_ip_addr", "outputValue"),
+                new SingleTagTestData("provider", "oci", "provider"),
+                new SingleTagTestData("resource", "oci_core_vcn.test_vcn", "resource"),
+                new SingleTagTestData("variable", "availability_zone_names", "variable")
+        );
+    }
+
+    private static class SingleTagTestData {
+        private final String file;
+        private final String symbol;
+        private final String type;
+
+        SingleTagTestData(final String file, final String symbol, final String type) {
+            this.file = file;
+            this.symbol = symbol;
+            this.type = type;
+        }
+    }
+
 }

opengrok-indexer/src/test/resources/sources/terraform/data_source.tf

@@ -0,0 +1,9 @@
+data "aws_ami" "example" {
+  most_recent = true
+
+  owners = ["self"]
+  tags = {
+    Name   = "app-server"
+    Tested = "true"
+  }
+}

opengrok-indexer/src/test/resources/sources/terraform/module.tf

@@ -0,0 +1,5 @@
+module "servers" {
+  source = "./app-cluster"
+
+  servers = 5
+}

opengrok-indexer/src/test/resources/sources/terraform/output_value.tf

@@ -0,0 +1,3 @@
+output "instance_ip_addr" {
+  value = aws_instance.server.private_ip
+}

opengrok-indexer/src/test/resources/sources/terraform/provider.tf

@@ -0,0 +1,4 @@
+provider "oci" {
+  auth = "InstancePrincipal"
+  region = "${var.region}"
+}

opengrok-indexer/src/test/resources/sources/terraform/test.tf renamed to opengrok-indexer/src/test/resources/sources/terraform/resource.tf

@@ -0,0 +1,4 @@
+variable "availability_zone_names" {
+  type    = list(string)
+  default = ["us-west-1a"]
+}