Disallow queries that reference catalog views

flint-spark-integration/src/main/scala/org/opensearch/flint/spark/DisallowCatalogViews.scala

@@ -0,0 +1,27 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.flint.spark
+
+import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, View}
+import org.apache.spark.sql.catalyst.rules.Rule
+
+/**
+ * This analysis rule validates that the submitted query is not referencing a Glue Catalog view. The rule simply traverses
+ * the plan and validates that none of the nodes resolved to a [[View]].
+ */
+class DisallowCatalogViews extends Rule[LogicalPlan] {
+  override def apply(plan: LogicalPlan): LogicalPlan = {
+    plan.foreachUp {
+      case _: View =>
+        throw new IllegalArgumentException(
+          s"Catalog View is not allowed to be queried"
+        )
+
+      case other => other
+    }
+    plan
+  }
+}

flint-spark-integration/src/main/scala/org/opensearch/flint/spark/FlintSparkExtensions.scala

@@ -21,9 +21,9 @@ class FlintSparkExtensions extends (SparkSessionExtensions => Unit) {
     }
 
     extensions.injectFunction(TumbleFunction.description)
-
     extensions.injectOptimizerRule { spark =>
       new FlintSparkOptimizer(spark)
     }
+    extensions.injectPostHocResolutionRule(_ => new DisallowCatalogViews())
   }
 }

integ-test/src/integration/scala/org/opensearch/flint/spark/FlintSparkSuite.scala

@@ -101,7 +101,7 @@ trait FlintSparkSuite extends QueryTest with FlintSuite with OpenSearchSuite wit
   }
 
   protected def createPartitionedGrokEmailTable(testTable: String): Unit = {
-    spark.sql(s"""
+    val table = spark.sql(s"""
          | CREATE TABLE $testTable
          | (
          |   name STRING,
@@ -115,7 +115,6 @@ trait FlintSparkSuite extends QueryTest with FlintSuite with OpenSearchSuite wit
          |    month INT
          | )
          |""".stripMargin)
-
     val data = Seq(
       ("Alice", 30, "[email protected]", "123 Main St, Seattle", 2023, 4),
       ("Bob", 55, "[email protected]", "456 Elm St, Portland", 2023, 5),
@@ -135,6 +134,17 @@ trait FlintSparkSuite extends QueryTest with FlintSuite with OpenSearchSuite wit
            | VALUES ('$name', $age, '$email', '$street_address')
            | """.stripMargin)
     }
+    // Create a Glue view
+    val glueViewName = "my_view"
+    val glueViewQuery = s"""
+    CREATE VIEW $glueViewName
+    AS
+    SELECT name, age, email, street_address
+    FROM $testTable
+  """
+
+    val res = spark.sql(glueViewQuery)
+    log.error(res.toString())
   }
   protected def createPartitionedAddressTable(testTable: String): Unit = {
     sql(s"""

integ-test/src/integration/scala/org/opensearch/flint/spark/ppl/FlintSparkPPLGrokITSuite.scala

@@ -5,6 +5,9 @@
 
 package org.opensearch.flint.spark.ppl
 
+import org.scalatest.matchers.must.Matchers.have
+import org.scalatest.matchers.should.Matchers.{convertToAnyShouldWrapper, the}
+
 import org.apache.spark.sql.{QueryTest, Row}
 import org.apache.spark.sql.catalyst.analysis.{UnresolvedAttribute, UnresolvedFunction, UnresolvedRelation, UnresolvedStar}
 import org.apache.spark.sql.catalyst.expressions.{Alias, Coalesce, Descending, GreaterThan, Literal, NullsLast, RegExpExtract, SortOrder}
@@ -36,6 +39,15 @@ class FlintSparkPPLGrokITSuite
     }
   }
 
+
+  test("test querying catalog views throws validation exception") {
+    the[IllegalArgumentException] thrownBy {
+      sql("""
+           | source = my_view| grok email '.+@%{HOSTNAME:host}' | fields email, host
+           | """.stripMargin)
+    } should have message "Catalog View is not allowed to be queried"
+  }
+
   test("test grok email expressions parsing") {
     val frame = sql(s"""
          | source = $testTable| grok email '.+@%{HOSTNAME:host}' | fields email, host

ppl-spark-integration/src/main/scala/org/opensearch/flint/spark/FlintPPLSparkExtensions.scala

@@ -18,5 +18,7 @@ class FlintPPLSparkExtensions extends (SparkSessionExtensions => Unit) {
     extensions.injectParser { (spark, parser) =>
       new FlintSparkPPLParser(parser)
     }
+
+
   }
 }

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.8.2
+sbt.version = 1.10.1