Skip to content

Remove encryption app#35949

Merged
DeepDiver1975 merged 6 commits intomasterfrom
bye-bye-enc-again
Aug 9, 2019
Merged

Remove encryption app#35949
DeepDiver1975 merged 6 commits intomasterfrom
bye-bye-enc-again

Conversation

@DeepDiver1975
Copy link
Copy Markdown
Member

@DeepDiver1975 DeepDiver1975 commented Jul 30, 2019

Description

As per #35777 the encryption app will be released from its own repo

How Has This Been Tested?

  • 🤖

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

Open tasks:

  • Backport (if applicable set "backport-request" label and remove when the backport was done)

@DeepDiver1975 DeepDiver1975 self-assigned this Jul 30, 2019
@DeepDiver1975 DeepDiver1975 changed the title Bye bye enc again Remove encryption app Jul 30, 2019
@patrickjahns
Copy link
Copy Markdown
Contributor

This needs to be taken into account for the next releases and we shall publish the first app release

Can we make a diff between what is in here and encryption repository to be sure we have no extra/false stuff ;-)

@DeepDiver1975
Copy link
Copy Markdown
Member Author

This needs to be taken into account for the next releases and we shall publish the first app release

Didn't we agree on bundling it from the own repo?

@phil-davis
Copy link
Copy Markdown
Contributor

The old core stable10 had the encryption acceptance tests in it, so they also need to be removed in this PR. I did that in the commit that I just pushed.

I diff'd the test suites between core stable10 and the encryption app not long ago. The test code and scenarios are the same in the encryption app.

@patrickjahns
Copy link
Copy Markdown
Contributor

@DeepDiver1975

Didn't we agree on bundling it from the own repo?`

works for me - just wanted to keep a reminder in this PR to update this then in the build definitions

@phil-davis
Did you also diff the code, or only the tests?

@phil-davis
Copy link
Copy Markdown
Contributor

Did you also diff the code, or only the tests?
I only diffed the acceptance tests

@patrickjahns
Copy link
Copy Markdown
Contributor

There is an issue open to check code alignment owncloud/encryption#118

So the question is - should we archive the code in owncloud/encryption master and move over the code from this repository. That would give us the easiest way forward.

We then could release the app in the repo as 1.4.0 ( as we did with other apps not in the marketplace, but being bundled )

@DeepDiver1975
Copy link
Copy Markdown
Member Author

So the question is - should we archive the code in owncloud/encryption master and move over the code from this repository. That would give us the easiest way forward.

my understanding was that the code is more advanced in owncloud/encryption - did I miss anything?

@DeepDiver1975
Copy link
Copy Markdown
Member Author

my understanding was that the code is more advanced in owncloud/encryption - did I miss anything?

@patrickjahns see owncloud/encryption#118 (comment) - the code in the app is fine - no need to copy over any code from core

@owncloud owncloud deleted a comment from codecov bot Aug 1, 2019
@owncloud owncloud deleted a comment from codecov bot Aug 1, 2019
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 2, 2019

Codecov Report

Merging #35949 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #35949   +/-   ##
=======================================
  Coverage   53.85%   53.85%           
=======================================
  Files          63       63           
  Lines        7377     7377           
  Branches     1301     1301           
=======================================
  Hits         3973     3973           
  Misses       3019     3019           
  Partials      385      385
Flag Coverage Δ
#javascript 53.85% <ø> (ø) ⬆️

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 1c27f4f...d3ea4fc. Read the comment docs.

@DeepDiver1975
Copy link
Copy Markdown
Member Author

settings/ChangePassword/Controller.php:104 PhanUndeclaredClassMethod Call to method __construct from undeclared class \OCA\Encryption\Crypto\Crypt
settings/ChangePassword/Controller.php:110 PhanUndeclaredClassMethod Call to method __construct from undeclared class \OCA\Encryption\Util (Did you mean class \League\Flysystem\Util)
settings/ChangePassword/Controller.php:117 PhanUndeclaredClassMethod Call to method __construct from undeclared class \OCA\Encryption\KeyManager
settings/ChangePassword/Controller.php:122 PhanUndeclaredClassMethod Call to method __construct from undeclared class \OCA\Encryption\Session
settings/ChangePassword/Controller.php:125 PhanUndeclaredClassMethod Call to method __construct from undeclared class \OCA\Encryption\Recovery
settings/ChangePassword/Controller.php:134 PhanUndeclaredClassMethod Call to method isRecoveryKeyEnabled from undeclared class \OCA\Encryption\Recovery
settings/ChangePassword/Controller.php:139 PhanUndeclaredClassMethod Call to method checkRecoveryPassword from undeclared class \OCA\Encryption\KeyManager
settings/ChangePassword/Controller.php:140 PhanUndeclaredClassMethod Call to method isRecoveryEnabledForUser from undeclared class \OCA\Encryption\Recovery
Makefile:224: recipe for target 'test-php-phan' failed

@patrickjahns
Copy link
Copy Markdown
Contributor

stan doesn't like you

In RobotLoader.php line 239:
                                                                               
  File or directory '/drone/src/apps/encryption/appinfo/Migrations' not found  

Fixed by dropping the lines here https://github.com/owncloud/core/blob/master/phpstan.neon#L4-L5

@DeepDiver1975 DeepDiver1975 force-pushed the bye-bye-enc-again branch 2 times, most recently from 364b34d to 6904655 Compare August 7, 2019 07:22
@DeepDiver1975 DeepDiver1975 force-pushed the bye-bye-enc-again branch 2 times, most recently from b87ba0f to 3050aaf Compare August 7, 2019 10:00
Copy link
Copy Markdown
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - the various bits-and-pieces that reference the now-gone encryption app are tidied up.

@phil-davis
Copy link
Copy Markdown
Contributor

No codecov came, but that is not really relevant anyway - not much can be done if a lot of code is deleted and then the average codecov percentage is different.
@patrickjahns @DeepDiver1975 merge this when drone comes back?

@DeepDiver1975 DeepDiver1975 merged commit da8c171 into master Aug 9, 2019
@delete-merged-branch delete-merged-branch bot deleted the bye-bye-enc-again branch August 9, 2019 07:01
@phil-davis
Copy link
Copy Markdown
Contributor

Note: this did not need to remove encryption tests from drone CI, because during the drone v0.8->v1 upgrade the new drone v1 .drone.yml was implemented without encryption test matrix entries anyway (we knew that this PR here was ready to merge!)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants