[14:44:42] (PS7) Mepps: Create time limit based on user configuration Bug: T163412 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/354511 (https://phabricator.wikimedia.org/T163412) [15:38:18] fundraising-tech-ops, Operations, Traffic: Fix nits in HTTPS/HSTS configs in externally-hosted fundraising domains - https://phabricator.wikimedia.org/T137161#3284389 (Jgreen) >>! In T137161#3277960, @BBlack wrote: > @Jgreen - re: civicrm, it needs to emit the HSTS header on **all** HTTPS responses.... [16:28:15] (PS8) Ejegg: Create time limit based on user configuration Bug: T163412 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/354511 (https://phabricator.wikimedia.org/T163412) (owner: Mepps) [16:28:31] (CR) Ejegg: [C: 2] "Looks good!" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/354511 (https://phabricator.wikimedia.org/T163412) (owner: Mepps) [16:29:25] (CR) jerkins-bot: [V: -1] Create time limit based on user configuration Bug: T163412 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/354511 (https://phabricator.wikimedia.org/T163412) (owner: Mepps) [16:30:22] (CR) Ejegg: [C: 2] "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/354511 (https://phabricator.wikimedia.org/T163412) (owner: Mepps) [16:31:08] (CR) jerkins-bot: [V: -1] Create time limit based on user configuration Bug: T163412 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/354511 (https://phabricator.wikimedia.org/T163412) (owner: Mepps) [16:31:56] ugh, what's wrong with CI this tim? [16:32:47] huh, git clean failing on settings.php. [16:32:58] guessing 'cause it's r/o [16:33:21] (Merged) jenkins-bot: Create time limit based on user configuration Bug: T163412 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/354511 (https://phabricator.wikimedia.org/T163412) (owner: Mepps) [16:34:03] well, got through anyway! [16:34:21] mepps: want to deploy that and the currency fix? [16:34:28] XenoRyet: ready for some renaming? [16:34:38] Yea, was just getting started on that. [16:35:37] I've got to rebase the first couple 'cause there have already been some i18n changes [16:36:57] How frequently do those come in? [16:37:56] ejegg--sure! should we screen share or should i try to do it on my own? [16:38:17] I'm available for screenshare if you want [16:40:12] XenoRyet: every day, it seems [16:40:27] mepps I'm in the -talk call [16:47:27] (PS4) Ejegg: Use normalized key for supplemental_address_1 [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/354606 (https://phabricator.wikimedia.org/T165818) [16:47:29] (PS2) Ejegg: Rename 'street' field to normalized 'street_address' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/354610 (https://phabricator.wikimedia.org/T165818) [16:56:52] (PS1) Mepps: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/355129 (https://phabricator.wikimedia.org/T151957) [16:58:10] (CR) Mepps: [C: 2] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/355129 (https://phabricator.wikimedia.org/T151957) (owner: Mepps) [16:59:12] (CR) Mepps: [V: 2 C: 2] Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/355129 (https://phabricator.wikimedia.org/T151957) (owner: Mepps) [16:59:30] (Merged) jenkins-bot: Merge branch 'master' into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/355129 (https://phabricator.wikimedia.org/T151957) (owner: Mepps) [17:00:19] fr-tech: The rose of yore is but a name, mere names are left to us. [17:00:19] -- discuss. [17:02:41] (PS3) Ejegg: Rename 'street' field to normalized 'street_address' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/354610 (https://phabricator.wikimedia.org/T165818) [17:12:36] (PS4) Ejegg: Rename 'street' field to normalized 'street_address' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/354610 (https://phabricator.wikimedia.org/T165818) [17:14:09] XenoRyet: ok, that rebase should be good now ^^^ [17:16:59] wanna scan it and merge before you do your replacements? [17:19:51] Sure [17:21:36] (CR) XenoRyet: [C: 2] Use normalized key for supplemental_address_1 [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/354606 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [17:23:45] (CR) XenoRyet: [C: 2] Rename 'street' field to normalized 'street_address' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/354610 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [17:23:51] (Merged) jenkins-bot: Use normalized key for supplemental_address_1 [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/354606 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [17:25:49] (Merged) jenkins-bot: Rename 'street' field to normalized 'street_address' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/354610 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [17:32:04] thanks XenoRyet [17:32:42] No worries. Should have patches for fname and lname soon. [17:32:46] Great! [17:33:07] I just remembered I was going to deploy the stuff up to that point... will go ahead with that now [17:35:33] sounds good [17:36:42] (PS1) Ejegg: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/355134 [17:38:22] (CR) Ejegg: [C: 2] Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/355134 (owner: Ejegg) [17:39:27] (Merged) jenkins-bot: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/355134 (owner: Ejegg) [17:49:15] !log turned off paypal audit parser [17:49:24] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [17:50:23] ut-oh, what's up with the thank you job? [18:00:19] !log updated process control for new thank you send drush command 7c9572b1e6536c979a9517dac2eec422bef085d3 [18:00:26] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [18:01:10] !log updated civicrm 9b7a74c2921acb11d37271a9d388fdd2b804b450 [18:01:16] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [18:06:16] (PS1) Ejegg: Update DonationInterface submodule [core] (fundraising/REL1_27) - https://gerrit.wikimedia.org/r/355140 [18:06:38] !log updated thank you send drush command [18:06:44] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [18:07:50] (CR) Ejegg: [C: 2] Update DonationInterface submodule [core] (fundraising/REL1_27) - https://gerrit.wikimedia.org/r/355140 (owner: Ejegg) [18:10:01] (PS1) XenoRyet: Rename 'fname' to normalized 'first_name' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355141 (https://phabricator.wikimedia.org/T165818) [18:17:05] (Merged) jenkins-bot: Update DonationInterface submodule [core] (fundraising/REL1_27) - https://gerrit.wikimedia.org/r/355140 (owner: Ejegg) [18:22:30] !log updated payments-wiki from 3b845215d0e32e14ad27ad99bc150b7d7677c81c to 5fa4a70e97cd37609b5e314f55195fc00dc8828c [18:22:38] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [18:24:15] ok, got that deployed and it looks good. we can see the error messages again [18:24:24] looking over your fname patch XenoRyet [18:24:38] Cool. Next one is on the way as well. [18:24:58] (CR) Ejegg: [C: -1] "Looking good so far, except the .idea directory being checked in" [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355141 (https://phabricator.wikimedia.org/T165818) (owner: XenoRyet) [18:25:15] Heh, I'll fix that right now. [18:25:25] that one always tries to sneak in there. [18:25:42] I think I've got that in my global .gitignore [18:26:20] https://help.github.com/articles/ignoring-files/ [18:26:49] (PS2) XenoRyet: Rename 'fname' to normalized 'first_name' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355141 (https://phabricator.wikimedia.org/T165818) [18:33:44] (CR) Ejegg: [C: 2] "Looks good!" [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355141 (https://phabricator.wikimedia.org/T165818) (owner: XenoRyet) [18:35:29] mepps: there's a related crm patch to review if you want to help the normalization effort and learn about how we deal with audit files [18:35:37] (Merged) jenkins-bot: Rename 'fname' to normalized 'first_name' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355141 (https://phabricator.wikimedia.org/T165818) (owner: XenoRyet) [18:35:46] but if you're in the middle of something else, don't let me break your flow [18:36:04] ejegg: sure! i'm just looking at minfraud right now but not too deep in yet [18:36:40] what's the patch? [18:36:43] heh, if you're in that headspace maybe it's best to stay there - it's a puzzler [18:37:09] we can go over the audit patch after [18:39:53] (PS1) XenoRyet: Rename 'lname' to normalized 'last_name' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355146 (https://phabricator.wikimedia.org/T165818) [18:55:49] ejegg: That lname patch is up now if you want to have a look. [18:55:58] yep, looking now! [18:56:02] cool [18:57:18] (CR) Ejegg: [C: 2] Rename 'lname' to normalized 'last_name' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355146 (https://phabricator.wikimedia.org/T165818) (owner: XenoRyet) [18:57:36] XenoRyet|brb: I'll do currency code [18:59:24] (Merged) jenkins-bot: Rename 'lname' to normalized 'last_name' [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355146 (https://phabricator.wikimedia.org/T165818) (owner: XenoRyet) [19:18:31] XenoRyet: Oh, we'll need to make some transitional code to accept the old params in session and in querystrings [19:19:08] then we'll have to work with pcoombe to switch over the incoming links - amount->gross and currency_code->currency [19:21:28] Sounds like a plan. [19:24:48] (PS1) Ejegg: Rename currency_code to currency [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355153 (https://phabricator.wikimedia.org/T165818) [19:25:00] I'll check that one out. [19:25:17] lessee if it passes tests... [19:26:02] there are a few places we need to use currency_code for the third party args [19:27:03] (CR) jerkins-bot: [V: -1] Rename currency_code to currency [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355153 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [19:28:38] hmm, that's not where i'd expect the failures [19:37:54] ejegg i thought i saw (minimal) tests on donationinterface when we looked at it but i'm not seeing them anywhere now? [19:38:59] mepps are you on the deployment branch? [19:39:08] they should be under tests/phpunit [19:39:15] but you have to run them in a special way [19:39:39] haha ejegg i was convinced i wasn't but i forgot that we'd deployed together recently :) [19:39:52] you need to go into your mediawiki base dir, then into tests/phpunit there, and run ./phpunit.php --group DonationInterface [19:42:53] hmm so far that's returning No tests executed! (and this is being back on fundraising/REL1_27 [19:43:10] mepps: really? [19:43:42] oh, I bet you have a separate checkout of the DonationInterface extension in your extensions dir [19:43:56] gotta make sure that's on master too [19:45:13] it's on master, and i just git pulled origin again still no tests though [19:45:27] time for daily checkin though! [19:46:28] fr-tech be there in a sec... [19:48:44] fr-tech me too. Hangouts is being weird to me. [19:49:24] want us to dial you in? [19:49:33] Let me give it one more try. [20:22:03] Fundraising-Backlog, FR-Amazon, FR-Smashpig: Amazon IPN listener should send failmail on verification fail - https://phabricator.wikimedia.org/T166087#3285001 (Ejegg) [21:30:19] (PS2) Ejegg: Rename currency_code to currency [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355153 (https://phabricator.wikimedia.org/T165818) [21:47:03] ejegg: That currency code patch ready to be looked at? [21:47:17] yep, found the issue [21:47:26] the rekey bit was unsetting 'em [22:03:49] (CR) XenoRyet: [C: 2] Rename currency_code to currency [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355153 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [22:05:05] (PS1) Ejegg: Rename state field to match backend state_province [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355167 (https://phabricator.wikimedia.org/T165818) [22:05:15] getting close.... [22:05:22] Yep, gettin' there. [22:05:26] saved the trickiest for last, though [22:05:41] amount->gross [22:05:55] This is also the one that doesn't exactly feel right for the frontend [22:06:00] Yep [22:06:08] (Merged) jenkins-bot: Rename currency_code to currency [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355153 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [22:06:14] but I'm committed to swapping it [22:06:26] the state one oughtta pass tests [22:06:31] not much complexity there [22:06:42] I agree. The consistency is a bigger win than the fact that gross doesn't feel right. [22:06:52] Yea, looking at state now.1 [22:06:54] (CR) jerkins-bot: [V: -1] Rename state field to match backend state_province [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355167 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [22:07:04] d'oh [22:07:14] That's unexpected. [22:07:44] oh, it's a spacing thing [22:07:58] didn't think I touched the spacing [22:09:38] (PS2) Ejegg: Rename state field to match backend state_province [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355167 (https://phabricator.wikimedia.org/T165818) [22:26:30] (CR) XenoRyet: [C: 2] Rename state field to match backend state_province [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355167 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [22:28:10] (Merged) jenkins-bot: Rename state field to match backend state_province [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355167 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [22:35:30] thanks! [22:35:40] getting there with the amount thing [23:03:27] fr-tech hey... anyone have any objections to the CN deploy plan as per e-mail? I'm just double-checking the changes that would go out, and was going to merge stuff to the deploy branch for the train this evening or tomorrow morning... Pls also lmk if anyone wants more time to look at stuff and give an opinion ;p thx!!!! :D [23:04:24] AndyRussG: your plan sounds solid to me [23:04:35] No objections here, plan seems solid. [23:07:32] ejegg XenoRyet cool beanz, thx! [23:21:38] (PS1) Ejegg: Rename amount to gross [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355169 (https://phabricator.wikimedia.org/T165818) [23:22:11] that's 3 commits in a row whose sha starts with 7. I'm feeling lucky! [23:22:20] XenoRyet: ^^^^ ready for inspection [23:22:59] Lucky 7's [23:32:55] (PS1) Ejegg: Only send selected payment identifiers in failmail [wikimedia/fundraising/tools] - https://gerrit.wikimedia.org/r/355171 (https://phabricator.wikimedia.org/T104473) [23:33:05] cwd I think that should work... haven't tried it yet ^^^ [23:33:20] (CR) jerkins-bot: [V: -1] Only send selected payment identifiers in failmail [wikimedia/fundraising/tools] - https://gerrit.wikimedia.org/r/355171 (https://phabricator.wikimedia.org/T104473) (owner: Ejegg) [23:33:28] whoops [23:34:12] ejegg: didn't know you were sha-uperstitious ;p [23:34:22] ohhhhh [23:34:34] * AndyRussG hides [23:35:18] (PS2) Ejegg: Only send selected payment identifiers in failmail [wikimedia/fundraising/tools] - https://gerrit.wikimedia.org/r/355171 (https://phabricator.wikimedia.org/T104473) [23:38:59] ejegg: The old paremeter names are supposed to work on the querystring with this patch? [23:39:26] That doesn't seem to be working for me. The new ones work just fine, but the old ones seem to not. [23:39:59] ejegg: great, thanks [23:40:21] XenoRyet: oh, they're not? [23:40:34] Oh, wait. Maybe it's a weird caching thing on my end. [23:40:45] hmm, I thought the setNormalizedCurrency and setNormalizedAmount would fix 'em [23:42:08] (PS1) Ejegg: Allow old keys in session values [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355173 (https://phabricator.wikimedia.org/T165818) [23:42:14] XenoRyet: maybe this will help ^^^ [23:43:47] Basically, looks like the old ones work ok if I'm loading up a fresh form, but not so much if I already have the form loaded and just change the querystring. [23:43:58] (CR) jerkins-bot: [V: -1] Allow old keys in session values [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355173 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [23:44:10] oh right, the new ones always take precedence, even if they're from session [23:44:28] That makes sense, and is probably fine. [23:44:45] We're not going to see it change from new to old in the wild, I don't think. [23:44:57] (PS2) Ejegg: Allow old keys in session values [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355173 (https://phabricator.wikimedia.org/T165818) [23:46:03] battery's nearly dead. back in a sec! [23:53:02] (CR) XenoRyet: [C: 2] Rename amount to gross [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355169 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [23:57:22] ejegg|afk: I've gotta run to pick up Marek, but the gross patch looks fine to me. It does work with the old names even without the follow on patch, and I think current behavior of preferring new stuff that's already in session is fine. [23:57:55] I might jump back on a bit later tonight, email me if there's anything else you want me to look at right away. [23:58:33] (Merged) jenkins-bot: Rename amount to gross [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/355169 (https://phabricator.wikimedia.org/T165818) (owner: Ejegg) [23:58:38] thanks for the sprint!