Updated VerifyPolicy

- Added flag to turn on debug mode.
- made CLI more conventional
- documented tool
- added a few more log stmts

java/arcs/core/analysis/InformationFlow.kt

@@ -693,8 +693,14 @@ private fun Predicate.labels(): List<InformationFlowLabel> = when (this) {
 
 /** Returns true if the [check] is satisfied by the labels computed for [particle]. */
 fun InformationFlow.AnalysisResult.verify(particle: Recipe.Particle, check: Check): Boolean {
+  val log = TaggedLog { "AnalysisResult.verify" }
+
+  log.debug { "checking $check in $particle"}
+
   val result = fixpoint.getValue(particle)
 
+  log.debug { "result: $result" }
+
   // Unreachable particle => check is trivially satisfied.
   if (result.isBottom) return true
 
@@ -703,6 +709,8 @@ fun InformationFlow.AnalysisResult.verify(particle: Recipe.Particle, check: Chec
 
   val accessPathLabels = result.getLabels(check.accessPath)
 
+  log.debug { "accessPathLabels: $accessPathLabels" }
+
   // Unreachable => check is trivially satisfied.
   if (accessPathLabels.isBottom) return true
   // All possible values => check is unsatisfied.

java/arcs/tools/README.md

@@ -46,3 +46,15 @@ into textprotos.
 ```
 $ bazel run --run_under="cd $PWD && " //java/arcs/tools:inspect_manifest -- ./ok_check_multiple_or_tags.binarypb ./ok_check_multiple_or_tags.textproto
 ```
+
+## verify_policy
+
+Verifies that all recipes in an Arcs manifest file comply with their policies.
+
+```
+# bazel run //java/arcs/tools:verify_policy -- /absolute/path/to/binary_manifest.binarypb
+```
+
+Options: 
+- `-d, --debug`: Turn on debug tracing
+- `--help`: Display usage info

java/arcs/tools/VerifyPolicy.kt

@@ -4,21 +4,30 @@ import arcs.core.analysis.PolicyVerifier
 import arcs.core.data.proto.ManifestProto
 import arcs.core.data.proto.decodeRecipes
 import arcs.core.policy.proto.decode
+import arcs.core.util.Log
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.CliktError
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
-import com.github.ajalt.clikt.parameters.options.required
 import com.github.ajalt.clikt.parameters.types.file
 
 class VerifyPolicy : CliktCommand(
   name = "verify_policy",
-  help = "Verifies that all recipes in an Arcs manifest file comply with their policies."
+  help = "Verifies that all recipes in an Arcs manifest file comply with their policies.",
+  printHelpOnEmptyArgs = true
 ) {
-  val manifest by option(
+  val manifest by argument(
     help = "Arcs manifest to check, encoded as a binary proto file (.binarypb)"
-  ).file().required()
+  ).file()
+
+  val debug by option("-d", "--debug", help = "Turn on debug tracing")
+    .flag(default = false)
 
   override fun run() {
+    if (debug) {
+      Log.level = Log.Level.Debug
+    }
     val manifestProto = ManifestProto.parseFrom(manifest.readBytes())
 
     val recipes = manifestProto.decodeRecipes()