58124 2011-04-08 02:11:02 -0700 Web Inspector: HAR compliance fixes 2011-05-13 06:48:18 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik webkit.review.bot yurys oldest_to_newest 382085 0 caseq 2011-04-08 02:11:02 -0700 Small batch of fixes for HAR standard compliance: - Always provide some values for queryString and cookies, even though arrays may be empty - Always provide an empty cache object - Added entire HARLog to test - Workaround in test to avoid custom expectations (favicon.ico appears in log on certain platforms) 382089 1 88784 caseq 2011-04-08 02:22:54 -0700 Created attachment 88784 patch 382095 2 88784 yurys 2011-04-08 02:27:44 -0700 Comment on attachment 88784 patch View in context: https://bugs.webkit.org/attachment.cgi?id=88784&action=review > Source/WebCore/inspector/front-end/HAREntry.js:48 > + cache: { }, // Not supproted yet. Please file a bug on this and add a FIXME here. 382108 3 caseq 2011-04-08 02:56:01 -0700 Added FIXME, filed bug 58127 for other missing fields. Manually committed r83275: http://trac.webkit.org/changeset/83275 382122 4 webkit.review.bot 2011-04-08 03:21:06 -0700 http://trac.webkit.org/changeset/83275 might have broken SnowLeopard Intel Release (Tests) The following tests are not passing: http/tests/inspector/resource-har-conversion.html http/tests/inspector/resource-parameters.html 88784 2011-04-08 02:22:54 -0700 2011-04-08 02:27:44 -0700 patch har-compliance.diff text/plain 23475 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkNmJhYTY5Li4wOWIyMTJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQt MDggIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBIQVIgY29t cGxpYW5jZSBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTgxMjQKKworICAgICAgICAtIEFkZGVkIGVudGlyZSBIQVJMb2cgdG8gdGVzdAorICAg ICAgICAtIFdvcmthcm91bmQgaW4gdGVzdCB0byBhdm9pZCBjdXN0b20gZXhwZWN0YXRpb25zIChm YXZpY29uLmljbyBhcHBlYXJzIGluIGxvZyBvbiBjZXJ0YWluIHBsYXRmb3JtcworCisgICAgICAg ICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24tZXhwZWN0ZWQu dHh0OgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLWhhci1jb252ZXJz aW9uLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzLXRlc3Qu anM6CisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMi9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNv dXJjZS1oYXItY29udmVyc2lvbi1leHBlY3RlZC50eHQ6IFJlbW92ZWQuCisKIDIwMTEtMDQtMDgg IENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIEFk ZCBwbGF0Zm9ybSBzcGVjaWZpYyBleHBlY3RlZCBmaWxlIGFmdGVyIHI4MzIzNS4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLWhhci1jb252ZXJz aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291 cmNlLWhhci1jb252ZXJzaW9uLWV4cGVjdGVkLnR4dAppbmRleCA1MTJjYjlkLi4zYTRlMzc2IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS1oYXIt Y29udmVyc2lvbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNw ZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24tZXhwZWN0ZWQudHh0CkBAIC0yLDE2NyArMiwx ODUgQEAgVGVzdHMgY29udmVyc2lvbiBvZiBJbnNwZWN0b3IncyByZXNvdXJjZSByZXByZXNlbnRh dGlvbiBpbnRvIEhBUiBmb3JtYXQuCiAKIFBhZ2UgcmVsb2FkZWQuCiB7Ci0gICAgMCA6IHsKLSAg ICAgICAgcGFnZXJlZiA6ICJodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL3Jlc291cmNl LWhhci1jb252ZXJzaW9uLmh0bWwiCi0gICAgICAgIHN0YXJ0ZWREYXRlVGltZSA6IDxvYmplY3Q+ Ci0gICAgICAgIHRpbWUgOiA8bnVtYmVyPgotICAgICAgICByZXF1ZXN0IDogewotICAgICAgICAg ICAgbWV0aG9kIDogIkdFVCIKLSAgICAgICAgICAgIHVybCA6ICJodHRwOi8vMTI3LjAuMC4xOjgw MDAvaW5zcGVjdG9yL2luc3BlY3Rvci10ZXN0LmpzIgotICAgICAgICAgICAgaGVhZGVycyA6IDxv YmplY3Q+Ci0gICAgICAgICAgICBoZWFkZXJzU2l6ZSA6IC0xCi0gICAgICAgICAgICBib2R5U2l6 ZSA6IDxudW1iZXI+Ci0gICAgICAgICAgICBjb29raWVzIDogewotICAgICAgICAgICAgICAgIDAg OiB7Ci0gICAgICAgICAgICAgICAgICAgIG5hbWUgOiAiYSIKLSAgICAgICAgICAgICAgICAgICAg dmFsdWUgOiAiYiIKLSAgICAgICAgICAgICAgICAgICAgcGF0aCA6ICIvcGF0aCIKLSAgICAgICAg ICAgICAgICAgICAgZG9tYWluIDogImV4YW1wbGUuY29tIgotICAgICAgICAgICAgICAgICAgICBl eHBpcmVzIDogbnVsbAotICAgICAgICAgICAgICAgICAgICBodHRwT25seSA6IGZhbHNlCi0gICAg ICAgICAgICAgICAgICAgIHNlY3VyZSA6IGZhbHNlCisgICAgdmVyc2lvbiA6IDxzdHJpbmc+Cisg ICAgY3JlYXRvciA6IHsKKyAgICAgICAgbmFtZSA6ICJXZWJJbnNwZWN0b3IiCisgICAgICAgIHZl cnNpb24gOiA8c3RyaW5nPgorICAgIH0KKyAgICBwYWdlcyA6IHsKKyAgICAgICAgMCA6IHsKKyAg ICAgICAgICAgIHN0YXJ0ZWREYXRlVGltZSA6IDxvYmplY3Q+CisgICAgICAgICAgICBpZCA6IDxz dHJpbmc+CisgICAgICAgICAgICB0aXRsZSA6ICIiCisgICAgICAgICAgICBwYWdlVGltaW5ncyA6 IHsKKyAgICAgICAgICAgICAgICBvbkNvbnRlbnRMb2FkIDogPG51bWJlcj4KKyAgICAgICAgICAg ICAgICBvbkxvYWQgOiA8bnVtYmVyPgorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQor ICAgIGVudHJpZXMgOiB7CisgICAgICAgIDAgOiB7CisgICAgICAgICAgICBwYWdlcmVmIDogImh0 dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRt bCIKKyAgICAgICAgICAgIHN0YXJ0ZWREYXRlVGltZSA6IDxvYmplY3Q+CisgICAgICAgICAgICB0 aW1lIDogPG51bWJlcj4KKyAgICAgICAgICAgIHJlcXVlc3QgOiB7CisgICAgICAgICAgICAgICAg bWV0aG9kIDogIkdFVCIKKyAgICAgICAgICAgICAgICB1cmwgOiAiaHR0cDovLzEyNy4wLjAuMTo4 MDAwL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVzdC5qcyIKKyAgICAgICAgICAgICAgICBoZWFkZXJz IDogPG9iamVjdD4KKyAgICAgICAgICAgICAgICBoZWFkZXJzU2l6ZSA6IC0xCisgICAgICAgICAg ICAgICAgYm9keVNpemUgOiA8bnVtYmVyPgorICAgICAgICAgICAgICAgIGNvb2tpZXMgOiB7Cisg ICAgICAgICAgICAgICAgICAgIDAgOiB7CisgICAgICAgICAgICAgICAgICAgICAgICBuYW1lIDog ImEiCisgICAgICAgICAgICAgICAgICAgICAgICB2YWx1ZSA6ICJiIgorICAgICAgICAgICAgICAg ICAgICAgICAgcGF0aCA6ICIvcGF0aCIKKyAgICAgICAgICAgICAgICAgICAgICAgIGRvbWFpbiA6 ICJleGFtcGxlLmNvbSIKKyAgICAgICAgICAgICAgICAgICAgICAgIGV4cGlyZXMgOiBudWxsCisg ICAgICAgICAgICAgICAgICAgICAgICBodHRwT25seSA6IGZhbHNlCisgICAgICAgICAgICAgICAg ICAgICAgICBzZWN1cmUgOiBmYWxzZQorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgICAgIDEgOiB7CisgICAgICAgICAgICAgICAgICAgICAgICBuYW1lIDogImExIgorICAg ICAgICAgICAgICAgICAgICAgICAgdmFsdWUgOiAiYjEiCisgICAgICAgICAgICAgICAgICAgICAg ICBwYXRoIDogdW5kZWZpbmVkCisgICAgICAgICAgICAgICAgICAgICAgICBkb21haW4gOiB1bmRl ZmluZWQKKyAgICAgICAgICAgICAgICAgICAgICAgIGV4cGlyZXMgOiBudWxsCisgICAgICAgICAg ICAgICAgICAgICAgICBodHRwT25seSA6IGZhbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBz ZWN1cmUgOiBmYWxzZQorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAg IDIgOiB7CisgICAgICAgICAgICAgICAgICAgICAgICBuYW1lIDogImMxIgorICAgICAgICAgICAg ICAgICAgICAgICAgdmFsdWUgOiAiZDEiCisgICAgICAgICAgICAgICAgICAgICAgICBwYXRoIDog dW5kZWZpbmVkCisgICAgICAgICAgICAgICAgICAgICAgICBkb21haW4gOiB1bmRlZmluZWQKKyAg ICAgICAgICAgICAgICAgICAgICAgIGV4cGlyZXMgOiBudWxsCisgICAgICAgICAgICAgICAgICAg ICAgICBodHRwT25seSA6IGZhbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBzZWN1cmUgOiBm YWxzZQorICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAg ICAgICAgIDEgOiB7Ci0gICAgICAgICAgICAgICAgICAgIG5hbWUgOiAiYTEiCi0gICAgICAgICAg ICAgICAgICAgIHZhbHVlIDogImIxIgotICAgICAgICAgICAgICAgICAgICBwYXRoIDogdW5kZWZp bmVkCi0gICAgICAgICAgICAgICAgICAgIGRvbWFpbiA6IHVuZGVmaW5lZAotICAgICAgICAgICAg ICAgICAgICBleHBpcmVzIDogbnVsbAotICAgICAgICAgICAgICAgICAgICBodHRwT25seSA6IGZh bHNlCi0gICAgICAgICAgICAgICAgICAgIHNlY3VyZSA6IGZhbHNlCisgICAgICAgICAgICB9Cisg ICAgICAgICAgICByZXNwb25zZSA6IHsKKyAgICAgICAgICAgICAgICBzdGF0dXMgOiAzMDQKKyAg ICAgICAgICAgICAgICBzdGF0dXNUZXh0IDogIk5vdCBNb2RpZmllZCIKKyAgICAgICAgICAgICAg ICBoZWFkZXJzIDogPG9iamVjdD4KKyAgICAgICAgICAgICAgICBjb250ZW50IDogeworICAgICAg ICAgICAgICAgICAgICBzaXplIDogPG51bWJlcj4KKyAgICAgICAgICAgICAgICAgICAgbWltZVR5 cGUgOiAiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0IgogICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgICAgICAyIDogewotICAgICAgICAgICAgICAgICAgICBuYW1lIDogImMxIgotICAgICAg ICAgICAgICAgICAgICB2YWx1ZSA6ICJkMSIKLSAgICAgICAgICAgICAgICAgICAgcGF0aCA6IHVu ZGVmaW5lZAotICAgICAgICAgICAgICAgICAgICBkb21haW4gOiB1bmRlZmluZWQKLSAgICAgICAg ICAgICAgICAgICAgZXhwaXJlcyA6IG51bGwKLSAgICAgICAgICAgICAgICAgICAgaHR0cE9ubHkg OiBmYWxzZQotICAgICAgICAgICAgICAgICAgICBzZWN1cmUgOiBmYWxzZQorICAgICAgICAgICAg ICAgIHJlZGlyZWN0VVJMIDogIiIKKyAgICAgICAgICAgICAgICBoZWFkZXJzU2l6ZSA6IC0xCisg ICAgICAgICAgICAgICAgYm9keVNpemUgOiA8bnVtYmVyPgorICAgICAgICAgICAgICAgIGNvb2tp ZXMgOiB7CisgICAgICAgICAgICAgICAgICAgIDAgOiB7CisgICAgICAgICAgICAgICAgICAgICAg ICBuYW1lIDogIngiCisgICAgICAgICAgICAgICAgICAgICAgICB2YWx1ZSA6ICJ5IgorICAgICAg ICAgICAgICAgICAgICAgICAgcGF0aCA6ICIvcGF0aCIKKyAgICAgICAgICAgICAgICAgICAgICAg IGRvbWFpbiA6ICJleGFtcGxlLmNvbSIKKyAgICAgICAgICAgICAgICAgICAgICAgIGV4cGlyZXMg OiBudWxsCisgICAgICAgICAgICAgICAgICAgICAgICBodHRwT25seSA6IHRydWUKKyAgICAgICAg ICAgICAgICAgICAgICAgIHNlY3VyZSA6IHRydWUKKyAgICAgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgICAgICAxIDogeworICAgICAgICAgICAgICAgICAgICAgICAgbmFtZSA6ICJ4 MSIKKyAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVlIDogInkxIgorICAgICAgICAgICAgICAg ICAgICAgICAgcGF0aCA6IHVuZGVmaW5lZAorICAgICAgICAgICAgICAgICAgICAgICAgZG9tYWlu IDogdW5kZWZpbmVkCisgICAgICAgICAgICAgICAgICAgICAgICBleHBpcmVzIDogbnVsbAorICAg ICAgICAgICAgICAgICAgICAgICAgaHR0cE9ubHkgOiBmYWxzZQorICAgICAgICAgICAgICAgICAg ICAgICAgc2VjdXJlIDogZmFsc2UKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgICAgICAyIDogeworICAgICAgICAgICAgICAgICAgICAgICAgbmFtZSA6ICJ6MiIKKyAgICAg ICAgICAgICAgICAgICAgICAgIHZhbHVlIDogInkyIgorICAgICAgICAgICAgICAgICAgICAgICAg cGF0aCA6IHVuZGVmaW5lZAorICAgICAgICAgICAgICAgICAgICAgICAgZG9tYWluIDogdW5kZWZp bmVkCisgICAgICAgICAgICAgICAgICAgICAgICBleHBpcmVzIDogbnVsbAorICAgICAgICAgICAg ICAgICAgICAgICAgaHR0cE9ubHkgOiBmYWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgc2Vj dXJlIDogZmFsc2UKKyAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIHRpbWluZ3MgOiA8b2JqZWN0PgogICAgICAgICB9Ci0g ICAgICAgIHJlc3BvbnNlIDogewotICAgICAgICAgICAgc3RhdHVzIDogMzA0Ci0gICAgICAgICAg ICBzdGF0dXNUZXh0IDogIk5vdCBNb2RpZmllZCIKLSAgICAgICAgICAgIGhlYWRlcnMgOiA8b2Jq ZWN0PgotICAgICAgICAgICAgY29udGVudCA6IHsKLSAgICAgICAgICAgICAgICBzaXplIDogPG51 bWJlcj4KLSAgICAgICAgICAgICAgICBtaW1lVHlwZSA6ICJhcHBsaWNhdGlvbi94LWphdmFzY3Jp cHQiCisgICAgICAgIDEgOiB7CisgICAgICAgICAgICBwYWdlcmVmIDogImh0dHA6Ly8xMjcuMC4w LjE6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRtbCIKKyAgICAgICAg ICAgIHN0YXJ0ZWREYXRlVGltZSA6IDxvYmplY3Q+CisgICAgICAgICAgICB0aW1lIDogPG51bWJl cj4KKyAgICAgICAgICAgIHJlcXVlc3QgOiB7CisgICAgICAgICAgICAgICAgbWV0aG9kIDogIkdF VCIKKyAgICAgICAgICAgICAgICB1cmwgOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rv ci9yZXNvdXJjZS1oYXItY29udmVyc2lvbi5odG1sIgorICAgICAgICAgICAgICAgIGhlYWRlcnMg OiA8b2JqZWN0PgorICAgICAgICAgICAgICAgIGhlYWRlcnNTaXplIDogLTEKKyAgICAgICAgICAg ICAgICBib2R5U2l6ZSA6IDxudW1iZXI+CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICByZWRp cmVjdFVSTCA6ICIiCi0gICAgICAgICAgICBoZWFkZXJzU2l6ZSA6IC0xCi0gICAgICAgICAgICBi b2R5U2l6ZSA6IDxudW1iZXI+Ci0gICAgICAgICAgICBjb29raWVzIDogewotICAgICAgICAgICAg ICAgIDAgOiB7Ci0gICAgICAgICAgICAgICAgICAgIG5hbWUgOiAieCIKLSAgICAgICAgICAgICAg ICAgICAgdmFsdWUgOiAieSIKLSAgICAgICAgICAgICAgICAgICAgcGF0aCA6ICIvcGF0aCIKLSAg ICAgICAgICAgICAgICAgICAgZG9tYWluIDogImV4YW1wbGUuY29tIgotICAgICAgICAgICAgICAg ICAgICBleHBpcmVzIDogbnVsbAotICAgICAgICAgICAgICAgICAgICBodHRwT25seSA6IHRydWUK LSAgICAgICAgICAgICAgICAgICAgc2VjdXJlIDogdHJ1ZQotICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgICAgICAxIDogewotICAgICAgICAgICAgICAgICAgICBuYW1lIDogIngxIgotICAg ICAgICAgICAgICAgICAgICB2YWx1ZSA6ICJ5MSIKLSAgICAgICAgICAgICAgICAgICAgcGF0aCA6 IHVuZGVmaW5lZAotICAgICAgICAgICAgICAgICAgICBkb21haW4gOiB1bmRlZmluZWQKLSAgICAg ICAgICAgICAgICAgICAgZXhwaXJlcyA6IG51bGwKLSAgICAgICAgICAgICAgICAgICAgaHR0cE9u bHkgOiBmYWxzZQotICAgICAgICAgICAgICAgICAgICBzZWN1cmUgOiBmYWxzZQotICAgICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgICAgICAyIDogewotICAgICAgICAgICAgICAgICAgICBuYW1l IDogInoyIgotICAgICAgICAgICAgICAgICAgICB2YWx1ZSA6ICJ5MiIKLSAgICAgICAgICAgICAg ICAgICAgcGF0aCA6IHVuZGVmaW5lZAotICAgICAgICAgICAgICAgICAgICBkb21haW4gOiB1bmRl ZmluZWQKLSAgICAgICAgICAgICAgICAgICAgZXhwaXJlcyA6IG51bGwKLSAgICAgICAgICAgICAg ICAgICAgaHR0cE9ubHkgOiBmYWxzZQotICAgICAgICAgICAgICAgICAgICBzZWN1cmUgOiBmYWxz ZQorICAgICAgICAgICAgcmVzcG9uc2UgOiB7CisgICAgICAgICAgICAgICAgc3RhdHVzIDogMjAw CisgICAgICAgICAgICAgICAgc3RhdHVzVGV4dCA6ICJPSyIKKyAgICAgICAgICAgICAgICBoZWFk ZXJzIDogPG9iamVjdD4KKyAgICAgICAgICAgICAgICBjb250ZW50IDogeworICAgICAgICAgICAg ICAgICAgICBzaXplIDogPG51bWJlcj4KKyAgICAgICAgICAgICAgICAgICAgbWltZVR5cGUgOiAi dGV4dC9odG1sIgogICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICByZWRpcmVjdFVS TCA6ICIiCisgICAgICAgICAgICAgICAgaGVhZGVyc1NpemUgOiAtMQorICAgICAgICAgICAgICAg IGJvZHlTaXplIDogPG51bWJlcj4KICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHRpbWluZ3Mg OiA8b2JqZWN0PgogICAgICAgICB9Ci0gICAgICAgIHRpbWluZ3MgOiA8b2JqZWN0PgotICAgIH0K LSAgICAxIDogewotICAgICAgICBwYWdlcmVmIDogImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNw ZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRtbCIKLSAgICAgICAgc3RhcnRlZERhdGVU aW1lIDogPG9iamVjdD4KLSAgICAgICAgdGltZSA6IDxudW1iZXI+Ci0gICAgICAgIHJlcXVlc3Qg OiB7Ci0gICAgICAgICAgICBtZXRob2QgOiAiR0VUIgotICAgICAgICAgICAgdXJsIDogImh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRtbCIK LSAgICAgICAgICAgIGhlYWRlcnMgOiA8b2JqZWN0PgotICAgICAgICAgICAgaGVhZGVyc1NpemUg OiAtMQotICAgICAgICAgICAgYm9keVNpemUgOiA8bnVtYmVyPgotICAgICAgICB9Ci0gICAgICAg IHJlc3BvbnNlIDogewotICAgICAgICAgICAgc3RhdHVzIDogMjAwCi0gICAgICAgICAgICBzdGF0 dXNUZXh0IDogIk9LIgotICAgICAgICAgICAgaGVhZGVycyA6IDxvYmplY3Q+Ci0gICAgICAgICAg ICBjb250ZW50IDogewotICAgICAgICAgICAgICAgIHNpemUgOiA8bnVtYmVyPgotICAgICAgICAg ICAgICAgIG1pbWVUeXBlIDogInRleHQvaHRtbCIKKyAgICAgICAgMiA6IHsKKyAgICAgICAgICAg IHBhZ2VyZWYgOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rvci9yZXNvdXJjZS1oYXIt Y29udmVyc2lvbi5odG1sIgorICAgICAgICAgICAgc3RhcnRlZERhdGVUaW1lIDogPG9iamVjdD4K KyAgICAgICAgICAgIHRpbWUgOiA8bnVtYmVyPgorICAgICAgICAgICAgcmVxdWVzdCA6IHsKKyAg ICAgICAgICAgICAgICBtZXRob2QgOiAiR0VUIgorICAgICAgICAgICAgICAgIHVybCA6ICJodHRw Oi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL3Jlc291cmNlcy10ZXN0LmpzIgorICAgICAgICAg ICAgICAgIGhlYWRlcnMgOiA8b2JqZWN0PgorICAgICAgICAgICAgICAgIGhlYWRlcnNTaXplIDog LTEKKyAgICAgICAgICAgICAgICBib2R5U2l6ZSA6IDxudW1iZXI+CiAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICByZWRpcmVjdFVSTCA6ICIiCi0gICAgICAgICAgICBoZWFkZXJzU2l6ZSA6IC0x Ci0gICAgICAgICAgICBib2R5U2l6ZSA6IDxudW1iZXI+Ci0gICAgICAgIH0KLSAgICAgICAgdGlt aW5ncyA6IDxvYmplY3Q+Ci0gICAgfQotICAgIDIgOiB7Ci0gICAgICAgIHBhZ2VyZWYgOiAiaHR0 cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rvci9yZXNvdXJjZS1oYXItY29udmVyc2lvbi5odG1s IgotICAgICAgICBzdGFydGVkRGF0ZVRpbWUgOiA8b2JqZWN0PgotICAgICAgICB0aW1lIDogPG51 bWJlcj4KLSAgICAgICAgcmVxdWVzdCA6IHsKLSAgICAgICAgICAgIG1ldGhvZCA6ICJHRVQiCi0g ICAgICAgICAgICB1cmwgOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rvci9yZXNvdXJj ZXMtdGVzdC5qcyIKLSAgICAgICAgICAgIGhlYWRlcnMgOiA8b2JqZWN0PgotICAgICAgICAgICAg aGVhZGVyc1NpemUgOiAtMQotICAgICAgICAgICAgYm9keVNpemUgOiA8bnVtYmVyPgotICAgICAg ICB9Ci0gICAgICAgIHJlc3BvbnNlIDogewotICAgICAgICAgICAgc3RhdHVzIDogMzA0Ci0gICAg ICAgICAgICBzdGF0dXNUZXh0IDogIk5vdCBNb2RpZmllZCIKLSAgICAgICAgICAgIGhlYWRlcnMg OiA8b2JqZWN0PgotICAgICAgICAgICAgY29udGVudCA6IHsKLSAgICAgICAgICAgICAgICBzaXpl IDogPG51bWJlcj4KLSAgICAgICAgICAgICAgICBtaW1lVHlwZSA6ICJhcHBsaWNhdGlvbi94LWph dmFzY3JpcHQiCisgICAgICAgICAgICByZXNwb25zZSA6IHsKKyAgICAgICAgICAgICAgICBzdGF0 dXMgOiAzMDQKKyAgICAgICAgICAgICAgICBzdGF0dXNUZXh0IDogIk5vdCBNb2RpZmllZCIKKyAg ICAgICAgICAgICAgICBoZWFkZXJzIDogPG9iamVjdD4KKyAgICAgICAgICAgICAgICBjb250ZW50 IDogeworICAgICAgICAgICAgICAgICAgICBzaXplIDogPG51bWJlcj4KKyAgICAgICAgICAgICAg ICAgICAgbWltZVR5cGUgOiAiYXBwbGljYXRpb24veC1qYXZhc2NyaXB0IgorICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICByZWRpcmVjdFVSTCA6ICIiCisgICAgICAgICAgICAgICAg aGVhZGVyc1NpemUgOiAtMQorICAgICAgICAgICAgICAgIGJvZHlTaXplIDogPG51bWJlcj4KICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgIHJlZGlyZWN0VVJMIDogIiIKLSAgICAgICAgICAgIGhl YWRlcnNTaXplIDogLTEKLSAgICAgICAgICAgIGJvZHlTaXplIDogPG51bWJlcj4KKyAgICAgICAg ICAgIHRpbWluZ3MgOiA8b2JqZWN0PgogICAgICAgICB9Ci0gICAgICAgIHRpbWluZ3MgOiA8b2Jq ZWN0PgotICAgIH0KLSAgICAzIDogewotICAgICAgICBwYWdlcmVmIDogImh0dHA6Ly8xMjcuMC4w LjE6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRtbCIKLSAgICAgICAg c3RhcnRlZERhdGVUaW1lIDogPG9iamVjdD4KLSAgICAgICAgdGltZSA6IDxudW1iZXI+Ci0gICAg ICAgIHJlcXVlc3QgOiB7Ci0gICAgICAgICAgICBtZXRob2QgOiAiUE9TVCIKLSAgICAgICAgICAg IHVybCA6ICJodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL3Jlc291cmNlcy9wb3N0LXRh cmdldC5jZ2kiCi0gICAgICAgICAgICBoZWFkZXJzIDogPG9iamVjdD4KLSAgICAgICAgICAgIGhl YWRlcnNTaXplIDogLTEKLSAgICAgICAgICAgIGJvZHlTaXplIDogPG51bWJlcj4KLSAgICAgICAg ICAgIHBvc3REYXRhIDogewotICAgICAgICAgICAgICAgIG1pbWVUeXBlIDogInRleHQveG1sIgot ICAgICAgICAgICAgICAgIHRleHQgOiAiPHhtbD48L3htbD4iCisgICAgICAgIDMgOiB7CisgICAg ICAgICAgICBwYWdlcmVmIDogImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvcmVzb3Vy Y2UtaGFyLWNvbnZlcnNpb24uaHRtbCIKKyAgICAgICAgICAgIHN0YXJ0ZWREYXRlVGltZSA6IDxv YmplY3Q+CisgICAgICAgICAgICB0aW1lIDogPG51bWJlcj4KKyAgICAgICAgICAgIHJlcXVlc3Qg OiB7CisgICAgICAgICAgICAgICAgbWV0aG9kIDogIlBPU1QiCisgICAgICAgICAgICAgICAgdXJs IDogImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2VzL3Bvc3QtdGFyZ2V0 LmNnaSIKKyAgICAgICAgICAgICAgICBoZWFkZXJzIDogPG9iamVjdD4KKyAgICAgICAgICAgICAg ICBoZWFkZXJzU2l6ZSA6IC0xCisgICAgICAgICAgICAgICAgYm9keVNpemUgOiA8bnVtYmVyPgor ICAgICAgICAgICAgICAgIHBvc3REYXRhIDogeworICAgICAgICAgICAgICAgICAgICBtaW1lVHlw ZSA6ICJ0ZXh0L3htbCIKKyAgICAgICAgICAgICAgICAgICAgdGV4dCA6ICI8eG1sPjwveG1sPiIK KyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgcmVz cG9uc2UgOiB7Ci0gICAgICAgICAgICBzdGF0dXMgOiAyMDAKLSAgICAgICAgICAgIHN0YXR1c1Rl eHQgOiAiT0siCi0gICAgICAgICAgICBoZWFkZXJzIDogPG9iamVjdD4KLSAgICAgICAgICAgIGNv bnRlbnQgOiB7Ci0gICAgICAgICAgICAgICAgc2l6ZSA6IDxudW1iZXI+Ci0gICAgICAgICAgICAg ICAgbWltZVR5cGUgOiAiYXBwbGljYXRpb24veG1sIgorICAgICAgICAgICAgcmVzcG9uc2UgOiB7 CisgICAgICAgICAgICAgICAgc3RhdHVzIDogMjAwCisgICAgICAgICAgICAgICAgc3RhdHVzVGV4 dCA6ICJPSyIKKyAgICAgICAgICAgICAgICBoZWFkZXJzIDogPG9iamVjdD4KKyAgICAgICAgICAg ICAgICBjb250ZW50IDogeworICAgICAgICAgICAgICAgICAgICBzaXplIDogPG51bWJlcj4KKyAg ICAgICAgICAgICAgICAgICAgbWltZVR5cGUgOiAiYXBwbGljYXRpb24veG1sIgorICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICByZWRpcmVjdFVSTCA6ICIiCisgICAgICAgICAgICAg ICAgaGVhZGVyc1NpemUgOiAtMQorICAgICAgICAgICAgICAgIGJvZHlTaXplIDogPG51bWJlcj4K ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJlZGlyZWN0VVJMIDogIiIKLSAgICAgICAgICAg IGhlYWRlcnNTaXplIDogLTEKLSAgICAgICAgICAgIGJvZHlTaXplIDogPG51bWJlcj4KKyAgICAg ICAgICAgIHRpbWluZ3MgOiA8b2JqZWN0PgogICAgICAgICB9Ci0gICAgICAgIHRpbWluZ3MgOiA8 b2JqZWN0PgogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRtbCBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLWhhci1jb252ZXJzaW9uLmh0bWwKaW5kZXggZDA2Yzli MS4uNmVjYjU1MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Iv cmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2luc3BlY3Rvci9yZXNvdXJjZS1oYXItY29udmVyc2lvbi5odG1sCkBAIC00Myw5ICs0MywxNCBA QCB2YXIgdGVzdCA9IGZ1bmN0aW9uKCkKICAgICAgICAgfQogCiAgICAgICAgIGFkZENvb2tpZUhl YWRlcnNUb1Jlc291cmNlKGZpbmRSZXNvdXJjZUJ5VVJMKC9pbnNwZWN0b3ItdGVzdFwuanMkLykp OwotICAgICAgICB2YXIgZW50cmllcyA9IChuZXcgV2ViSW5zcGVjdG9yLkhBUkxvZygpKS5idWls ZCgpLmVudHJpZXM7Ci0gICAgICAgIGVudHJpZXMuc29ydChJbnNwZWN0b3JUZXN0LnJlc291cmNl VVJMQ29tcGFyZXIpOwotICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZE9iamVjdChlbnRyaWVzLCBJ bnNwZWN0b3JUZXN0LkhBUk5vbmRldGVybWluaXN0aWNQcm9wZXJ0aWVzV2l0aFNpemUpOworICAg ICAgICB2YXIgbG9nID0gKG5ldyBXZWJJbnNwZWN0b3IuSEFSTG9nKCkpLmJ1aWxkKCk7CisgICAg ICAgIC8vIEZpbHRlciBvdXQgZmF2aWNvbi5pY28gcmVxdWVzdHMgdGhhdCBvbmx5IGFwcGVhciBv biBjZXJ0YWluIHBsYXRmb3Jtcy4KKyAgICAgICAgbG9nLmVudHJpZXMgPSBsb2cuZW50cmllcy5m aWx0ZXIoZnVuY3Rpb24oZW50cnkpIHsKKyAgICAgICAgICAgIHJldHVybiAhL2Zhdmljb25cLmlj byQvLnRlc3QoZW50cnkucmVxdWVzdC51cmwpOworICAgICAgICB9KTsKKyAgICAgICAgbG9nLmVu dHJpZXMuc29ydChJbnNwZWN0b3JUZXN0LnJlc291cmNlVVJMQ29tcGFyZXIpOworICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZE9iamVjdChsb2csIEluc3BlY3RvclRlc3QuSEFSTm9uZGV0ZXJtaW5p c3RpY1Byb3BlcnRpZXNXaXRoU2l6ZSk7CisgICAgICAgIHZhciBwYWdlVGltaW5ncyA9IGxvZy5w YWdlc1swXS5wYWdlVGltaW5nczsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3Qo KTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9yZXNvdXJjZXMtdGVzdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jl c291cmNlcy10ZXN0LmpzCmluZGV4IGUwNmNjZjcuLjkwNTQ0OTIgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy10ZXN0LmpzCisrKyBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy10ZXN0LmpzCkBAIC03LDYgKzcs MTEgQEAgSW5zcGVjdG9yVGVzdC5IQVJOb25kZXRlcm1pbmlzdGljUHJvcGVydGllcyA9IHsKICAg ICByZWNlaXZlOiAxLAogICAgIGhlYWRlcnM6IDEsCiAgICAgdGltaW5nczogMSwKKyAgICB2ZXJz aW9uOiAxLAorICAgIHN0YXJ0ZWREYXRlVGltZTogMSwKKyAgICBpZDogMSwKKyAgICBvbkNvbnRl bnRMb2FkOiAxLAorICAgIG9uTG9hZDogMQogfTsKIAogLy8gYWRkT2JqZWN0IGNoZWNrcyBvd24g cHJvcGVydGllcyBvbmx5LCBzbyBtYWtlIGEgZGVlcCBjb3B5IHJhdGhlciB0aGFuIHVzZSBwcm90 b3R5cGUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL2h0dHAvdGVz dHMvaW5zcGVjdG9yL3Jlc291cmNlLWhhci1jb252ZXJzaW9uLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy13azIvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtaGFy LWNvbnZlcnNpb24tZXhwZWN0ZWQudHh0CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA0 NzZmZGZkLi4wMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvaHR0cC90 ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24tZXhwZWN0ZWQudHh0CisrKyAv ZGV2L251bGwKQEAgLTEsMTkzICswLDAgQEAKLVRlc3RzIGNvbnZlcnNpb24gb2YgSW5zcGVjdG9y J3MgcmVzb3VyY2UgcmVwcmVzZW50YXRpb24gaW50byBIQVIgZm9ybWF0LgotCi1QYWdlIHJlbG9h ZGVkLgotewotICAgIDAgOiB7Ci0gICAgICAgIHBhZ2VyZWYgOiAiaHR0cDovLzEyNy4wLjAuMTo4 MDAwL2luc3BlY3Rvci9yZXNvdXJjZS1oYXItY29udmVyc2lvbi5odG1sIgotICAgICAgICBzdGFy dGVkRGF0ZVRpbWUgOiA8b2JqZWN0PgotICAgICAgICB0aW1lIDogPG51bWJlcj4KLSAgICAgICAg cmVxdWVzdCA6IHsKLSAgICAgICAgICAgIG1ldGhvZCA6ICJHRVQiCi0gICAgICAgICAgICB1cmwg OiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwL2Zhdmljb24uaWNvIgotICAgICAgICAgICAgaGVhZGVy cyA6IDxvYmplY3Q+Ci0gICAgICAgICAgICBoZWFkZXJzU2l6ZSA6IC0xCi0gICAgICAgICAgICBi b2R5U2l6ZSA6IDxudW1iZXI+Ci0gICAgICAgIH0KLSAgICAgICAgcmVzcG9uc2UgOiB7Ci0gICAg ICAgICAgICBzdGF0dXMgOiAyMDAKLSAgICAgICAgICAgIHN0YXR1c1RleHQgOiAiT0siCi0gICAg ICAgICAgICBoZWFkZXJzIDogPG9iamVjdD4KLSAgICAgICAgICAgIGNvbnRlbnQgOiB7Ci0gICAg ICAgICAgICAgICAgc2l6ZSA6IDxudW1iZXI+Ci0gICAgICAgICAgICAgICAgbWltZVR5cGUgOiAi aW1hZ2UveC1pY29uIgotICAgICAgICAgICAgfQotICAgICAgICAgICAgcmVkaXJlY3RVUkwgOiAi IgotICAgICAgICAgICAgaGVhZGVyc1NpemUgOiAtMQotICAgICAgICAgICAgYm9keVNpemUgOiA8 bnVtYmVyPgotICAgICAgICB9Ci0gICAgICAgIHRpbWluZ3MgOiA8b2JqZWN0PgotICAgIH0KLSAg ICAxIDogewotICAgICAgICBwYWdlcmVmIDogImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0 b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRtbCIKLSAgICAgICAgc3RhcnRlZERhdGVUaW1l IDogPG9iamVjdD4KLSAgICAgICAgdGltZSA6IDxudW1iZXI+Ci0gICAgICAgIHJlcXVlc3QgOiB7 Ci0gICAgICAgICAgICBtZXRob2QgOiAiR0VUIgotICAgICAgICAgICAgdXJsIDogImh0dHA6Ly8x MjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMiCi0gICAgICAgICAgICBo ZWFkZXJzIDogPG9iamVjdD4KLSAgICAgICAgICAgIGhlYWRlcnNTaXplIDogLTEKLSAgICAgICAg ICAgIGJvZHlTaXplIDogPG51bWJlcj4KLSAgICAgICAgICAgIGNvb2tpZXMgOiB7Ci0gICAgICAg ICAgICAgICAgMCA6IHsKLSAgICAgICAgICAgICAgICAgICAgbmFtZSA6ICJhIgotICAgICAgICAg ICAgICAgICAgICB2YWx1ZSA6ICJiIgotICAgICAgICAgICAgICAgICAgICBwYXRoIDogIi9wYXRo IgotICAgICAgICAgICAgICAgICAgICBkb21haW4gOiAiZXhhbXBsZS5jb20iCi0gICAgICAgICAg ICAgICAgICAgIGV4cGlyZXMgOiBudWxsCi0gICAgICAgICAgICAgICAgICAgIGh0dHBPbmx5IDog ZmFsc2UKLSAgICAgICAgICAgICAgICAgICAgc2VjdXJlIDogZmFsc2UKLSAgICAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICAgICAgMSA6IHsKLSAgICAgICAgICAgICAgICAgICAgbmFtZSA6ICJh MSIKLSAgICAgICAgICAgICAgICAgICAgdmFsdWUgOiAiYjEiCi0gICAgICAgICAgICAgICAgICAg IHBhdGggOiB1bmRlZmluZWQKLSAgICAgICAgICAgICAgICAgICAgZG9tYWluIDogdW5kZWZpbmVk Ci0gICAgICAgICAgICAgICAgICAgIGV4cGlyZXMgOiBudWxsCi0gICAgICAgICAgICAgICAgICAg IGh0dHBPbmx5IDogZmFsc2UKLSAgICAgICAgICAgICAgICAgICAgc2VjdXJlIDogZmFsc2UKLSAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgMiA6IHsKLSAgICAgICAgICAgICAgICAg ICAgbmFtZSA6ICJjMSIKLSAgICAgICAgICAgICAgICAgICAgdmFsdWUgOiAiZDEiCi0gICAgICAg ICAgICAgICAgICAgIHBhdGggOiB1bmRlZmluZWQKLSAgICAgICAgICAgICAgICAgICAgZG9tYWlu IDogdW5kZWZpbmVkCi0gICAgICAgICAgICAgICAgICAgIGV4cGlyZXMgOiBudWxsCi0gICAgICAg ICAgICAgICAgICAgIGh0dHBPbmx5IDogZmFsc2UKLSAgICAgICAgICAgICAgICAgICAgc2VjdXJl IDogZmFsc2UKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAg ICAgICAgcmVzcG9uc2UgOiB7Ci0gICAgICAgICAgICBzdGF0dXMgOiAzMDQKLSAgICAgICAgICAg IHN0YXR1c1RleHQgOiAiTm90IE1vZGlmaWVkIgotICAgICAgICAgICAgaGVhZGVycyA6IDxvYmpl Y3Q+Ci0gICAgICAgICAgICBjb250ZW50IDogewotICAgICAgICAgICAgICAgIHNpemUgOiA8bnVt YmVyPgotICAgICAgICAgICAgICAgIG1pbWVUeXBlIDogImFwcGxpY2F0aW9uL3gtamF2YXNjcmlw dCIKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJlZGlyZWN0VVJMIDogIiIKLSAgICAgICAg ICAgIGhlYWRlcnNTaXplIDogLTEKLSAgICAgICAgICAgIGJvZHlTaXplIDogPG51bWJlcj4KLSAg ICAgICAgICAgIGNvb2tpZXMgOiB7Ci0gICAgICAgICAgICAgICAgMCA6IHsKLSAgICAgICAgICAg ICAgICAgICAgbmFtZSA6ICJ4IgotICAgICAgICAgICAgICAgICAgICB2YWx1ZSA6ICJ5IgotICAg ICAgICAgICAgICAgICAgICBwYXRoIDogIi9wYXRoIgotICAgICAgICAgICAgICAgICAgICBkb21h aW4gOiAiZXhhbXBsZS5jb20iCi0gICAgICAgICAgICAgICAgICAgIGV4cGlyZXMgOiBudWxsCi0g ICAgICAgICAgICAgICAgICAgIGh0dHBPbmx5IDogdHJ1ZQotICAgICAgICAgICAgICAgICAgICBz ZWN1cmUgOiB0cnVlCi0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIDEgOiB7Ci0g ICAgICAgICAgICAgICAgICAgIG5hbWUgOiAieDEiCi0gICAgICAgICAgICAgICAgICAgIHZhbHVl IDogInkxIgotICAgICAgICAgICAgICAgICAgICBwYXRoIDogdW5kZWZpbmVkCi0gICAgICAgICAg ICAgICAgICAgIGRvbWFpbiA6IHVuZGVmaW5lZAotICAgICAgICAgICAgICAgICAgICBleHBpcmVz IDogbnVsbAotICAgICAgICAgICAgICAgICAgICBodHRwT25seSA6IGZhbHNlCi0gICAgICAgICAg ICAgICAgICAgIHNlY3VyZSA6IGZhbHNlCi0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg ICAgIDIgOiB7Ci0gICAgICAgICAgICAgICAgICAgIG5hbWUgOiAiejIiCi0gICAgICAgICAgICAg ICAgICAgIHZhbHVlIDogInkyIgotICAgICAgICAgICAgICAgICAgICBwYXRoIDogdW5kZWZpbmVk Ci0gICAgICAgICAgICAgICAgICAgIGRvbWFpbiA6IHVuZGVmaW5lZAotICAgICAgICAgICAgICAg ICAgICBleHBpcmVzIDogbnVsbAotICAgICAgICAgICAgICAgICAgICBodHRwT25seSA6IGZhbHNl Ci0gICAgICAgICAgICAgICAgICAgIHNlY3VyZSA6IGZhbHNlCi0gICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIHRpbWluZ3MgOiA8b2JqZWN0PgotICAg IH0KLSAgICAyIDogewotICAgICAgICBwYWdlcmVmIDogImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9p bnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRtbCIKLSAgICAgICAgc3RhcnRlZERh dGVUaW1lIDogPG9iamVjdD4KLSAgICAgICAgdGltZSA6IDxudW1iZXI+Ci0gICAgICAgIHJlcXVl c3QgOiB7Ci0gICAgICAgICAgICBtZXRob2QgOiAiR0VUIgotICAgICAgICAgICAgdXJsIDogImh0 dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvcmVzb3VyY2UtaGFyLWNvbnZlcnNpb24uaHRt bCIKLSAgICAgICAgICAgIGhlYWRlcnMgOiA8b2JqZWN0PgotICAgICAgICAgICAgaGVhZGVyc1Np emUgOiAtMQotICAgICAgICAgICAgYm9keVNpemUgOiA8bnVtYmVyPgotICAgICAgICB9Ci0gICAg ICAgIHJlc3BvbnNlIDogewotICAgICAgICAgICAgc3RhdHVzIDogMjAwCi0gICAgICAgICAgICBz dGF0dXNUZXh0IDogIk9LIgotICAgICAgICAgICAgaGVhZGVycyA6IDxvYmplY3Q+Ci0gICAgICAg ICAgICBjb250ZW50IDogewotICAgICAgICAgICAgICAgIHNpemUgOiA8bnVtYmVyPgotICAgICAg ICAgICAgICAgIG1pbWVUeXBlIDogInRleHQvaHRtbCIKLSAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHJlZGlyZWN0VVJMIDogIiIKLSAgICAgICAgICAgIGhlYWRlcnNTaXplIDogLTEKLSAgICAg ICAgICAgIGJvZHlTaXplIDogPG51bWJlcj4KLSAgICAgICAgfQotICAgICAgICB0aW1pbmdzIDog PG9iamVjdD4KLSAgICB9Ci0gICAgMyA6IHsKLSAgICAgICAgcGFnZXJlZiA6ICJodHRwOi8vMTI3 LjAuMC4xOjgwMDAvaW5zcGVjdG9yL3Jlc291cmNlLWhhci1jb252ZXJzaW9uLmh0bWwiCi0gICAg ICAgIHN0YXJ0ZWREYXRlVGltZSA6IDxvYmplY3Q+Ci0gICAgICAgIHRpbWUgOiA8bnVtYmVyPgot ICAgICAgICByZXF1ZXN0IDogewotICAgICAgICAgICAgbWV0aG9kIDogIkdFVCIKLSAgICAgICAg ICAgIHVybCA6ICJodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL3Jlc291cmNlcy10ZXN0 LmpzIgotICAgICAgICAgICAgaGVhZGVycyA6IDxvYmplY3Q+Ci0gICAgICAgICAgICBoZWFkZXJz U2l6ZSA6IC0xCi0gICAgICAgICAgICBib2R5U2l6ZSA6IDxudW1iZXI+Ci0gICAgICAgIH0KLSAg ICAgICAgcmVzcG9uc2UgOiB7Ci0gICAgICAgICAgICBzdGF0dXMgOiAzMDQKLSAgICAgICAgICAg IHN0YXR1c1RleHQgOiAiTm90IE1vZGlmaWVkIgotICAgICAgICAgICAgaGVhZGVycyA6IDxvYmpl Y3Q+Ci0gICAgICAgICAgICBjb250ZW50IDogewotICAgICAgICAgICAgICAgIHNpemUgOiA8bnVt YmVyPgotICAgICAgICAgICAgICAgIG1pbWVUeXBlIDogImFwcGxpY2F0aW9uL3gtamF2YXNjcmlw dCIKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJlZGlyZWN0VVJMIDogIiIKLSAgICAgICAg ICAgIGhlYWRlcnNTaXplIDogLTEKLSAgICAgICAgICAgIGJvZHlTaXplIDogPG51bWJlcj4KLSAg ICAgICAgfQotICAgICAgICB0aW1pbmdzIDogPG9iamVjdD4KLSAgICB9Ci0gICAgNCA6IHsKLSAg ICAgICAgcGFnZXJlZiA6ICJodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL3Jlc291cmNl LWhhci1jb252ZXJzaW9uLmh0bWwiCi0gICAgICAgIHN0YXJ0ZWREYXRlVGltZSA6IDxvYmplY3Q+ Ci0gICAgICAgIHRpbWUgOiA8bnVtYmVyPgotICAgICAgICByZXF1ZXN0IDogewotICAgICAgICAg ICAgbWV0aG9kIDogIlBPU1QiCi0gICAgICAgICAgICB1cmwgOiAiaHR0cDovLzEyNy4wLjAuMTo4 MDAwL2luc3BlY3Rvci9yZXNvdXJjZXMvcG9zdC10YXJnZXQuY2dpIgotICAgICAgICAgICAgaGVh ZGVycyA6IDxvYmplY3Q+Ci0gICAgICAgICAgICBoZWFkZXJzU2l6ZSA6IC0xCi0gICAgICAgICAg ICBib2R5U2l6ZSA6IDxudW1iZXI+Ci0gICAgICAgICAgICBwb3N0RGF0YSA6IHsKLSAgICAgICAg ICAgICAgICBtaW1lVHlwZSA6ICJ0ZXh0L3htbCIKLSAgICAgICAgICAgICAgICB0ZXh0IDogIjx4 bWw+PC94bWw+IgotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIHJlc3BvbnNlIDog ewotICAgICAgICAgICAgc3RhdHVzIDogMjAwCi0gICAgICAgICAgICBzdGF0dXNUZXh0IDogIk9L IgotICAgICAgICAgICAgaGVhZGVycyA6IDxvYmplY3Q+Ci0gICAgICAgICAgICBjb250ZW50IDog ewotICAgICAgICAgICAgICAgIHNpemUgOiA8bnVtYmVyPgotICAgICAgICAgICAgICAgIG1pbWVU eXBlIDogImFwcGxpY2F0aW9uL3htbCIKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJlZGly ZWN0VVJMIDogIiIKLSAgICAgICAgICAgIGhlYWRlcnNTaXplIDogLTEKLSAgICAgICAgICAgIGJv ZHlTaXplIDogPG51bWJlcj4KLSAgICAgICAgfQotICAgICAgICB0aW1pbmdzIDogPG9iamVjdD4K LSAgICB9Ci19Ci0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMGM3YmI1Li4zZWE5ZjcwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTEtMDQtMDggIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBIQVIgY29tcGxpYW5jZSBmaXhlcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgxMjQKKworICAgICAgICAtIEFsd2F5cyBw cm92aWRlIHNvbWUgdmFsdWVzIGZvciBxdWVyeVN0cmluZyBhbmQgY29va2llcywgZXZlbiB0aG91 Z2ggYXJyYXlzIG1heSBiZSBlbXB0eQorICAgICAgICAtIEFsd2F5cyBwcm92aWRlIGFuIGVtcHR5 IGNhY2hlIG9iamVjdAorICAgICAgICAtIEFkZGVkIGVudGlyZSBIQVJMb2cgdG8gdGVzdAorICAg ICAgICAtIFdvcmthcm91bmQgaW4gdGVzdCB0byBhdm9pZCBjdXN0b20gZXhwZWN0YXRpb25zIChm YXZpY29uLmljbyBhcHBlYXJzIGluIGxvZyBvbiBjZXJ0YWluIHBsYXRmb3JtcykKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSEFSRW50cnkuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSEFSRW50cnkucHJvdG90eXBlLmJ1aWxkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJF bnRyeS5wcm90b3R5cGUuX2J1aWxkUmVxdWVzdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSEFS RW50cnkucHJvdG90eXBlLl9idWlsZFJlc3BvbnNlKToKKwogMjAxMS0wNC0wOCAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIEF0dGVtcHQgdG8gZml4IHRoZSBRdCBi dWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSEFS RW50cnkuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5Lmpz CmluZGV4IGI1MjIzYjYuLjZmYjFiNTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvSEFSRW50cnkuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9IQVJFbnRyeS5qcwpAQCAtNDUsNyArNDUsNyBAQCBXZWJJbnNwZWN0b3IuSEFS RW50cnkucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGltZTogV2ViSW5zcGVjdG9yLkhBUkVu dHJ5Ll90b01pbGxpc2Vjb25kcyh0aGlzLl9yZXNvdXJjZS5kdXJhdGlvbiksCiAgICAgICAgICAg ICByZXF1ZXN0OiB0aGlzLl9idWlsZFJlcXVlc3QoKSwKICAgICAgICAgICAgIHJlc3BvbnNlOiB0 aGlzLl9idWlsZFJlc3BvbnNlKCksCi0gICAgICAgICAgICAvLyBjYWNoZTogey4uLn0sIC0tIE5v dCBzdXBwcm90ZWQgeWV0LgorICAgICAgICAgICAgY2FjaGU6IHsgfSwgLy8gTm90IHN1cHByb3Rl ZCB5ZXQuCiAgICAgICAgICAgICB0aW1pbmdzOiB0aGlzLl9idWlsZFRpbWluZ3MoKQogICAgICAg ICB9OwogICAgIH0sCkBAIC01NywzMyArNTcsMjkgQEAgV2ViSW5zcGVjdG9yLkhBUkVudHJ5LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIHVybDogdGhpcy5fcmVzb3VyY2UudXJsLAogICAgICAg ICAgICAgLy8gaHR0cFZlcnNpb246ICJIVFRQLzEuMSIgLS0gTm90IGF2YWlsYWJsZS4KICAgICAg ICAgICAgIGhlYWRlcnM6IHRoaXMuX2J1aWxkSGVhZGVycyh0aGlzLl9yZXNvdXJjZS5yZXF1ZXN0 SGVhZGVycyksCisgICAgICAgICAgICBxdWVyeVN0cmluZzogdGhpcy5fYnVpbGRQYXJhbWV0ZXJz KHRoaXMuX3Jlc291cmNlLnF1ZXJ5UGFyYW1ldGVycyB8fCBbXSksCisgICAgICAgICAgICBjb29r aWVzOiB0aGlzLl9idWlsZENvb2tpZXModGhpcy5fcmVzb3VyY2UucmVxdWVzdENvb2tpZXMgfHwg W10pLAogICAgICAgICAgICAgaGVhZGVyc1NpemU6IC0xLCAvLyBOb3QgYXZhaWxhYmxlLgogICAg ICAgICAgICAgYm9keVNpemU6IC0xIC8vIE5vdCBhdmFpbGFibGUuCiAgICAgICAgIH07Ci0gICAg ICAgIGlmICh0aGlzLl9yZXNvdXJjZS5xdWVyeVBhcmFtZXRlcnMpCi0gICAgICAgICAgICByZXMu cXVlcnlTdHJpbmcgPSB0aGlzLl9idWlsZFBhcmFtZXRlcnModGhpcy5fcmVzb3VyY2UucXVlcnlQ YXJhbWV0ZXJzKTsKICAgICAgICAgaWYgKHRoaXMuX3Jlc291cmNlLnJlcXVlc3RGb3JtRGF0YSkK ICAgICAgICAgICAgIHJlcy5wb3N0RGF0YSA9IHRoaXMuX2J1aWxkUG9zdERhdGEoKTsKLSAgICAg ICAgaWYgKHRoaXMuX3Jlc291cmNlLnJlcXVlc3RDb29raWVzKQotICAgICAgICAgICAgcmVzLmNv b2tpZXMgPSB0aGlzLl9idWlsZENvb2tpZXModGhpcy5fcmVzb3VyY2UucmVxdWVzdENvb2tpZXMp OwogICAgICAgICByZXR1cm4gcmVzOwogICAgIH0sCiAKICAgICBfYnVpbGRSZXNwb25zZTogZnVu Y3Rpb24oKQogICAgIHsKLSAgICAgICAgdmFyIHJlcyA9IHsKKyAgICAgICAgcmV0dXJuIHsKICAg ICAgICAgICAgIHN0YXR1czogdGhpcy5fcmVzb3VyY2Uuc3RhdHVzQ29kZSwKICAgICAgICAgICAg IHN0YXR1c1RleHQ6IHRoaXMuX3Jlc291cmNlLnN0YXR1c1RleHQsCiAgICAgICAgICAgICAvLyAi aHR0cFZlcnNpb24iOiAiSFRUUC8xLjEiIC0tIE5vdCBhdmFpbGFibGUuCiAgICAgICAgICAgICBo ZWFkZXJzOiB0aGlzLl9idWlsZEhlYWRlcnModGhpcy5fcmVzb3VyY2UucmVzcG9uc2VIZWFkZXJz KSwKKyAgICAgICAgICAgIGNvb2tpZXM6IHRoaXMuX2J1aWxkQ29va2llcyh0aGlzLl9yZXNvdXJj ZS5yZXNwb25zZUNvb2tpZXMgfHwgW10pLAogICAgICAgICAgICAgY29udGVudDogdGhpcy5fYnVp bGRDb250ZW50KCksCiAgICAgICAgICAgICByZWRpcmVjdFVSTDogdGhpcy5fcmVzb3VyY2UucmVz cG9uc2VIZWFkZXJWYWx1ZSgiTG9jYXRpb24iKSB8fCAiIiwKICAgICAgICAgICAgIGhlYWRlcnNT aXplOiAtMSwgLy8gTm90IGF2YWlsYWJsZS4KICAgICAgICAgICAgIGJvZHlTaXplOiB0aGlzLl9y ZXNvdXJjZS5yZXNvdXJjZVNpemUKICAgICAgICAgfTsKLSAgICAgICAgaWYgKHRoaXMuX3Jlc291 cmNlLnJlc3BvbnNlQ29va2llcykKLSAgICAgICAgICAgIHJlcy5jb29raWVzID0gdGhpcy5fYnVp bGRDb29raWVzKHRoaXMuX3Jlc291cmNlLnJlc3BvbnNlQ29va2llcyk7Ci0gICAgICAgIHJldHVy biByZXM7CiAgICAgfSwKIAogICAgIF9idWlsZENvbnRlbnQ6IGZ1bmN0aW9uKCkK