Resolved a test case that referred to intrinsic functions

Author: Akshay Rane

Cargo.lock

@@ -30,10 +30,10 @@ Rule(S3_BUCKET_LOGGING_ENABLED, PASS)
     Condition(S3_BUCKET_LOGGING_ENABLED, PASS)
         |  Message: DEFAULT MESSAGE(PASS)
         Clause( %s3_buckets_bucket_logging_enabled not EMPTY  , PASS)
-            |  From: Map((Path("/Resources/ExampleS3", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Type", Location { line: 0, col: 0 }), "Type")), String((Path("/Resources/ExampleS3/Properties", Location { line: 0, col: 0 }), "Properties"))], values: {"Type": String((Path("/Resources/ExampleS3/Type", Location { line: 0, col: 0 }), "AWS::S3::Bucket")), "Properties": Map((Path("/Resources/ExampleS3/Properties", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/BucketName", Location { line: 0, col: 0 }), "BucketName")), String((Path("/Resources/ExampleS3/Properties/VersioningConfiguration", Location { line: 0, col: 0 }), "VersioningConfiguration")), String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration", Location { line: 0, col: 0 }), "LoggingConfiguration"))], values: {"BucketName": String((Path("/Resources/ExampleS3/Properties/BucketName", Location { line: 0, col: 0 }), "my-bucket")), "VersioningConfiguration": Map((Path("/Resources/ExampleS3/Properties/VersioningConfiguration", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/VersioningConfiguration/Status", Location { line: 0, col: 0 }), "Status"))], values: {"Status": String((Path("/Resources/ExampleS3/Properties/VersioningConfiguration/Status", Location { line: 0, col: 0 }), "Enabled"))} })), "LoggingConfiguration": Map((Path("/Resources/ExampleS3/Properties/LoggingConfiguration", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName", Location { line: 0, col: 0 }), "DestinationBucketName")), String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/LogFilePrefix", Location { line: 0, col: 0 }), "LogFilePrefix"))], values: {"DestinationBucketName": Map((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName/Ref", Location { line: 0, col: 0 }), "Ref"))], values: {"Ref": String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName/Ref", Location { line: 0, col: 0 }), "LoggingBucket"))} })), "LogFilePrefix": String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/LogFilePrefix", Location { line: 0, col: 0 }), "testing-logs"))} }))} }))} }))
+            |  From: Map((Path("/Resources/ExampleS3", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Type", Location { line: 0, col: 0 }), "Type")), String((Path("/Resources/ExampleS3/Properties", Location { line: 0, col: 0 }), "Properties"))], values: {"Type": String((Path("/Resources/ExampleS3/Type", Location { line: 0, col: 0 }), "AWS::S3::Bucket")), "Properties": Map((Path("/Resources/ExampleS3/Properties", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/BucketName", Location { line: 0, col: 0 }), "BucketName")), String((Path("/Resources/ExampleS3/Properties/VersioningConfiguration", Location { line: 0, col: 0 }), "VersioningConfiguration")), String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration", Location { line: 0, col: 0 }), "LoggingConfiguration"))], values: {"BucketName": String((Path("/Resources/ExampleS3/Properties/BucketName", Location { line: 0, col: 0 }), "my-bucket")), "VersioningConfiguration": Map((Path("/Resources/ExampleS3/Properties/VersioningConfiguration", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/VersioningConfiguration/Status", Location { line: 0, col: 0 }), "Status"))], values: {"Status": String((Path("/Resources/ExampleS3/Properties/VersioningConfiguration/Status", Location { line: 0, col: 0 }), "Enabled"))} })), "LoggingConfiguration": Map((Path("/Resources/ExampleS3/Properties/LoggingConfiguration", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName", Location { line: 0, col: 0 }), "DestinationBucketName")), String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/LogFilePrefix", Location { line: 0, col: 0 }), "LogFilePrefix"))], values: {"DestinationBucketName": String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName", Location { line: 0, col: 0 }), "LoggingBucket")), "LogFilePrefix": String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/LogFilePrefix", Location { line: 0, col: 0 }), "testing-logs"))} }))} }))} }))
             |  Message: DEFAULT MESSAGE(PASS)
     Clause( %s3_buckets_bucket_logging_enabled[*].Properties.LoggingConfiguration EXISTS  , PASS)
-        |  From: Map((Path("/Resources/ExampleS3/Properties/LoggingConfiguration", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName", Location { line: 0, col: 0 }), "DestinationBucketName")), String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/LogFilePrefix", Location { line: 0, col: 0 }), "LogFilePrefix"))], values: {"DestinationBucketName": Map((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName/Ref", Location { line: 0, col: 0 }), "Ref"))], values: {"Ref": String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName/Ref", Location { line: 0, col: 0 }), "LoggingBucket"))} })), "LogFilePrefix": String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/LogFilePrefix", Location { line: 0, col: 0 }), "testing-logs"))} }))
+        |  From: Map((Path("/Resources/ExampleS3/Properties/LoggingConfiguration", Location { line: 0, col: 0 }), MapValue { keys: [String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName", Location { line: 0, col: 0 }), "DestinationBucketName")), String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/LogFilePrefix", Location { line: 0, col: 0 }), "LogFilePrefix"))], values: {"DestinationBucketName": String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/DestinationBucketName", Location { line: 0, col: 0 }), "LoggingBucket")), "LogFilePrefix": String((Path("/Resources/ExampleS3/Properties/LoggingConfiguration/LogFilePrefix", Location { line: 0, col: 0 }), "testing-logs"))} }))
         |  Message: DEFAULT MESSAGE(PASS)
   PASS Rules:
     S3_BUCKET_LOGGING_ENABLED: Expected = PASS, Evaluated = PASS

guard/resources/test-command/output-dir/test_data_dir_verbose_prev_engine.out

@@ -8,10 +8,7 @@ use std::{
 use indexmap::map::IndexMap;
 use nom::lib::std::fmt::Formatter;
 
-use crate::rules::{
-    errors::Error, libyaml::loader::Loader, parser::Span, path_value::Location, short_form_to_long,
-    SEQUENCE_VALUE_FUNC_REF, SINGLE_VALUE_FUNC_REF,
-};
+use crate::rules::{errors::Error, libyaml::loader::Loader, parser::Span, path_value::Location};
 
 use serde::{Deserialize, Serialize};
 
@@ -306,18 +303,7 @@ impl<'a> TryFrom<&'a serde_yaml::Value> for Value {
                     Ok(res)
                 },
             )?)),
-            serde_yaml::Value::Tagged(tag) => {
-                let prefix = tag.tag.to_string();
-                let value = tag.value.clone();
-
-                match prefix.matches('!').count() {
-                    1 => {
-                        let stripped_prefix = prefix.strip_prefix('!').unwrap();
-                        Ok(handle_tagged_value(value, stripped_prefix)?)
-                    }
-                    _ => Ok(Value::try_from(value)?),
-                }
-            }
+            serde_yaml::Value::Tagged(tag) => Ok(Value::try_from(tag.value.clone())?),
             serde_yaml::Value::Null => Ok(Value::Null),
         }
     }