Skip to content

Commit 773dc91

Browse files
authored
Fixes minor error in OCI object storage integration (helidon-io#119)
* Fixes minor error in OCI object storage integration where the user's default private key file was not being located properly * Added nbactions.xml to .gitignore Signed-off-by: Laird Nelson <ljnelson@gmail.com>
1 parent c320957 commit 773dc91

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ target/
1515
*.releaseBackup
1616
atlassian-ide-plugin.xml
1717
user.txt
18+
nbactions.xml
1819
nb-configuration.xml
1920
node_modules/
2021
node/

integrations/cdi/oci-objectstorage-cdi/src/main/java/io/helidon/integrations/cdi/oci/objectstorage/MicroProfileConfigAuthenticationDetailsProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ public InputStream getPrivateKey() {
6767
.orElse(null);
6868
if (privateKey == null || privateKey.trim().isEmpty()) {
6969
final String pemFormattedPrivateKeyFilePath =
70-
this.config.getOptionalValue("oci.auth.keyFile", String.class).orElse("~/.oci/oci_api_key.pem");
70+
this.config.getOptionalValue("oci.auth.keyFile", String.class)
71+
.orElse(Paths.get(System.getProperty("user.home"), ".oci/oci_api_key.pem").toString());
7172
assert pemFormattedPrivateKeyFilePath != null;
7273
try {
7374
return new BufferedInputStream(Files.newInputStream(Paths.get(pemFormattedPrivateKeyFilePath)));

0 commit comments

Comments
 (0)