Skip to content
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.

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

Fixes bug in OkeWorkloadIdentityAdpSupplier.available() method #8689

Merged
merged 1 commit into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
*/
package io.helidon.integrations.oci.sdk.cdi;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Optional;
Expand Down Expand Up @@ -172,8 +174,8 @@ public final Optional<OkeWorkloadIdentityAuthenticationDetailsProvider> get() {
*
* @return {@code true} if and only if the file identified by the value of the {@code
* OCI_KUBERNETES_SERVICE_ACCOUNT_CERT_PATH} environment variable, or the default value "{@code
* /var/run/secrets/kubernetes.io/serviceaccount/ca.crt}", {@linkplain BasicFileAttributes#isRegularFile() is a
* regular file}; {@code false} in all other cases
* /var/run/secrets/kubernetes.io/serviceaccount/ca.crt}", exists and {@linkplain
* BasicFileAttributes#isRegularFile() is a regular file}; {@code false} in all other cases
*
* @exception UncheckedIOException if there was an error checking attributes of the (extant) file
*/
Expand All @@ -184,6 +186,8 @@ public static boolean available() {
.orElse("/var/run/secrets/kubernetes.io/serviceaccount/ca.crt")),
BasicFileAttributes.class)
.isRegularFile(); // (symbolic links are followed by default)
} catch (FileNotFoundException | NoSuchFileException e) {
return false;
} catch (IOException e) {
throw new UncheckedIOException(e.getMessage(), e);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright (c) 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.helidon.integrations.oci.sdk.cdi;

import org.junit.jupiter.api.Test;

import static io.helidon.integrations.oci.sdk.cdi.OkeWorkloadIdentityAdpSupplier.available;

class TestOkeWorkloadIdentityAdpSupplier {

private TestOkeWorkloadIdentityAdpSupplier() {
super();
}

@Test
void testAvailability() {
available(); // make sure this does not throw any exception, whether its backing file exists or not
}

}