Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix disableUSPS since import running in separate context of Queue. #23777

Merged
merged 1 commit into from
Jun 13, 2022

Conversation

darrick
Copy link
Contributor

@darrick darrick commented Jun 12, 2022

Overview

I recall discussing getting rid of this option. So, setting it to disabled as default I think was better then having it accidentally run. I also added a notice about how it violates the USPS terms of service.

https://www.usps.com/business/web-tools-apis/address-information-api.htm

The Address Validation APIs can be used in conjunction with USPS SHIPPING OR MAILING SERVICES ONLY. The Address API must only be used on an individual transactional basis, i.e. not batch processing or cleansing of a database, but as a customer enters the information into a form on a website. Failure to comply with these terms and conditions can result in termination of USPS API access without prior notice.

Before

disableUSPS was being ignored as importing was moved to a separate context.

After

disableUSPS is being set for each batch.

@civibot
Copy link

civibot bot commented Jun 12, 2022

(Standard links)

@civibot civibot bot added the 5.51 label Jun 12, 2022
@darrick
Copy link
Contributor Author

darrick commented Jun 12, 2022

@eileenmcnaughton I have no clue how I got back to here. But it does look like it's now just one commit to 5.51.

@eileenmcnaughton
Copy link
Contributor

nice

@eileenmcnaughton
Copy link
Contributor

nice - those tests will need the array key added so as not to fail

@darrick
Copy link
Contributor Author

darrick commented Jun 12, 2022

@eileenmcnaughton Can you point me in the right direction for what needs to happen with the tests?

@eileenmcnaughton
Copy link
Contributor

It's these arrays in the test - you need to add in the extra property to avoid e-notices

image

@eileenmcnaughton
Copy link
Contributor

probably everywhere you find doGeoCode

@darrick
Copy link
Contributor Author

darrick commented Jun 13, 2022

@eileenmcnaughton Found it right after I commented by looking up the old failed test. I'm curious now if there is a way to have jenkins abandon a test. As it's running four or five on my last commits.

@eileenmcnaughton
Copy link
Contributor

I think I possibly CAN cancel jenkins jobs - but mostly we just wait it all out

@darrick darrick force-pushed the fix_import_disableUSPS branch from ef3ad91 to ba70f01 Compare June 13, 2022 02:42
@darrick
Copy link
Contributor Author

darrick commented Jun 13, 2022

@eileenmcnaughton

So, I did the following and that seemed to work. Thanks for all that. But, do I do the git pull just periodically to keep things on track and then the fetch, rebase, push -f to squash?

  508  git pull --rebase upstream 5.51
  509  git status
  510  git fetch
  511  git rebase -i upstream/5.51
  512  git push -f

@eileenmcnaughton
Copy link
Contributor

yeah - I do git pull --rebase all the time - just to keep it fresh

@eileenmcnaughton eileenmcnaughton merged commit fda805c into civicrm:5.51 Jun 13, 2022
@eileenmcnaughton
Copy link
Contributor

yay - all passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants