Skip to content

[stable30] fix: throw correct exception type when we can't verify if an s3 bucket exists #49497

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.

Sign up for GitHub

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

Merged
kesselb merged 3 commits into from
Nov 28, 2024
Merged

[stable30] fix: throw correct exception type when we can't verify if an s3 bucket exists #49497

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3522819
fix: throw correct exception type when we can't verify if an s3 bucke…
icewind1991 Nov 26, 2024
44727d4
fix: fix availability wrapper not applying
icewind1991 Nov 26, 2024
3ab58ab
test: attempt to fix smb sso test
icewind1991 Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: fix availability wrapper not applying 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Nov 26, 2024
commit 44727d4862a340433b2954ac319ccf6ad65bc75f
4 changes: 2 additions & 2 deletions lib/private/Files/SetupManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
use OC_App;
use OC_Hook;
use OC_Util;
use OCA\Files_External\Config\ConfigAdapter;
use OCA\Files_External\Config\ExternalMountPoint;
use OCA\Files_Sharing\External\Mount;
use OCA\Files_Sharing\ISharedMountPoint;
use OCA\Files_Sharing\SharedMount;
Expand Down Expand Up @@ -134,7 +134,7 @@ function ($mountPoint, IStorage $storage, IMountPoint $mount) use ($reSharingEna

// install storage availability wrapper, before most other wrappers
Filesystem::addStorageWrapper('oc_availability', function ($mountPoint, IStorage $storage, IMountPoint $mount) {
$externalMount = $mount instanceof ConfigAdapter || $mount instanceof Mount;
$externalMount = $mount instanceof ExternalMountPoint || $mount instanceof Mount;
if ($externalMount && !$storage->isLocal()) {
return new Availability(['storage' => $storage]);
}
Expand Down
Loading