jlengrand/helidon
1
0
Fork 0
mirror of https://github.com/jlengrand/helidon.git synced 2026-03-10 08:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle no passphrase oci objectstorage cdi (#1021)

Browse Source 
* handle empty passphrase in oci-objectstorage-cdi configuration

* fix copyright year

* incorporate review feedback
This commit is contained in:
Romain Grecourt
2019-09-11 19:53:40 -07:00
committed by GitHub
parent f6317709df
commit 490080315f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
integrations/cdi/oci-objectstorage-cdi/src/main/java/io/helidon/integrations/cdi/oci/objectstorage/OciConfigConfigSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -187,7 +187,10 @@ public final class OciConfigConfigSource implements ConfigSource {
} else {
final Map<String, String> properties = new HashMap<>();
properties.put("oci.auth.fingerprint", provider.getFingerprint());
properties.put("oci.auth.passphraseCharacters", String.valueOf(provider.getPassphraseCharacters()));
char[] passphrase = provider.getPassphraseCharacters();
if (passphrase != null && passphrase.length > 0) {
properties.put("oci.auth.passphraseCharacters", String.valueOf(passphrase));
}
properties.put("oci.auth.tenancy", provider.getTenantId());
properties.put("oci.auth.user", provider.getUserId());
returnValue = Collections.unmodifiableMap(properties);