add control property (#5943)

* add control property * disable fragile test
microsoft · Nov 6, 2021 · 84bb65e · 84bb65e
1 parent d33c8d5
commit 84bb65e
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/libraries/Microsoft.Bot.Builder.LanguageGeneration/Evaluator.cs b/libraries/Microsoft.Bot.Builder.LanguageGeneration/Evaluator.cs
@@ -605,11 +605,14 @@ private EvaluatorLookup CustomizedEvaluatorLookup(EvaluatorLookup baseLookup)
                 return new ExpressionEvaluator(template, FunctionUtils.Apply(this.TemplateFunction()), ReturnType.Object, this.ValidateTemplateFunction);
             }
 
-            const string fromFile = "fromFile";
-
-            if (name.Equals(fromFile, StringComparison.Ordinal))
+            if (Templates.EnableFromFile)
             {
-                return new ExpressionEvaluator(fromFile, FunctionUtils.Apply(FromFile()), ReturnType.String, ValidateFromFile);
+                const string fromFile = "fromFile";
+
+                if (name.Equals(fromFile, StringComparison.Ordinal))
+                {
+                    return new ExpressionEvaluator(fromFile, FunctionUtils.Apply(FromFile()), ReturnType.String, ValidateFromFile);
+                }
             }
 
             const string activityAttachment = "ActivityAttachment";

diff --git a/libraries/Microsoft.Bot.Builder.LanguageGeneration/Expander.cs b/libraries/Microsoft.Bot.Builder.LanguageGeneration/Expander.cs
@@ -542,11 +542,14 @@ private EvaluatorLookup CustomizedEvaluatorLookup(EvaluatorLookup baseLookup, bo
                 return new ExpressionEvaluator(template, FunctionUtils.Apply(this.TemplateFunction()), ReturnType.Object, this.ValidateTemplateFunction);
             }
 
-            const string fromFile = "fromFile";
-
-            if (name.Equals(fromFile, StringComparison.Ordinal))
+            if (Templates.EnableFromFile)
             {
-                return new ExpressionEvaluator(fromFile, FunctionUtils.Apply(this.FromFile()), ReturnType.String, ValidateFromFile);
+                const string fromFile = "fromFile";
+
+                if (name.Equals(fromFile, StringComparison.Ordinal))
+                {
+                    return new ExpressionEvaluator(fromFile, FunctionUtils.Apply(this.FromFile()), ReturnType.String, ValidateFromFile);
+                }
             }
 
             const string activityAttachment = "ActivityAttachment";

diff --git a/libraries/Microsoft.Bot.Builder.LanguageGeneration/Templates.cs b/libraries/Microsoft.Bot.Builder.LanguageGeneration/Templates.cs
@@ -77,6 +77,14 @@ public Templates(
             InjectToExpressionFunction();
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether fromFile is allowed in LG templates.
+        /// </summary>
+        /// <value>
+        /// Boolean where true indicates fromFile is allowed.
+        /// </value>
+        public static bool EnableFromFile { get; set; } = true;
+
         /// <summary>
         /// Gets get all templates from current lg file and reference lg files.
         /// </summary>

diff --git a/tests/Microsoft.Bot.Builder.LanguageGeneration.Tests/TemplatesTest.cs b/tests/Microsoft.Bot.Builder.LanguageGeneration.Tests/TemplatesTest.cs
@@ -1832,6 +1832,18 @@ public void TestFileOperation()
             Assert.Equal("hi ${name}", evaluated);
         }
 
+        [Fact]
+        public void TestFileOperationDisabled()
+        {
+            Templates.EnableFromFile = false;
+
+            Assert.Throws<InvalidOperationException>(() =>
+            {
+                var templates = Templates.ParseFile(GetExampleFilePath("FileOperation.lg"));
+                var evaluated = templates.Evaluate("FromFileWithoutEvaluation");
+            });
+        }
+
         public class LoopClass
         {
             public string Name { get; set; }