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.

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

Jump to bottom

Fix for using GCP Application Default Credentials #1

Closed
wants to merge 4 commits into from
Closed

Fix for using GCP Application Default Credentials #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13394b6
fix to use GCP Application Default Credentials
fahadshamiinsta Jun 26, 2023
2e6b31e
added space
fahadshamiinsta Jun 27, 2023
95cc347
removed unused imports
fahadshamiinsta Jun 27, 2023
2845c07
PR comments
fahadshamiinsta Jun 28, 2023
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
12 changes: 8 additions & 4 deletions ...pository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.auth.oauth2.ServiceAccountCredentials;
import com.google.cloud.ServiceOptions;
import com.google.cloud.http.HttpTransportOptions;
Expand Down Expand Up @@ -214,10 +215,13 @@ StorageOptions createStorageOptions(
storageOptionsBuilder.setProjectId(clientSettings.getProjectId());
}
if (clientSettings.getCredential() == null) {
logger.warn(
"\"Application Default Credentials\" are not supported out of the box."
+ " Additional file system permissions have to be granted to the plugin."
);
logger.info("\"Application Default Credentials\" will be in use");
try {
fahadshamiinsta marked this conversation as resolved.
Show resolved Hide resolved
final GoogleCredentials credentials = SocketAccess.doPrivilegedIOException(() -> GoogleCredentials.getApplicationDefault());
storageOptionsBuilder.setCredentials(credentials);
} catch(IOException e) {
logger.error("Failed to retrieve \"Application Default Credentials\"", e);
}
} else {
ServiceAccountCredentials serviceAccountCredentials = clientSettings.getCredential();
// override token server URI
Expand Down