openinfra
/
openstackid
Code Issues Proposed changes

Fix on swift adapter 

added error handling at boot time

Change-Id: I2e56c8a86f82ea4c6049a43736ca32b7d147fc35
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2020-12-04 09:13:11 -03:00
parent c47515a07b
commit 5cee295d74
1 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
app/libs/Utils/FileSystem/SwiftServiceProvider.php
View File

@ -12,6 +12,7 @@
* limitations under the License.
**/
use App\Services\FileSystem\Swift\SwiftAdapter;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use League\Flysystem\Filesystem;
use Illuminate\Support\ServiceProvider;
@ -41,45 +42,52 @@ final class SwiftServiceProvider extends ServiceProvider
{
Storage::extend('swift', function ($app, $config) {
$configOptions = [
'authUrl' => $config["auth_url"],
'region' => $config["region"],
];
try {
$userName = $config["user_name"] ?? null;
$userPassword = $config["api_key"] ?? null;
if(!empty($userName) && !empty($userPassword)){
$configOptions['user'] = [
'name' => $userName,
'password' => $userPassword,
'domain' => ['id' => $config["user_domain"] ?? 'default']
$configOptions = [
'authUrl' => $config["auth_url"],
'region' => $config["region"],
];
$configOptions['scope' ] = [
'project' => [
'name' => $config["project_name"],
'domain' => ['id' => $config["project_domain"] ?? 'default']
],
];
$userName = $config["user_name"] ?? null;
$userPassword = $config["api_key"] ?? null;
if (!empty($userName) && !empty($userPassword)) {
$configOptions['user'] = [
'name' => $userName,
'password' => $userPassword,
'domain' => ['id' => $config["user_domain"] ?? 'default']
];
$configOptions['scope'] = [
'project' => [
'name' => $config["project_name"],
'domain' => ['id' => $config["project_domain"] ?? 'default']
],
];
}
$appCredentialId = $config["app_credential_id"] ?? null;
$appCredentialSecret = $config["app_credential_secret"] ?? null;
if (!empty($appCredentialId) && !empty($appCredentialSecret)) {
$configOptions['application_credential'] = [
'id' => $appCredentialId,
'secret' => $appCredentialSecret,
];
}
$openstackClient = new OpenStack($configOptions);
$container = $openstackClient->objectStoreV1()->getContainer($config["container"]);
return new Filesystem(new SwiftAdapter($container));
}
$appCredentialId = $config["app_credential_id"] ?? null;
$appCredentialSecret = $config["app_credential_secret"] ?? null;
if(!empty($appCredentialId) && !empty($appCredentialSecret)){
$configOptions['application_credential'] = [
'id' => $appCredentialId,
'secret' => $appCredentialSecret,
];
catch (\Exception $ex){
Log::error($ex);
return null;
}
$openstackClient = new OpenStack($configOptions);
$container = $openstackClient->objectStoreV1()->getContainer($config["container"]);
return new Filesystem(new SwiftAdapter($container));
});
}
}