Fix check_for_updates

[redshiftzero]

Status

Ready for review

Description of Changes

Fixes #3426.

Changes proposed in this pull request:

• Strips newline from current_tag in securedrop-admin check_for_updates

Test plan

All of the following should be done in Tails.

No updates needed case

0. Check out 0.6
1. Apply the diff in admin/securedrop_admin/__init__.py to 0.6
2. Run ./securedrop-admin check_for_updates

You should see that updates are not needed: INFO: All updates applied

Updates needed case

0. Check out a random branch that is not this one
1. Add a new tag locally that has a higher version number than the current prod version of SecureDrop, e.g. 0.7.0
2. Switch back to this branch
3. Run ./securedrop-admin check_for_updates

You should see that updates are needed: INFO: Update needed

Deployment

Will go out in workstation update

Checklist

If you made changes to securedrop-admin:

• Linting and tests (make -C admin test) pass in the admin development container

[conorsch]

Apply the diff in admin/securedrop_admin/init.py to 0.6

Generating the requested diff via:

git diff 0.6..fix-check-for-updates -- admin/securedrop_admin/__init__.py

[emkll]

Thanks for the quick fix @redshiftzero , my local testing confirms this fixes the issue.

• For update needed: checked out 0.6, applied the patch and created a 0.6.1 tag locally. check_for_updates returned INFO: Update needed
• For All updates applied: checked out 0.6, applied the patch and deleted the previously created tag. check for updates returned INFO: All updates applied

I'll let @conorsch confirm the fix prior to merging

[conorsch]

Also confirming resolution. Steps I took:

1. Deleted old 0.7.0 tag.
2. For no-updates-needed-case: checked out 0.6, used git diff 0.6..fix-check-for-updates -- admin/securedrop_admin/__init__.py to generate patch, applied patch on 0.6. Observed "INFO: All updates applied".
3. For updates-needed-case: checked out develop, branched to there-is-no-branch, tagged as 0.7.0 locally (unsigned), hopped back to feature branch fix-check-for-updates. Upon rerunning, observed "INFO: Update needed".

LGTM!

[conorsch]

[ghost]

💯

[ghost]

@redshiftzero no need for me to approve but just wanted to support the effort. 🍿 :-P

[codecov-io]

Codecov Report

Merging #3429 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop    #3429   +/-   ##
========================================
  Coverage    85.87%   85.87%           
========================================
  Files           34       34           
  Lines         2167     2167           
  Branches       241      241           
========================================
  Hits          1861     1861           
  Misses         250      250           
  Partials        56       56

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f6e62d6...2bffcef. Read the comment docs.