163177 2016-10-08 21:42:21 -0700 Add support for canonicalizing contributors.json, and have check-webkit-style check the format. 2016-10-09 15:51:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser ap commit-queue glenn mcatanzaro rniwa ryanhaddad simon.fraser oldest_to_newest 1238051 0 simon.fraser 2016-10-08 21:42:21 -0700 Add support for canonicalizing contributors.json, and have check-webkit-style check the format. 1238052 1 291037 simon.fraser 2016-10-08 21:47:22 -0700 Created attachment 291037 Patch 1238054 2 commit-queue 2016-10-08 21:48:46 -0700 Attachment 291037 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/common/config/contributors.json:0: contributors.json should not be modified through the commit queue [json/syntax] [5] ERROR: Tools/Scripts/webkitpy/common/config/committers.py:96: whitespace before ':' [pep8/E203] [5] ERROR: Tools/Scripts/webkitpy/common/config/committers.py:166: whitespace before '}' [pep8/E202] [5] Total errors found: 3 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1238056 3 291037 rniwa 2016-10-08 22:17:36 -0700 Comment on attachment 291037 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=291037&action=review > Tools/Scripts/validate-committer-lists:221 > committer_cuttof = date.today() - timedelta(days=365) Typo: cuttof > Tools/Scripts/validate-committer-lists:235 > + for (author, last_commit) in retired_authors_and_last_commits: Nit: two spaces between for and ( 1238091 4 ryanhaddad 2016-10-09 11:07:52 -0700 webkitpy-test seems to be failing after this change was landed in https://trac.webkit.org/changeset/206967 https://build.webkit.org/builders/Apple%20Sierra%20Release%20WK2%20(Tests)/builds/447 1238104 5 mcatanzaro 2016-10-09 13:28:55 -0700 Two tests in particular: [415/1504] webkitpy.layout_tests.run_webkit_tests_integrationtest.RunTest.test_child_processes_2 erred: Traceback (most recent call last): File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py", line 230, in test_child_processes_2 ['--debug-rwt-logging', '--child-processes', '2'], shared_port=False) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py", line 102, in logging_run run_details, output = run_and_capture(port_obj, options, parsed_args, shared_port) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py", line 113, in run_and_capture run_details = run_webkit_tests.run(port_obj, options, parsed_args, logging_stream=logging_stream) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 439, in run run_details = manager.run(args) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 238, in run initial_results, retry_results, enabled_pixel_tests_in_retry = self._run_test_subset(default_device_tests, tests_to_skip) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 261, in _run_test_subset initial_results = self._run_tests(tests_to_run, tests_to_skip, self._options.repeat_each, self._options.iterations, int(self._options.child_processes), retrying=False) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py", line 322, in _run_tests return self._runner.run_tests(self._expectations, test_inputs, tests_to_skip, num_workers, needs_http, needs_websockets, needs_web_platform_test_server, retrying) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py", line 122, in run_tests pool.run(('test_list', shard.name, shard.test_inputs) for shard in all_shards) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/common/message_pool.py", line 97, in run self.wait() File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/common/message_pool.py", line 130, in wait self._loop(block=True) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/common/message_pool.py", line 182, in _loop method(message.src, *message.args) File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/common/message_pool.py", line 161, in _handle_worker_exception raise WorkerException(str(exception_value)) WorkerException and: [481/1504] webkitpy.layout_tests.run_webkit_tests_integrationtest.RunTest.test_verbose_in_child_processes failed: Traceback (most recent call last): File "/home/slave/webkitgtk/gtk-linux-64-release-tests/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py", line 830, in test_verbose_in_child_processes self.assertTrue('text.html passed' in logging_stream.getvalue()) AssertionError: False is not true 1238115 6 simon.fraser 2016-10-09 14:24:52 -0700 Investigating. 1238121 7 simon.fraser 2016-10-09 15:51:07 -0700 Landed in https://trac.webkit.org/changeset/206967 with followup in https://trac.webkit.org/changeset/206970 291037 2016-10-08 21:47:22 -0700 2016-10-08 22:17:36 -0700 Patch bug-163177-20161008214404.patch text/plain 28221 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NzEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTUxZGMzYTg0Nzg2MWMxM2FiNGZjMGY5MjFjYTE3YjQy ZjA5M2NhOC4uOTE0YzExNTVlZmFlNmE1NTBmNDg4NWU2YWFjNjVkYmI2ODFhMDEzZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1 IEBACisyMDE2LTEwLTA4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBjYW5vbmljYWxpemluZyBjb250cmlidXRvcnMuanNv biwgYW5kIGhhdmUgY2hlY2std2Via2l0LXN0eWxlIGNoZWNrIHRoZSBmb3JtYXQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMxNzcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIE1ha2UgaXQg cG9zc2libGUgdG8gcm91bmQtdHJpcCBjb250cmlidXRvcnMuanNvbiB0aHJvdWdoIENvbW1pdHRl ckxpc3QsIHNvIHdlIGNhbgorICAgICAgICBzdXBwb3J0IHdyaXRpbmcgb3V0IGNvbnRyaWJ1dG9y cy5qc29uIGluIGNhbm9uaWNhbCBmb3JtYXQuIFRoaXMgcmVxdWlyZXMgc2F2aW5nCisgICAgICAg IHRoZSBjYXNlLXByZXNlcnZlZCBlbWFpbCBhbmQgZXhwZXJ0aXNlIGluIENvbnRyaWJ1dG9yLiBD b21taXR0ZXJMaXN0IGFsc28gbmVlZHMKKyAgICAgICAgdG8gYmUgYWJsZSB0byBnZW5lcmF0ZSB0 aGUgImV4Y2x1c2l2ZSIgbGlzdHMsIHNpbmNlIGl0IGN1cnJlbnRseSB1c2VzIGxpc3RzCisgICAg ICAgIHRoYXQgYXJlIHRoZSB1bmlvbiBvZiwgc2F5LCBjb21taXR0ZXJzIGFuZCByZXZpZXdlcnMu CisgICAgICAgIAorICAgICAgICBJZiBjb250cmlidXRvcnMuanNvbiBpcyBtYWxmb3JtZWQgKGlu dmFsaWQgSlNPTiksIGNhdGNoIHRoZSBFeGNlcHRpb24sIHJlcG9ydCBpdAorICAgICAgICBhbmQg ZXhpdCByYXRoZXIgdGhhbiBhbGxvd2luZyB0aGUgZXhjZXB0aW9uIHRvIHByb3BhZ2F0ZS4gV2l0 aCBhbiBpbnZhbGlkIGZpbGUsCisgICAgICAgIGFuIGV4Y2VwdGlvbiB3b3VsZCBiZSB0aHJvd24g YmVmb3JlIHRoZSBKU09OIHN0eWxlIGNoZWNrZXIgcmVhY2hlZCB0aGlzIGZpbGUsIHNvCisgICAg ICAgIHRoZSBlcnJvciB3YXMgbm90IGNvcnJlY3RseSByZXBvcnRlZC4KKyAgICAgICAgCisgICAg ICAgIEFkZCBzdHlsZS9jaGVja2VyL2NvbW1pdHRlci5weSBmb3IgY2hlY2tpbmcgdGhhdCBjb21t aXR0ZXJzLmpzb24gaGFzIHRoZSBjYW5vbmljYWwgZm9ybWF0LgorICAgICAgICAKKyAgICAgICAg QWRkIHN1cHBvcnQgdG8gdmFsaWRhdGUtY29tbWl0dGVyLWxpc3RzIHRvIGR1bXAgb3V0IHRoZSBj YW5vbmljYWwganNvbiAoLWQpIG9yIHVwZGF0ZQorICAgICAgICB0aGUgZmlsZSBpbi1wbGFjZSAo LWMpLgorCisgICAgICAgICogU2NyaXB0cy92YWxpZGF0ZS1jb21taXR0ZXItbGlzdHM6CisgICAg ICAgIChDb21taXR0ZXJMaXN0RnJvbUdpdC5fcHJpbnRfdGhyZWVfY29sdW1uX3Jvdyk6CisgICAg ICAgIChDb21taXR0ZXJMaXN0RnJvbUdpdC5wb3NzaWJseV9leHBpcmVkX2NvbW1pdHRlcnMpOgor ICAgICAgICAoQ29tbWl0dGVyTGlzdEZyb21HaXQpOgorICAgICAgICAoQ29tbWl0dGVyTGlzdEZy b21HaXQucHJpbnRfcG9zc2libHlfZXhwaXJlZF9jb21taXR0ZXJzKToKKyAgICAgICAgKG1haW4p OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5 OgorICAgICAgICAoQ29udHJpYnV0b3IuX19pbml0X18pOgorICAgICAgICAoQ29udHJpYnV0b3Iu X19kaWN0X18pOgorICAgICAgICAoQ29tbWl0dGVyLl9faW5pdF9fKToKKyAgICAgICAgKFJldmll d2VyLl9faW5pdF9fKToKKyAgICAgICAgKENvbW1pdHRlckxpc3QubG9hZF9qc29uKToKKyAgICAg ICAgKENvbW1pdHRlckxpc3QpOgorICAgICAgICAoQ29tbWl0dGVyTGlzdC5fY29udHJpYnV0b3Jf bGlzdF90b19kaWN0KToKKyAgICAgICAgKENvbW1pdHRlckxpc3QuYXNfanNvbik6CisgICAgICAg IChDb21taXR0ZXJMaXN0LnJlZm9ybWF0X2luX3BsYWNlKToKKyAgICAgICAgKENvbW1pdHRlckxp c3QuX2V4Y2x1c2l2ZV9jb250cmlidXRvcnMpOgorICAgICAgICAoQ29tbWl0dGVyTGlzdC5fZXhj bHVzaXZlX2NvbW1pdHRlcnMpOgorICAgICAgICAoQ29udHJpYnV0b3IubWF0Y2hlc19nbG9iKTog RGVsZXRlZC4KKyAgICAgICAgKENvbW1pdHRlckxpc3QuY29udHJpYnV0b3JzKTogRGVsZXRlZC4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29udHJpYnV0b3JzLmpz b246CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5OgorICAgICAg ICAoQ2hlY2tlckRpc3BhdGNoZXIuX2NyZWF0ZV9jaGVja2VyKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NvbnRyaWJ1dG9ycy5weTogQWRkZWQuCisgICAgICAg IChDb250cmlidXRvcnNDaGVja2VyKToKKyAgICAgICAgKENvbnRyaWJ1dG9yc0NoZWNrZXIuX19p bml0X18pOgorICAgICAgICAoQ29udHJpYnV0b3JzQ2hlY2tlci5jaGVjayk6CisgICAgICAgIChD b250cmlidXRvcnNDaGVja2VyLl91bmlkaWZmX291dHB1dCk6CisKIDIwMTYtMDktMzAgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBGaXggb2Zm LWJ5LW9uZSBlcnJvciBpbiBVUkxQYXJzZXI6OnBhcnNlSVB2NEhvc3QKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvdmFsaWRhdGUtY29tbWl0dGVyLWxpc3RzIGIvVG9vbHMvU2NyaXB0cy92YWxp ZGF0ZS1jb21taXR0ZXItbGlzdHMKaW5kZXggZDEzZDA4N2VhNTU1ZDRiNTcxN2JkYTcyMWFkMWE1 NjlkYjU2OWEwNC4uMWVjMmM4MDhjNTE5Y2I0MGJhYjk0MWVlNDI0MGQyNDhiOTY2YmYxMCAxMDA3 NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy92YWxpZGF0ZS1jb21taXR0ZXItbGlzdHMKKysrIGIvVG9v bHMvU2NyaXB0cy92YWxpZGF0ZS1jb21taXR0ZXItbGlzdHMKQEAgLTIxNSwxOSArMjE1LDI3IEBA IGNsYXNzIENvbW1pdHRlckxpc3RGcm9tR2l0KG9iamVjdCk6CiAgICAgZGVmIF9wcmludF90aHJl ZV9jb2x1bW5fcm93KHdpZHRocywgdmFsdWVzKToKICAgICAgICAgcHJpbnQgIiVzJXMlcyIgJSAo dmFsdWVzWzBdLmxqdXN0KHdpZHRoc1swXSksIHZhbHVlc1sxXS5sanVzdCh3aWR0aHNbMV0pLCB2 YWx1ZXNbMl0pCiAKLSAgICBkZWYgcHJpbnRfcG9zc2libHlfZXhwaXJlZF9jb21taXR0ZXJzKHNl bGYsIGNvbW1pdHRlcl9saXN0KToKKyAgICBkZWYgcG9zc2libHlfZXhwaXJlZF9jb21taXR0ZXJz KHNlbGYsIGNvbW1pdHRlcl9saXN0KToKICAgICAgICAgYXV0aG9yc19hbmRfbGFzdF9jb21taXRz ID0gc2VsZi5fbGFzdF9jb21taXRfYnlfYXV0aG9yKCkuaXRlbXMoKQogICAgICAgICBhdXRob3Jz X2FuZF9sYXN0X2NvbW1pdHMuc29ydChsYW1iZGEgYSxiOiBjbXAoYVsxXSwgYlsxXSksIHJldmVy c2U9VHJ1ZSkKICAgICAgICAgY29tbWl0dGVyX2N1dHRvZiA9IGRhdGUudG9kYXkoKSAtIHRpbWVk ZWx0YShkYXlzPTM2NSkKKyAgICAgICAgcmV0aXJlZF9hdXRob3JzX2FuZF9sYXN0X2NvbW1pdHMg PSBbXQorICAgICAgICBmb3IgKGF1dGhvciwgbGFzdF9jb21taXQpIGluIGF1dGhvcnNfYW5kX2xh c3RfY29tbWl0czoKKyAgICAgICAgICAgIGxhc3RfY29tbWl0X2RhdGUgPSBkYXRlLmZyb210aW1l c3RhbXAobGFzdF9jb21taXQpCisgICAgICAgICAgICBpZiBjb21taXR0ZXJfY3V0dG9mID4gbGFz dF9jb21taXRfZGF0ZToKKyAgICAgICAgICAgICAgICByZXRpcmVkX2F1dGhvcnNfYW5kX2xhc3Rf Y29tbWl0cy5hcHBlbmQoKGF1dGhvciwgbGFzdF9jb21taXQpKQorICAgICAgICByZXR1cm4gcmV0 aXJlZF9hdXRob3JzX2FuZF9sYXN0X2NvbW1pdHMKKworICAgIGRlZiBwcmludF9wb3NzaWJseV9l eHBpcmVkX2NvbW1pdHRlcnMoc2VsZiwgY29tbWl0dGVyX2xpc3QpOgorICAgICAgICByZXRpcmVk X2F1dGhvcnNfYW5kX2xhc3RfY29tbWl0cyA9IHNlbGYucG9zc2libHlfZXhwaXJlZF9jb21taXR0 ZXJzKGNvbW1pdHRlcl9saXN0KQogICAgICAgICBjb2x1bW5fd2lkdGhzID0gWzEzLCAyNV0KICAg ICAgICAgcHJpbnQKICAgICAgICAgcHJpbnQgIkNvbW1pdHRlcnMgd2hvIGhhdmUgbm90IGNvbW1p dHRlZCB3aXRoaW4gb25lIHllYXI6IgogICAgICAgICBzZWxmLl9wcmludF90aHJlZV9jb2x1bW5f cm93KGNvbHVtbl93aWR0aHMsICgiTGFzdCBDb21taXQiLCAiQ29tbWl0dGVyIEVtYWlsIiwgIkNv bW1pdHRlciBSZWNvcmQiKSkKLSAgICAgICAgZm9yIChhdXRob3IsIGxhc3RfY29tbWl0KSBpbiBh dXRob3JzX2FuZF9sYXN0X2NvbW1pdHM6CisgICAgICAgIGZvciAgKGF1dGhvciwgbGFzdF9jb21t aXQpIGluIHJldGlyZWRfYXV0aG9yc19hbmRfbGFzdF9jb21taXRzOgorICAgICAgICAgICAgY29t bWl0dGVyX3JlY29yZCA9IGNvbW1pdHRlcl9saXN0LmNvbW1pdHRlcl9ieV9lbWFpbChhdXRob3Ip CiAgICAgICAgICAgICBsYXN0X2NvbW1pdF9kYXRlID0gZGF0ZS5mcm9tdGltZXN0YW1wKGxhc3Rf Y29tbWl0KQotICAgICAgICAgICAgaWYgY29tbWl0dGVyX2N1dHRvZiA+IGxhc3RfY29tbWl0X2Rh dGU6Ci0gICAgICAgICAgICAgICAgY29tbWl0dGVyX3JlY29yZCA9IGNvbW1pdHRlcl9saXN0LmNv bW1pdHRlcl9ieV9lbWFpbChhdXRob3IpCi0gICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRfdGhy ZWVfY29sdW1uX3Jvdyhjb2x1bW5fd2lkdGhzLCAoc3RyKGxhc3RfY29tbWl0X2RhdGUpLCBhdXRo b3IsIGNvbW1pdHRlcl9yZWNvcmQpKQorICAgICAgICAgICAgc2VsZi5fcHJpbnRfdGhyZWVfY29s dW1uX3Jvdyhjb2x1bW5fd2lkdGhzLCAoc3RyKGxhc3RfY29tbWl0X2RhdGUpLCBhdXRob3IsIGNv bW1pdHRlcl9yZWNvcmQpKQogCiAgICAgZGVmIHByaW50X2NvbW1pdHRlcnNfbWlzc2luZ19mcm9t X2NvbW1pdHRlcl9saXN0KHNlbGYsIGNvbW1pdHRlcl9saXN0KToKICAgICAgICAgbWlzc2luZ19m cm9tX2NvbnRyaWJ1dG9yc19qc29uID0gW10KQEAgLTI2NSw5ICsyNzMsMjIgQEAgY2xhc3MgQ29t bWl0dGVyTGlzdEJ1Z3ppbGxhQ2hlY2tlcihvYmplY3QpOgogZGVmIG1haW4oKToKICAgICBwYXJz ZXIgPSBPcHRpb25QYXJzZXIoKQogICAgIHBhcnNlci5hZGRfb3B0aW9uKCItYiIsICItLWNoZWNr LWJ1Z3ppbGxhLWVtYWlscyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGhlbHA9IkNoZWNrIHRoZSBi dWd6aWxsYV9lbWFpbCBmb3IgZWFjaCBjb21taXR0ZXIgYWdhaW5zdCBidWdzLndlYmtpdC5vcmci KQorICAgIHBhcnNlci5hZGRfb3B0aW9uKCItZCIsICItLWR1bXAiLCBhY3Rpb249InN0b3JlX3Ry dWUiLCBoZWxwPSJEdW1wIHRoZSBjb250cmlidXRvciBsaXN0IGFzIEpTT04gdG8gc3Rkb3V0IChz dWl0YWJsZSBmb3Igc2F2aW5nIHRvIGNvbnRyaWJ1dG9ycy5qc29uKSIpCisgICAgcGFyc2VyLmFk ZF9vcHRpb24oIi1jIiwgIi0tY2Fub25pY2FsaXplIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgaGVs cD0iQ2Fub25pY2FsaXplIGNvbnRyaWJ1dG9ycy5qc29uLCByZXdyaXRpbmcgaXQgaW4tcGxhY2Ui KQorCiAgICAgKG9wdGlvbnMsIGFyZ3MpID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQogCiAgICAgY29t bWl0dGVyX2xpc3QgPSBDb21taXR0ZXJMaXN0KCkKKyAgICBpZiBvcHRpb25zLmR1bXA6CisgICAg ICAgIHByaW50IGNvbW1pdHRlcl9saXN0LmFzX2pzb24oKQorICAgICAgICByZXR1cm4gMDsKKwor ICAgIGlmIG9wdGlvbnMuY2Fub25pY2FsaXplOgorICAgICAgICBwcmludCAiVXBkYXRpbmcgY29u dHJpYnV0b3JzLmpzb24gaW4tcGxhY2UuLi4iCisgICAgICAgIGNvbW1pdHRlcl9saXN0LnJlZm9y bWF0X2luX3BsYWNlKCkKKyAgICAgICAgcHJpbnQgIkRvbmUiCisgICAgICAgIHJldHVybiAwOwor CiAgICAgQ29tbWl0dGVyTGlzdEZyb21NYWlsaW5nTGlzdCgpLmNoZWNrX2Zvcl9lbWFpbHNfbWlz c2luZ19mcm9tX2xpc3QoY29tbWl0dGVyX2xpc3QpCiAgCiAgICAgaWYgbm90IEdpdC5pbl93b3Jr aW5nX2RpcmVjdG9yeSgiLiIpOgpAQCAtMjc3LDYgKzI5OCw3IEBAIFRoZSBmb2xsb3dpbmcgY2hl Y2tzIGFyZSBkaXNhYmxlZDoKICAtIExpc3Qgb2YgaGlzdG9yaWNhbCBjb21taXR0ZXJzIG1pc3Np bmcgZnJvbSBjb250cmlidXRvcnMuanNvbgogIiIiCiAgICAgICAgIHJldHVybiAxCisKICAgICBz dm5fY29tbWl0dGVyX2xpc3QgPSBDb21taXR0ZXJMaXN0RnJvbUdpdCgpCiAgICAgc3ZuX2NvbW1p dHRlcl9saXN0LnByaW50X3Bvc3NpYmx5X2V4cGlyZWRfY29tbWl0dGVycyhjb21taXR0ZXJfbGlz dCkKICAgICBzdm5fY29tbWl0dGVyX2xpc3QucHJpbnRfY29tbWl0dGVyc19taXNzaW5nX2Zyb21f Y29tbWl0dGVyX2xpc3QoY29tbWl0dGVyX2xpc3QpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jb25maWcvY29tbWl0dGVycy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL2NvbmZpZy9jb21taXR0ZXJzLnB5CmluZGV4IDZlYWVkZmFhZjlhM2UxYTY2 Yzk4ZTg0NzgzMDhiMmFiNzdmY2M4NDQuLjkwYmZjN2E0OTdlM2E4NjBhYzg1NzhhNDMwMTQ0ODFk NTg1NWY3YzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZp Zy9jb21taXR0ZXJzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZp Zy9jb21taXR0ZXJzLnB5CkBAIC0zMSwxNyArMzEsMTQgQEAKIAogaW1wb3J0IGZubWF0Y2gKIGlt cG9ydCBqc29uCitpbXBvcnQgc3lzCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmVkaXRkaXN0YW5j ZSBpbXBvcnQgZWRpdF9kaXN0YW5jZQogZnJvbSB3ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1w b3J0IG1lbW9pemVkCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBv cnQgRmlsZVN5c3RlbQogCi0KLSMgVGhlIGxpc3Qgb2YgY29udHJpYnV0b3JzIGhhdmUgYmVlbiBt b3ZlZCB0byBjb250cmlidXRvcnMuanNvbgotCi0KIGNsYXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6 Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tu YW1lX29yX25pY2tuYW1lcz1Ob25lKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1h aWxfb3JfZW1haWxzLCBpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzPU5vbmUsIGV4cGVydGlzZT1O b25lKToKICAgICAgICAgYXNzZXJ0KG5hbWUpCiAgICAgICAgIGFzc2VydChlbWFpbF9vcl9lbWFp bHMpCiAgICAgICAgIHNlbGYuZnVsbF9uYW1lID0gbmFtZQpAQCAtNDksMTEgKzQ2LDEzIEBAIGNs YXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLmVtYWlscyA9IFtlbWFp bF9vcl9lbWFpbHNdCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBzZWxmLmVtYWlscyA9IGVt YWlsX29yX2VtYWlscworICAgICAgICBzZWxmLl9jYXNlX3ByZXNlcnZlZF9lbWFpbHMgPSBzZWxm LmVtYWlscwogICAgICAgICBzZWxmLmVtYWlscyA9IG1hcChsYW1iZGEgZW1haWw6IGVtYWlsLmxv d2VyKCksIHNlbGYuZW1haWxzKSAgIyBFbWFpbHMgYXJlIGNhc2UtaW5zZW5zaXRpdmUuCiAgICAg ICAgIGlmIGlzaW5zdGFuY2UoaXJjX25pY2tuYW1lX29yX25pY2tuYW1lcywgc3RyKToKICAgICAg ICAgICAgIHNlbGYuaXJjX25pY2tuYW1lcyA9IFtpcmNfbmlja25hbWVfb3Jfbmlja25hbWVzXQog ICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5pcmNfbmlja25hbWVzID0gaXJjX25pY2tu YW1lX29yX25pY2tuYW1lcworICAgICAgICBzZWxmLmV4cGVydGlzZSA9IGV4cGVydGlzZQogICAg ICAgICBzZWxmLmNhbl9jb21taXQgPSBGYWxzZQogICAgICAgICBzZWxmLmNhbl9yZXZpZXcgPSBG YWxzZQogCkBAIC05MywxNiArOTIsMjYgQEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAg ICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICByZXR1cm4gRmFsc2UKIAorICAgIGRl ZiBfX2RpY3RfXyhzZWxmKToKKyAgICAgICAgaW5mbyA9IHsiZW1haWxzIiA6IHNlbGYuX2Nhc2Vf cHJlc2VydmVkX2VtYWlsc30KKworICAgICAgICBpZiBzZWxmLmlyY19uaWNrbmFtZXM6CisgICAg ICAgICAgICBpbmZvWyJuaWNrcyJdID0gc2VsZi5pcmNfbmlja25hbWVzCisKKyAgICAgICAgaWYg c2VsZi5leHBlcnRpc2U6CisgICAgICAgICAgICBpbmZvWyJleHBlcnRpc2UiXSA9IHNlbGYuZXhw ZXJ0aXNlCisKKyAgICAgICAgcmV0dXJuIGluZm8KIAogY2xhc3MgQ29tbWl0dGVyKENvbnRyaWJ1 dG9yKToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZW1haWxfb3JfZW1haWxzLCBpcmNf bmlja25hbWU9Tm9uZSk6Ci0gICAgICAgIENvbnRyaWJ1dG9yLl9faW5pdF9fKHNlbGYsIG5hbWUs IGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1lKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBu YW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZT1Ob25lLCBleHBlcnRpc2U9Tm9uZSk6 CisgICAgICAgIENvbnRyaWJ1dG9yLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWls cywgaXJjX25pY2tuYW1lLCBleHBlcnRpc2UpCiAgICAgICAgIHNlbGYuY2FuX2NvbW1pdCA9IFRy dWUKIAogCiBjbGFzcyBSZXZpZXdlcihDb21taXR0ZXIpOgotICAgIGRlZiBfX2luaXRfXyhzZWxm LCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZT1Ob25lKToKLSAgICAgICAgQ29t bWl0dGVyLl9faW5pdF9fKHNlbGYsIG5hbWUsIGVtYWlsX29yX2VtYWlscywgaXJjX25pY2tuYW1l KQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNr bmFtZT1Ob25lLCBleHBlcnRpc2U9Tm9uZSk6CisgICAgICAgIENvbW1pdHRlci5fX2luaXRfXyhz ZWxmLCBuYW1lLCBlbWFpbF9vcl9lbWFpbHMsIGlyY19uaWNrbmFtZSwgZXhwZXJ0aXNlKQogICAg ICAgICBzZWxmLmNhbl9yZXZpZXcgPSBUcnVlCiAKIApAQCAtMTMyLDE3ICsxNDEsNTAgQEAgY2xh c3MgQ29tbWl0dGVyTGlzdChvYmplY3QpOgogICAgIGRlZiBsb2FkX2pzb24oKToKICAgICAgICAg ZmlsZXN5c3RlbSA9IEZpbGVTeXN0ZW0oKQogICAgICAgICBqc29uX3BhdGggPSBmaWxlc3lzdGVt LmpvaW4oZmlsZXN5c3RlbS5kaXJuYW1lKGZpbGVzeXN0ZW0ucGF0aF90b19tb2R1bGUoJ3dlYmtp dHB5LmNvbW1vbi5jb25maWcnKSksICdjb250cmlidXRvcnMuanNvbicpCi0gICAgICAgIGNvbnRy aWJ1dG9ycyA9IGpzb24ubG9hZHMoZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZShqc29uX3BhdGgp KQorICAgICAgICB0cnk6CisgICAgICAgICAgICBjb250cmlidXRvcnMgPSBqc29uLmxvYWRzKGZp bGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUoanNvbl9wYXRoKSkKKyAgICAgICAgZXhjZXB0IFZhbHVl RXJyb3IsIGU6CisgICAgICAgICAgICBzeXMuZXhpdCgnY29udHJpYnV0b3JzLmpzb24gaXMgbWFs Zm9ybWVkOiAnICsgc3RyKGUpKQogCiAgICAgICAgIHJldHVybiB7Ci0gICAgICAgICAgICAnQ29u dHJpYnV0b3JzJzogW0NvbnRyaWJ1dG9yKG5hbWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwgZGF0YS5n ZXQoJ25pY2tzJykpIGZvciBuYW1lLCBkYXRhIGluIGNvbnRyaWJ1dG9yc1snQ29udHJpYnV0b3Jz J10uaXRlcml0ZW1zKCldLAotICAgICAgICAgICAgJ0NvbW1pdHRlcnMnOiBbQ29tbWl0dGVyKG5h bWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJykpIGZvciBuYW1lLCBkYXRh IGluIGNvbnRyaWJ1dG9yc1snQ29tbWl0dGVycyddLml0ZXJpdGVtcygpXSwKLSAgICAgICAgICAg ICdSZXZpZXdlcnMnOiBbUmV2aWV3ZXIobmFtZSwgZGF0YS5nZXQoJ2VtYWlscycpLCBkYXRhLmdl dCgnbmlja3MnKSkgZm9yIG5hbWUsIGRhdGEgaW4gY29udHJpYnV0b3JzWydSZXZpZXdlcnMnXS5p dGVyaXRlbXMoKV0sCisgICAgICAgICAgICAnQ29udHJpYnV0b3JzJzogW0NvbnRyaWJ1dG9yKG5h bWUsIGRhdGEuZ2V0KCdlbWFpbHMnKSwgZGF0YS5nZXQoJ25pY2tzJyksIGRhdGEuZ2V0KCdleHBl cnRpc2UnKSkgZm9yIG5hbWUsIGRhdGEgaW4gY29udHJpYnV0b3JzWydDb250cmlidXRvcnMnXS5p dGVyaXRlbXMoKV0sCisgICAgICAgICAgICAnQ29tbWl0dGVycyc6ICAgW0NvbW1pdHRlcihuYW1l LCBkYXRhLmdldCgnZW1haWxzJyksIGRhdGEuZ2V0KCduaWNrcycpLCBkYXRhLmdldCgnZXhwZXJ0 aXNlJykpIGZvciBuYW1lLCBkYXRhIGluIGNvbnRyaWJ1dG9yc1snQ29tbWl0dGVycyddLml0ZXJp dGVtcygpXSwKKyAgICAgICAgICAgICdSZXZpZXdlcnMnOiAgICBbUmV2aWV3ZXIobmFtZSwgZGF0 YS5nZXQoJ2VtYWlscycpLCBkYXRhLmdldCgnbmlja3MnKSwgZGF0YS5nZXQoJ2V4cGVydGlzZScp KSBmb3IgbmFtZSwgZGF0YSBpbiBjb250cmlidXRvcnNbJ1Jldmlld2VycyddLml0ZXJpdGVtcygp XSwKICAgICAgICAgfQogCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBfY29udHJpYnV0b3Jf bGlzdF90b19kaWN0KGxpc3QpOgorICAgICAgICBjb21taXR0ZXJzX2RpY3QgPSB7fQorICAgICAg ICBmb3IgY29udHJpYnV0b3IgaW4gc29ydGVkKGxpc3QpOgorICAgICAgICAgICAgY29tbWl0dGVy c19kaWN0W2NvbnRyaWJ1dG9yLmZ1bGxfbmFtZV0gPSBjb250cmlidXRvci5fX2RpY3RfXygpCisg ICAgICAgIHJldHVybiBjb21taXR0ZXJzX2RpY3QKKworICAgIGRlZiBhc19qc29uKHNlbGYpOgor ICAgICAgICByZXN1bHQgPSB7CisgICAgICAgICAgICAnQ29udHJpYnV0b3JzJzogQ29tbWl0dGVy TGlzdC5fY29udHJpYnV0b3JfbGlzdF90b19kaWN0KHNlbGYuX2V4Y2x1c2l2ZV9jb250cmlidXRv cnMoKSksCisgICAgICAgICAgICAnQ29tbWl0dGVycyc6ICAgQ29tbWl0dGVyTGlzdC5fY29udHJp YnV0b3JfbGlzdF90b19kaWN0KHNlbGYuX2V4Y2x1c2l2ZV9jb21taXR0ZXJzKCkpLAorICAgICAg ICAgICAgJ1Jldmlld2Vycyc6ICAgIENvbW1pdHRlckxpc3QuX2NvbnRyaWJ1dG9yX2xpc3RfdG9f ZGljdChzZWxmLl9yZXZpZXdlcnMpCisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGpzb24uZHVt cHMocmVzdWx0LCBzb3J0X2tleXM9VHJ1ZSwgaW5kZW50PTMsIHNlcGFyYXRvcnM9KCcsJywgJyA6 ICcpKQorCisgICAgZGVmIHJlZm9ybWF0X2luX3BsYWNlKHNlbGYpOgorICAgICAgICBmaWxlc3lz dGVtID0gRmlsZVN5c3RlbSgpCisgICAgICAgIGpzb25fcGF0aCA9IGZpbGVzeXN0ZW0uam9pbihm aWxlc3lzdGVtLmRpcm5hbWUoZmlsZXN5c3RlbS5wYXRoX3RvX21vZHVsZSgnd2Via2l0cHkuY29t bW9uLmNvbmZpZycpKSwgJ2NvbnRyaWJ1dG9ycy5qc29uJykKKyAgICAgICAgZmlsZXN5c3RlbS53 cml0ZV90ZXh0X2ZpbGUoanNvbl9wYXRoLCBzZWxmLmFzX2pzb24oKSkKKworICAgICMgQ29udHJp YnV0b3JzIHdobyBhcmUgbm90IGluIGFueSBvdGhlciBjYXRlZ29yeS4KKyAgICBkZWYgX2V4Y2x1 c2l2ZV9jb250cmlidXRvcnMoc2VsZik6CisgICAgICAgIHJldHVybiBmaWx0ZXIobGFtYmRhIGNv bnRyaWJ1dG9yOiBub3QgKGNvbnRyaWJ1dG9yLmNhbl9jb21taXQgb3IgY29udHJpYnV0b3IuY2Fu X3JldmlldyksIHNlbGYuX2NvbnRyaWJ1dG9ycykKKworICAgICMgQ29tbWl0dGVycyB3aG8gYXJl IG5vdCByZXZpZXdlcnMuCisgICAgZGVmIF9leGNsdXNpdmVfY29tbWl0dGVycyhzZWxmKToKKyAg ICAgICAgcmV0dXJuIGZpbHRlcihsYW1iZGEgY29udHJpYnV0b3I6IGNvbnRyaWJ1dG9yLmNhbl9j b21taXQgYW5kIG5vdCBjb250cmlidXRvci5jYW5fcmV2aWV3LCBzZWxmLl9jb21taXR0ZXJzKQor CisgICAgIyBUaGlzIGlzIHRoZSBzdXBlcnNldCBvZiBjb250cmlidXRvcnMgKyBjb21taXR0ZXJz ICsgcmV2aWV3ZXJzCiAgICAgZGVmIGNvbnRyaWJ1dG9ycyhzZWxmKToKICAgICAgICAgcmV0dXJu IHNlbGYuX2NvbnRyaWJ1dG9ycwogCisgICAgIyBUaGlzIGlzIHRoZSBzdXBlcnNldCBvZiBjb21t aXR0ZXJzICsgcmV2aWV3ZXJzCiAgICAgZGVmIGNvbW1pdHRlcnMoc2VsZik6CiAgICAgICAgIHJl dHVybiBzZWxmLl9jb21taXR0ZXJzCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbiBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9jb250cmlidXRvcnMuanNvbgppbmRleCAwYTdiZmIyYTY3ODVjOWMw MGFlOTQxMWZhODc2NzQwM2UyZWZmNzVlLi4yMzM2MzAzNzU3ZWQ4NjA5Mjc2NGFmZDExMjkxOTZk MTRkMzc1MGJhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25m aWcvY29udHJpYnV0b3JzLmpzb24KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y29uZmlnL2NvbnRyaWJ1dG9ycy5qc29uCkBAIC0zNTksMTAgKzM1OSwxMCBAQAogICAgICAgICAg ICAgImFuaWxzc29uIgogICAgICAgICAgXQogICAgICAgfSwKLSAgICAgICJCYWJhayBTaGFmaWVp IjogewotICAgICAgICAgICJlbWFpbHMiIDogWworICAgICAgIkJhYmFrIFNoYWZpZWkiIDogewor ICAgICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAgICAiYnNoYWZpZWlAYXBwbGUuY29tIgot ICAgICAgICAgIF0KKyAgICAgICAgIF0KICAgICAgIH0sCiAgICAgICAiQmFsYXpzIEtlbGVtZW4i IDogewogICAgICAgICAgImVtYWlscyIgOiBbCkBAIC0zNzYsMTMgKzM3NiwxMyBAQAogICAgICAg ICAgXQogICAgICAgfSwKICAgICAgICJCYXNpbGUgQ2xlbWVudCIgOiB7Ci0gICAgICAgICJlbWFp bHMiIDogWworICAgICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAgICAiYmFzaWxlX2NsZW1l bnRAYXBwbGUuY29tIiwKICAgICAgICAgICAgICJjYmFzaWxlMDYrd2Via2l0QGdtYWlsLmNvbSIK LSAgICAgICAgXSwKLSAgICAgICAgIm5pY2tzIiA6IFsKKyAgICAgICAgIF0sCisgICAgICAgICAi bmlja3MiIDogWwogICAgICAgICAgICAgImVsYXJub24iCi0gICAgICAgIF0KKyAgICAgICAgIF0K ICAgICAgIH0sCiAgICAgICAiQmVhciBUcmF2aXMiIDogewogICAgICAgICAgImVtYWlscyIgOiBb CkBAIC02NzIsMTYgKzY3Miw2IEBACiAgICAgICAgICAgICAiZGFuYWtqIgogICAgICAgICAgXQog ICAgICAgfSwKLSAgICAgICJEXHUwMEUxbmllbCBCXHUwMEUxdHlhaSIgOiB7Ci0gICAgICAgICAi ZW1haWxzIiA6IFsKLSAgICAgICAgICAgICJkYmF0eWFpLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3Vu Zy5jb20iLAotICAgICAgICAgICAgImRiYXR5YWlAaW5mLnUtc3plZ2VkLmh1IiwKLSAgICAgICAg ICAgICJCYXR5YWkuRGFuaWVsQHN0dWQudS1zemVnZWQuaHUiCi0gICAgICAgICBdLAotICAgICAg ICAgIm5pY2tzIiA6IFsKLSAgICAgICAgICAgICJkYmF0eWFpIgotICAgICAgICAgXQotICAgICAg fSwKICAgICAgICJEYW5pZWwgQ2hlbmciIDogewogICAgICAgICAgImVtYWlscyIgOiBbCiAgICAg ICAgICAgICAiZGNoZW5nQGNocm9taXVtLm9yZyIKQEAgLTg4OCw2ICs4NzgsMTYgQEAKICAgICAg ICAgICAgICJhdHdpbHNvbiIKICAgICAgICAgIF0KICAgICAgIH0sCisgICAgICAiRFx1MDBlMW5p ZWwgQlx1MDBlMXR5YWkiIDogeworICAgICAgICAgImVtYWlscyIgOiBbCisgICAgICAgICAgICAi ZGJhdHlhaS51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1bmcuY29tIiwKKyAgICAgICAgICAgICJkYmF0 eWFpQGluZi51LXN6ZWdlZC5odSIsCisgICAgICAgICAgICAiQmF0eWFpLkRhbmllbEBzdHVkLnUt c3plZ2VkLmh1IgorICAgICAgICAgXSwKKyAgICAgICAgICJuaWNrcyIgOiBbCisgICAgICAgICAg ICAiZGJhdHlhaSIKKyAgICAgICAgIF0KKyAgICAgIH0sCiAgICAgICAiRWxpIEZpZGxlciIgOiB7 CiAgICAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICAgICJlZmlkbGVyQHJpbS5jb20iLApA QCAtOTA2LDcgKzkwNiw3IEBACiAgICAgICAgICAgICAiZXBvZ2VyIgogICAgICAgICAgXQogICAg ICAgfSwKLSAgICAgICJFbnJpcXVlIE9jYVx1MDBGMWEgR29uelx1MDBFMWxleiIgOiB7CisgICAg ICAiRW5yaXF1ZSBPY2FcdTAwZjFhIEdvbnpcdTAwZTFsZXoiIDogewogICAgICAgICAgImVtYWls cyIgOiBbCiAgICAgICAgICAgICAiZW9jYW5oYUBpZ2FsaWEuY29tIiwKICAgICAgICAgICAgICJl b2NhbmhhQGdtYWlsLmNvbSIKQEAgLTEwMDgsNyArMTAwOCw3IEBACiAgICAgICAgICAgICAiZm1h bGl0YSIKICAgICAgICAgIF0KICAgICAgIH0sCi0gICAgICAiRnLDqWTDqXJpYyBXYW5nIiA6IHsK KyAgICAgICJGclx1MDBlOWRcdTAwZTlyaWMgV2FuZyIgOiB7CiAgICAgICAgICAiZW1haWxzIiA6 IFsKICAgICAgICAgICAgICJmcmVkLndhbmdAZnJlZS5mciIsCiAgICAgICAgICAgICAiZndhbmdA aWdhbGlhLmNvbSIKQEAgLTEyNjMsNiArMTI2MywxOCBAQAogICAgICAgICAgICAgImlrZUBhcHBs ZS5jb20iCiAgICAgICAgICBdCiAgICAgICB9LAorICAgICAgIkpGIEJhc3RpZW4iIDogeworICAg ICAgICAgImVtYWlscyIgOiBbCisgICAgICAgICAgICAiamZiYXN0aWVuQGFwcGxlLmNvbSIsCisg ICAgICAgICAgICAiamZiQGNocm9taXVtLm9yZyIKKyAgICAgICAgIF0sCisgICAgICAgICAiZXhw ZXJ0aXNlIiA6ICJKYXZhU2NyaXB0L0VDTUFTY3JpcHQiLAorICAgICAgICAgIm5pY2tzIiA6IFsK KyAgICAgICAgICAgICJqZmIiLAorICAgICAgICAgICAgImpmYl8iLAorICAgICAgICAgICAgImpm YmFzdGllbiIKKyAgICAgICAgIF0KKyAgICAgIH0sCiAgICAgICAiSmFja3kgSmlhbmciIDogewog ICAgICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAgICAiamtqaWFuZ0B3ZWJraXQub3JnIiwK QEAgLTEyNzUsMjIgKzEyODcsMjIgQEAKICAgICAgICAgICAgICJqa2ppYW5nIgogICAgICAgICAg XQogICAgICAgfSwKLSAgICAgICJKYWVodW4gTGltIiA6IHsKKyAgICAgICJKYWUgSHl1biBQYXJr IiA6IHsKICAgICAgICAgICJlbWFpbHMiIDogWwotICAgICAgICAgICAgImxqYWVodW4ubGltQHNh bXN1bmcuY29tIgorICAgICAgICAgICAgImphZXBhcmtAd2Via2l0Lm9yZyIsCisgICAgICAgICAg ICAiamFlLnBhcmtAY29tcGFueTEwMC5uZXQiCiAgICAgICAgICBdLAotICAgICAgICAgImV4cGVy dGlzZSIgOiAiVGhlIEVGTFdlYktpdCBwb3J0IiwKICAgICAgICAgICJuaWNrcyIgOiBbCi0gICAg ICAgICAgICAiamFlaHVuIgorICAgICAgICAgICAgImphZXBhcmsiCiAgICAgICAgICBdCiAgICAg ICB9LAotICAgICAgIkphZSBIeXVuIFBhcmsiIDogeworICAgICAgIkphZWh1biBMaW0iIDogewog ICAgICAgICAgImVtYWlscyIgOiBbCi0gICAgICAgICAgICAiamFlcGFya0B3ZWJraXQub3JnIiwK LSAgICAgICAgICAgICJqYWUucGFya0Bjb21wYW55MTAwLm5ldCIKKyAgICAgICAgICAgICJsamFl aHVuLmxpbUBzYW1zdW5nLmNvbSIKICAgICAgICAgIF0sCisgICAgICAgICAiZXhwZXJ0aXNlIiA6 ICJUaGUgRUZMV2ViS2l0IHBvcnQiLAogICAgICAgICAgIm5pY2tzIiA6IFsKLSAgICAgICAgICAg ICJqYWVwYXJrIgorICAgICAgICAgICAgImphZWh1biIKICAgICAgICAgIF0KICAgICAgIH0sCiAg ICAgICAiSmFrZSBOaWVsc2VuIiA6IHsKQEAgLTE0NjQsMTggKzE0NzYsNiBAQAogICAgICAgICAg ICAgImplZXpfIgogICAgICAgICAgXQogICAgICAgfSwKLSAgICAgICJKRiBCYXN0aWVuIiA6IHsK LSAgICAgICAgICJlbWFpbHMiIDogWwotICAgICAgICAgICAgImpmYmFzdGllbkBhcHBsZS5jb20i LAotICAgICAgICAgICAgImpmYkBjaHJvbWl1bS5vcmciCi0gICAgICAgICBdLAotICAgICAgICAg ImV4cGVydGlzZSIgOiAiSmF2YVNjcmlwdC9FQ01BU2NyaXB0IiwKLSAgICAgICAgICJuaWNrcyIg OiBbCi0gICAgICAgICAgICAgImpmYiIsCi0gICAgICAgICAgICAgImpmYl8iLAotICAgICAgICAg ICAgICJqZmJhc3RpZW4iCi0gICAgICAgICBdCi0gICAgICB9LAogICAgICAgIkppYSBQdSIgOiB7 CiAgICAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICAgICJqaWFwdS5tYWlsQGdtYWlsLmNv bSIsCkBAIC0xNDkwLDE1ICsxNDkwLDYgQEAKICAgICAgICAgICAgICJKaWV3ZW4iCiAgICAgICAg ICBdCiAgICAgICB9LAotICAgICAgIkppbnlvdW5nIEh1ciIgOiB7Ci0gICAgICAgICAiZW1haWxz IiA6IFsKLSAgICAgICAgICAgICJodXIuaW1zQG5hdmVyY29ycC5jb20iCi0gICAgICAgICBdLAot ICAgICAgICAgImV4cGVydGlzZSIgOiAiVGhlIFdpbkNhaXJvIFBvcnQsIFdlYkdMLCBDYW52YXMs IEFjY2VsZXJhdGVkIENvbXBvc2l0aW5nIiwKLSAgICAgICAgICJuaWNrcyIgOiBbCi0gICAgICAg ICAgICAianlodXIiCi0gICAgICAgICBdCi0gICAgICB9LAogICAgICAgIkppbndvbyBTb25nIiA6 IHsKICAgICAgICAgICJlbWFpbHMiIDogWwogICAgICAgICAgICAgImppbndvbzcuc29uZ0BzYW1z dW5nLmNvbSIsCkBAIC0xNTA5LDYgKzE1MDAsMTUgQEAKICAgICAgICAgICAgICJqaW53b28iCiAg ICAgICAgICBdCiAgICAgICB9LAorICAgICAgIkppbnlvdW5nIEh1ciIgOiB7CisgICAgICAgICAi ZW1haWxzIiA6IFsKKyAgICAgICAgICAgICJodXIuaW1zQG5hdmVyY29ycC5jb20iCisgICAgICAg ICBdLAorICAgICAgICAgImV4cGVydGlzZSIgOiAiVGhlIFdpbkNhaXJvIFBvcnQsIFdlYkdMLCBD YW52YXMsIEFjY2VsZXJhdGVkIENvbXBvc2l0aW5nIiwKKyAgICAgICAgICJuaWNrcyIgOiBbCisg ICAgICAgICAgICAianlodXIiCisgICAgICAgICBdCisgICAgICB9LAogICAgICAgIkpvZSBUaG9t YXMiIDogewogICAgICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAgICAiam9ldGhvbWFzQG1v dG9yb2xhLmNvbSIKQEAgLTE2ODgsNiArMTY4OCwxNSBAQAogICAgICAgICAgICAgImpzY2h1aCIK ICAgICAgICAgIF0KICAgICAgIH0sCisgICAgICAiS2FseWFuIEtvbmRhcGFsbHkiIDogeworICAg ICAgICAgImVtYWlscyIgOiBbCisgICAgICAgICAgICAia2FseWFuLmtvbmRhcGFsbHlAaW50ZWwu Y29tIiwKKyAgICAgICAgICAgICJrb25kYXBhbGx5a2FseWFuQGdtYWlsLmNvbSIKKyAgICAgICAg IF0sCisgICAgICAgICAibmlja3MiIDogWworICAgICAgICAgICAgImthbHlhbmsiCisgICAgICAg ICBdCisgICAgICB9LAogICAgICAgIkthbmdpbCBIYW4iIDogewogICAgICAgICAgImVtYWlscyIg OiBbCiAgICAgICAgICAgICAia2FuZ2lsLmhhbkBzYW1zdW5nLmNvbSIsCkBAIC0xNzA3LDE1ICsx NzE2LDYgQEAKICAgICAgICAgICAgICJrYXJlbmciCiAgICAgICAgICBdCiAgICAgICB9LAotICAg ICAgIkthbHlhbiBLb25kYXBhbGx5IiA6IHsKLSAgICAgICAgICJlbWFpbHMiIDogWwotICAgICAg ICAgICAgImthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbSIsCi0gICAgICAgICAgICAia29uZGFw YWxseWthbHlhbkBnbWFpbC5jb20iCi0gICAgICAgICBdLAotICAgICAgICAgIm5pY2tzIiA6IFsK LSAgICAgICAgICAgICJrYWx5YW5rIgotICAgICAgICAgXQotICAgICAgfSwKICAgICAgICJLYXVz dHViaCBBdHJhd2Fsa2FyIiA6IHsKICAgICAgICAgICJlbWFpbHMiIDogWwogICAgICAgICAgICAg ImthdXN0dWJoLnJhQGdtYWlsLmNvbSIsCkBAIC0xNzI1LDExICsxNzI1LDYgQEAKICAgICAgICAg ICAgICJzaWx2ZXJyb290cyIKICAgICAgICAgIF0KICAgICAgIH0sCi0gICAgICAiS2VpdGggUm9s bGluIiA6IHsKLSAgICAgICAgICJlbWFpbHMiIDogWwotICAgICAgICAgICAgImtyb2xsaW5AYXBw bGUuY29tIgotICAgICAgICAgXQotICAgICAgfSwKICAgICAgICJLZWlzaGkgSGF0dG9yaSIgOiB7 CiAgICAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICAgICJrZWlzaGlAd2Via2l0Lm9yZyIK QEAgLTE3MzksNiArMTczNCwxMSBAQAogICAgICAgICAgICAgImtlaXNoaSIKICAgICAgICAgIF0K ICAgICAgIH0sCisgICAgICAiS2VpdGggUm9sbGluIiA6IHsKKyAgICAgICAgICJlbWFpbHMiIDog WworICAgICAgICAgICAgImtyb2xsaW5AYXBwbGUuY29tIgorICAgICAgICAgXQorICAgICAgfSwK ICAgICAgICJLZWxseSBOb3J0b24iIDogewogICAgICAgICAgImVtYWlscyIgOiBbCiAgICAgICAg ICAgICAia25vcnRvbkBnb29nbGUuY29tIiwKQEAgLTE4ODEsMTUgKzE4ODEsNiBAQAogICAgICAg ICAgICAgImh5dWtpIgogICAgICAgICAgXQogICAgICAgfSwKLSAgICAgICJMXHUwMEUxc3psXHUw MEYzIExhbmdcdTAwRjMiIDogewotICAgICAgICAgImVtYWlscyIgOiBbCi0gICAgICAgICAgICAi bGxhbmdvLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20iLAotICAgICAgICAgICAgImxhbmdv QGluZi51LXN6ZWdlZC5odSIKLSAgICAgICAgIF0sCi0gICAgICAgICAibmlja3MiIDogWwotICAg ICAgICAgICAgImxsYW5nbyIKLSAgICAgICAgIF0KLSAgICAgIH0sCiAgICAgICAiTGFzemxvIFZp ZGFjcyIgOiB7CiAgICAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICAgICJsdmlkYWNzLnUt c3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20iLApAQCAtMTk3Miw2ICsxOTYzLDE1IEBACiAgICAg ICAgICAgICAibWFjcGhlcnNvbiIKICAgICAgICAgIF0KICAgICAgIH0sCisgICAgICAiTFx1MDBl MXN6bFx1MDBmMyBMYW5nXHUwMGYzIiA6IHsKKyAgICAgICAgICJlbWFpbHMiIDogWworICAgICAg ICAgICAgImxsYW5nby51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1bmcuY29tIiwKKyAgICAgICAgICAg ICJsYW5nb0BpbmYudS1zemVnZWQuaHUiCisgICAgICAgICBdLAorICAgICAgICAgIm5pY2tzIiA6 IFsKKyAgICAgICAgICAgICJsbGFuZ28iCisgICAgICAgICBdCisgICAgICB9LAogICAgICAgIk1h ZHMgQWdlciIgOiB7CiAgICAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICAgICJhZ2VyQGNo cm9taXVtLm9yZyIKQEAgLTIzNzcsNyArMjM3Nyw3IEBACiAgICAgICAgICAgICAiZ2FscGV0ZXJA aW5mLnUtc3plZ2VkLmh1IiwKICAgICAgICAgICAgICJwZ2FsLnUtc3plZ2VkQHBhcnRuZXIuc2Ft c3VuZy5jb20iCiAgICAgICAgICBdLAotICAgICAgICAgImV4cGVydGlzZSI6ICJQeXRob24sIENV UkwgSFRUUCBiYWNrZW5kIiwKKyAgICAgICAgICJleHBlcnRpc2UiIDogIlB5dGhvbiwgQ1VSTCBI VFRQIGJhY2tlbmQiLAogICAgICAgICAgIm5pY2tzIiA6IFsKICAgICAgICAgICAgICJlbGVjcm8i CiAgICAgICAgICBdCkBAIC0yODIzLDE1ICsyODIzLDYgQEAKICAgICAgICAgICAgICJ0ZGFuZGVy c29uIgogICAgICAgICAgXQogICAgICAgfSwKLSAgICAgICJUaGlhZ28gZGUgQmFycm9zIExhY2Vy ZGEiIDogewotICAgICAgICAgImVtYWlscyIgOiBbCi0gICAgICAgICAgICAidGhpYWdvLmxhY2Vy ZGFAb3BlbmJvc3NhLm9yZyIKLSAgICAgICAgIF0sCi0gICAgICAgICAiZXhwZXJ0aXNlIiA6ICJO aXggcG9ydCwgV2ViUlRDLCBNZWRpYVN0cmVhbSIsCi0gICAgICAgICAibmlja3MiIDogWwotICAg ICAgICAgICAgImxhY2VyZGEiCi0gICAgICAgICBdCi0gICAgICB9LAogICAgICAgIlRoaWFnbyBN YXJjb3MgUC4gU2FudG9zIiA6IHsKICAgICAgICAgICJlbWFpbHMiIDogWwogICAgICAgICAgICAg InRtcHNhbnRvc0BnbWFpbC5jb20iLApAQCAtMjg0Miw2ICsyODMzLDE1IEBACiAgICAgICAgICAg ICAidG1wc2FudG9zIgogICAgICAgICAgXQogICAgICAgfSwKKyAgICAgICJUaGlhZ28gZGUgQmFy cm9zIExhY2VyZGEiIDogeworICAgICAgICAgImVtYWlscyIgOiBbCisgICAgICAgICAgICAidGhp YWdvLmxhY2VyZGFAb3BlbmJvc3NhLm9yZyIKKyAgICAgICAgIF0sCisgICAgICAgICAiZXhwZXJ0 aXNlIiA6ICJOaXggcG9ydCwgV2ViUlRDLCBNZWRpYVN0cmVhbSIsCisgICAgICAgICAibmlja3Mi IDogWworICAgICAgICAgICAgImxhY2VyZGEiCisgICAgICAgICBdCisgICAgICB9LAogICAgICAg IlRob21hcyBTZXBleiIgOiB7CiAgICAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICAgICJ0 c2VwZXpAY2hyb21pdW0ub3JnIgpAQCAtMzUyNiw3ICszNTI2LDcgQEAKICAgICAgICAgICAgICJw bGluc3MiCiAgICAgICAgICBdCiAgICAgICB9LAotICAgICAgIlBoaWxpcCBKXHUwMEU0Z2Vuc3Rl ZHQiIDogeworICAgICAgIlBoaWxpcCBKXHUwMGU0Z2Vuc3RlZHQiIDogewogICAgICAgICAgImVt YWlscyIgOiBbCiAgICAgICAgICAgICAicGhpbGlwakBvcGVyYS5jb20iCiAgICAgICAgICBdLApA QCAtMzU0OSwxMCArMzU0OSwxMCBAQAogICAgICAgfSwKICAgICAgICJSZWJlY2NhIEhhdWNrIiA6 IHsKICAgICAgICAgICJlbWFpbHMiIDogWwotICAgICAgICAgICAgICJyaGF1Y2tAYWRvYmUuY29t IgorICAgICAgICAgICAgInJoYXVja0BhZG9iZS5jb20iCiAgICAgICAgICBdLAogICAgICAgICAg Im5pY2tzIiA6IFsKLSAgICAgICAgICAgICAicmhhdWNrIgorICAgICAgICAgICAgInJoYXVjayIK ICAgICAgICAgIF0KICAgICAgIH0sCiAgICAgICAiUmlja3kgTW9uZGVsbG8iIDogewpAQCAtMzYx OSwxMSArMzYxOSw2IEBACiAgICAgICAgICAgICAid2ViY29tcG9uZW50cy1idWd6aWxsYUBjaHJv bWl1bS5vcmciCiAgICAgICAgICBdCiAgICAgICB9LAotICAgICAgIldlYktpdEdUSysgQnVncyIg OiB7Ci0gICAgICAgICAiZW1haWxzIiA6IFsKLSAgICAgICAgICAgICJidWdzLW5vcmVwbHlAd2Vi a2l0Z3RrLm9yZyIKLSAgICAgICAgIF0KLSAgICAgIH0sCiAgICAgICAiV2ViS2l0IFJldmlldyBC b3QiIDogewogICAgICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAgICAid2Via2l0LnJldmll dy5ib3RAZ21haWwuY29tIgpAQCAtMzYzMiw2ICszNjI3LDExIEBACiAgICAgICAgICAgICAic2hl cmlmZi1ib3QiCiAgICAgICAgICBdCiAgICAgICB9LAorICAgICAgIldlYktpdEdUSysgQnVncyIg OiB7CisgICAgICAgICAiZW1haWxzIiA6IFsKKyAgICAgICAgICAgICJidWdzLW5vcmVwbHlAd2Vi a2l0Z3RrLm9yZyIKKyAgICAgICAgIF0KKyAgICAgIH0sCiAgICAgICAiV3lhdHQgQ2Fyc3MiIDog ewogICAgICAgICAgImVtYWlscyIgOiBbCiAgICAgICAgICAgICAid2NhcnNzQGNocm9taXVtLm9y ZyIsCkBAIC0zODQ4LDYgKzM4NDgsMTUgQEAKICAgICAgICAgICAgICJlc3RlcyIKICAgICAgICAg IF0KICAgICAgIH0sCisgICAgICAiQW50b2luZSBRdWludCIgOiB7CisgICAgICAgICAiZW1haWxz IiA6IFsKKyAgICAgICAgICAgICJncmFvdXRzQGFwcGxlLmNvbSIsCisgICAgICAgICAgICAiZ3Jh b3V0c0B3ZWJraXQub3JnIgorICAgICAgICAgXSwKKyAgICAgICAgICJuaWNrcyIgOiBbCisgICAg ICAgICAgICAiZ3Jhb3V0cyIKKyAgICAgICAgIF0KKyAgICAgIH0sCiAgICAgICAiQW50b25pbyBH b21lcyIgOiB7CiAgICAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICAgICJ0b25pa2l0b29A d2Via2l0Lm9yZyIsCkBAIC0zODYwLDE1ICszODY5LDYgQEAKICAgICAgICAgICAgICJ0b25pa2l0 b28iCiAgICAgICAgICBdCiAgICAgICB9LAotICAgICAgIkFudG9pbmUgUXVpbnQiIDogewotICAg ICAgICAgImVtYWlscyIgOiBbCi0gICAgICAgICAgICAiZ3Jhb3V0c0BhcHBsZS5jb20iLAotICAg ICAgICAgICAgImdyYW91dHNAd2Via2l0Lm9yZyIKLSAgICAgICAgIF0sCi0gICAgICAgICAibmlj a3MiIDogWwotICAgICAgICAgICAgImdyYW91dHMiCi0gICAgICAgICBdCi0gICAgICB9LAogICAg ICAgIkFudHRpIEtvaXZpc3RvIiA6IHsKICAgICAgICAgICJlbWFpbHMiIDogWwogICAgICAgICAg ICAgImtvaXZpc3RvQGlraS5maSIsCkBAIC00Mjc1LDE0ICs0Mjc1LDYgQEAKICAgICAgICAgICAg ICJnZ2FyZW4iCiAgICAgICAgICBdCiAgICAgICB9LAotICAgICAgIk1hcmsgTGFtIiA6IHsKLSAg ICAgICAgICJlbWFpbHMiIDogWwotICAgICAgICAgICAgIm1hcmsubGFtQGFwcGxlLmNvbSIKLSAg ICAgICAgIF0sCi0gICAgICAgICAibmlja3MiIDogWwotICAgICAgICAgICAgIm1sYW0iCi0gICAg ICAgICBdCi0gICAgICB9LAogICAgICAgIkdlb3JnZSBTdGFpa29zIiA6IHsKICAgICAgICAgICJl bWFpbHMiIDogWwogICAgICAgICAgICAgInN0YWlrb3NAa2RlLm9yZyIsCkBAIC00NjU4LDYgKzQ2 NTAsMTQgQEAKICAgICAgICAgICAgICJtaGFobmVuYmVyZyIKICAgICAgICAgIF0KICAgICAgIH0s CisgICAgICAiTWFyayBMYW0iIDogeworICAgICAgICAgImVtYWlscyIgOiBbCisgICAgICAgICAg ICAibWFyay5sYW1AYXBwbGUuY29tIgorICAgICAgICAgXSwKKyAgICAgICAgICJuaWNrcyIgOiBb CisgICAgICAgICAgICAibWxhbSIKKyAgICAgICAgIF0KKyAgICAgIH0sCiAgICAgICAiTWFyayBS b3dlIiA6IHsKICAgICAgICAgICJlbWFpbHMiIDogWwogICAgICAgICAgICAgIm1yb3dlQGJkYXNo Lm5ldC5ueiIsCkBAIC00ODgzLDIzICs0ODgzLDIzIEBACiAgICAgICAgICAgICAicm5pd2EiCiAg ICAgICAgICBdCiAgICAgICB9LAotICAgICAgIlNhbSBXZWluaWciIDogeworICAgICAgIlNhYW0g QmFyYXRpIiA6IHsKICAgICAgICAgICJlbWFpbHMiIDogWwotICAgICAgICAgICAgInNhbUB3ZWJr aXQub3JnIiwKLSAgICAgICAgICAgICJ3ZWluaWdAYXBwbGUuY29tIgorICAgICAgICAgICAgInNi YXJhdGlAYXBwbGUuY29tIiwKKyAgICAgICAgICAgICJzYWFtYmFyYXRpMUBnbWFpbC5jb20iCiAg ICAgICAgICBdLAotICAgICAgICAgImV4cGVydGlzZSIgOiAiSFRNTCBET00sIENvcmUgRE9NLCBE T00gQmluZGluZ3MgKEphdmFTY3JpcHQsIE9iamVjdGl2ZS1DIGFuZCBDT00pLCBTZWN1cml0eSwg RHVtcFJlbmRlclRyZWUiLAogICAgICAgICAgIm5pY2tzIiA6IFsKLSAgICAgICAgICAgICJ3ZWlu aWciCisgICAgICAgICAgICAic2FhbXlqb29uIgogICAgICAgICAgXQogICAgICAgfSwKLSAgICAg ICJTYWFtIEJhcmF0aSIgOiB7CisgICAgICAiU2FtIFdlaW5pZyIgOiB7CiAgICAgICAgICAiZW1h aWxzIiA6IFsKLSAgICAgICAgICAgICJzYmFyYXRpQGFwcGxlLmNvbSIsCi0gICAgICAgICAgICAi c2FhbWJhcmF0aTFAZ21haWwuY29tIgorICAgICAgICAgICAgInNhbUB3ZWJraXQub3JnIiwKKyAg ICAgICAgICAgICJ3ZWluaWdAYXBwbGUuY29tIgogICAgICAgICAgXSwKKyAgICAgICAgICJleHBl cnRpc2UiIDogIkhUTUwgRE9NLCBDb3JlIERPTSwgRE9NIEJpbmRpbmdzIChKYXZhU2NyaXB0LCBP YmplY3RpdmUtQyBhbmQgQ09NKSwgU2VjdXJpdHksIER1bXBSZW5kZXJUcmVlIiwKICAgICAgICAg ICJuaWNrcyIgOiBbCi0gICAgICAgICAgICAic2FhbXlqb29uIgorICAgICAgICAgICAgIndlaW5p ZyIKICAgICAgICAgIF0KICAgICAgIH0sCiAgICAgICAiU2VyZ2lvIFZpbGxhciBTZW5pbiIgOiB7 CkBAIC00OTg3LDcgKzQ5ODcsNyBAQAogICAgICAgICAgICAgInNmYWxrZW4iCiAgICAgICAgICBd CiAgICAgICB9LAotICAgICAgIlN1a29sc2FrIFNha3NodXdvbmciOiB7CisgICAgICAiU3Vrb2xz YWsgU2Frc2h1d29uZyIgOiB7CiAgICAgICAgICAiZW1haWxzIiA6IFsKICAgICAgICAgICAgICJz dWtvbHNha0BnbWFpbC5jb20iLAogICAgICAgICAgICAgInNzYWtzaHV3b25nQGFwcGxlLmNvbSIK QEAgLTUxODYsNCArNTE4Niw0IEBACiAgICAgICAgICBdCiAgICAgICB9CiAgICB9Ci19Cit9Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9jaGVja2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2VyLnB5CmluZGV4IGI2NTE2NGNmMTc5ZDEzZTJkZGZkM2VjMGIxNGNiZjliYjA3MjhlNDkuLjYz ZTc4ZWZlYzg0YTk1ZmU2ODc5YWViMTg0NTUwZTQxNjdkYjBiM2QgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2NoZWNrZXIucHkKQEAgLTM4LDYgKzM4LDcgQEAgaW1wb3J0IHN5cwogCiBm cm9tIGNoZWNrZXJzLmNvbW1vbiBpbXBvcnQgY2F0ZWdvcmllcyBhcyBDb21tb25DYXRlZ29yaWVz CiBmcm9tIGNoZWNrZXJzLmNvbW1vbiBpbXBvcnQgQ2FycmlhZ2VSZXR1cm5DaGVja2VyCitmcm9t IGNoZWNrZXJzLmNvbnRyaWJ1dG9ycyBpbXBvcnQgQ29udHJpYnV0b3JzQ2hlY2tlcgogZnJvbSBj aGVja2Vycy5jaGFuZ2Vsb2cgaW1wb3J0IENoYW5nZUxvZ0NoZWNrZXIKIGZyb20gY2hlY2tlcnMu Y3BwIGltcG9ydCBDcHBDaGVja2VyCiBmcm9tIGNoZWNrZXJzLmNtYWtlIGltcG9ydCBDTWFrZUNo ZWNrZXIKQEAgLTYwNCw5ICs2MDUsMTIgQEAgY2xhc3MgQ2hlY2tlckRpc3BhdGNoZXIob2JqZWN0 KToKICAgICAgICAgICAgICAgICBjaGVja2VyID0gVGV4dENoZWNrZXIoZmlsZV9wYXRoLCBoYW5k bGVfc3R5bGVfZXJyb3IpCiAgICAgICAgIGVsaWYgZmlsZV90eXBlID09IEZpbGVUeXBlLkpTT046 CiAgICAgICAgICAgICBiYXNlbmFtZSA9IG9zLnBhdGguYmFzZW5hbWUoZmlsZV9wYXRoKQotICAg ICAgICAgICAgaWYgY29tbWl0X3F1ZXVlIGFuZCBiYXNlbmFtZSA9PSAnY29udHJpYnV0b3JzLmpz b24nOgotICAgICAgICAgICAgICAgIGNoZWNrZXIgPSBKU09OQ29udHJpYnV0b3JzQ2hlY2tlcihm aWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKLSAgICAgICAgICAgIGlmIGJhc2VuYW1lID09 ICdmZWF0dXJlcy5qc29uJzoKKyAgICAgICAgICAgIGlmIGJhc2VuYW1lID09ICdjb250cmlidXRv cnMuanNvbic6CisgICAgICAgICAgICAgICAgaWYgY29tbWl0X3F1ZXVlOgorICAgICAgICAgICAg ICAgICAgICBjaGVja2VyID0gSlNPTkNvbnRyaWJ1dG9yc0NoZWNrZXIoZmlsZV9wYXRoLCBoYW5k bGVfc3R5bGVfZXJyb3IpCisgICAgICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAg ICAgY2hlY2tlciA9IENvbnRyaWJ1dG9yc0NoZWNrZXIoZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVf ZXJyb3IpCisgICAgICAgICAgICBlbGlmIGJhc2VuYW1lID09ICdmZWF0dXJlcy5qc29uJzoKICAg ICAgICAgICAgICAgICBjaGVja2VyID0gSlNPTkZlYXR1cmVzQ2hlY2tlcihmaWxlX3BhdGgsIGhh bmRsZV9zdHlsZV9lcnJvcikKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgY2hl Y2tlciA9IEpTT05DaGVja2VyKGZpbGVfcGF0aCwgaGFuZGxlX3N0eWxlX2Vycm9yKQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jb250cmlidXRvcnMu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NvbnRyaWJ1dG9ycy5w eQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5mYzU1ZjNkMjg0MzJiNDM0ZjAwY2Y2OTZkNTYxMTE4ZDk2NWM5ODM2Ci0t LSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9j b250cmlidXRvcnMucHkKQEAgLTAsMCArMSw1NCBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMTYgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorIworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CisjIGFyZSBtZXQ6CisjIDEuICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorIyAyLiAgUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMg ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lciBpbiB0aGUKKyMgICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisjCisjIFRISVMgU09GVFdBUkUgSVMg UFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycgQU5E CisjIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFRIRSBJTVBMSUVECisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyMgRElTQ0xBSU1FRC4g SU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTIEJFIExJQUJM RSBGT1IKKyMgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IgQ09OU0VRVUVOVElBTAorIyBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUgorIyBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikg SE9XRVZFUgorIyBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVS IElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLAorIyBPUiBUT1JUIChJTkNMVURJTkcgTkVH TElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQor IyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgorCisiIiJDaGVja3MgV2ViS2l0IHN0eWxlIGZvciB0aGUgY29udHJpYnV0 b3JzLmpzb24gZmlsZS4iIiIKKworaW1wb3J0IGRpZmZsaWIKK2ltcG9ydCBqc29uCitpbXBvcnQg cmUKK2Zyb20gc2V0cyBpbXBvcnQgU2V0Citmcm9tIGpzb25jaGVja2VyIGltcG9ydCBKU09OQ2hl Y2tlcgorZnJvbSB3ZWJraXRweS5jb21tb24uY29uZmlnLmNvbW1pdHRlcnMgaW1wb3J0IENvbW1p dHRlckxpc3QKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBG aWxlU3lzdGVtCisKKworY2xhc3MgQ29udHJpYnV0b3JzQ2hlY2tlcihKU09OQ2hlY2tlcik6Cisg ICAgIiIiUHJvY2Vzc2VzIGNvbnRyaWJ1dG9ycy5qc29uIGxpbmVzIiIiCisKKyAgICBkZWYgX19p bml0X18oc2VsZiwgZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpOgorICAgICAgICBzdXBl cihDb250cmlidXRvcnNDaGVja2VyLCBzZWxmKS5fX2luaXRfXyhmaWxlX3BhdGgsIGhhbmRsZV9z dHlsZV9lcnJvcikKKyAgICAgICAgc2VsZi5fZmlsZV9wYXRoID0gZmlsZV9wYXRoCisKKyAgICBk ZWYgY2hlY2soc2VsZiwgbGluZXMpOgorICAgICAgICBzdXBlcihDb250cmlidXRvcnNDaGVja2Vy LCBzZWxmKS5jaGVjayhsaW5lcykKKyAgICAgICAgY2Fub25pY2FsaXplZCA9IENvbW1pdHRlckxp c3QoKS5hc19qc29uKCkKKyAgICAgICAgYWN0dWFsID0gRmlsZVN5c3RlbSgpLnJlYWRfdGV4dF9m aWxlKHNlbGYuX2ZpbGVfcGF0aCkKKyAgICAgICAgZGlmZiA9IHNlbGYuX3VuaWRpZmZfb3V0cHV0 KGFjdHVhbCwgY2Fub25pY2FsaXplZCkKKyAgICAgICAgaWYgZGlmZjoKKyAgICAgICAgICAgIHNl bGYuX2hhbmRsZV9zdHlsZV9lcnJvcigwLCAnanNvbi9zeW50YXgnLCA1LCAnY29udHJpYnV0b3Jz Lmpzb24gZGlmZmVycyBmcm9tIHRoZSBjYW5vbmljYWwgZm9ybWF0LiBVc2UgInZhbGlkYXRlLWNv bW1pdHRlci1saXN0cyAtLWNhbm9uaWNhbGl6ZSIgdG8gcmVmb3JtYXQgaXQuJykKKyAgICAgICAg ICAgIHByaW50IGRpZmYKKworICAgIGRlZiBfdW5pZGlmZl9vdXRwdXQoc2VsZiwgZXhwZWN0ZWQs IGFjdHVhbCk6CisgICAgICAgIGV4cGVjdGVkID0gZXhwZWN0ZWQuc3BsaXRsaW5lcygxKQorICAg ICAgICBhY3R1YWwgPSBhY3R1YWwuc3BsaXRsaW5lcygxKQorICAgICAgICBkaWZmID0gZGlmZmxp Yi51bmlmaWVkX2RpZmYoZXhwZWN0ZWQsIGFjdHVhbCkKKyAgICAgICAgcmV0dXJuICcnLmpvaW4o ZGlmZikK