Skip to content

Include new oracle nosql deployment type #294

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

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Include new oracle nosql deployment type #294

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
316068c
feat: include cloud_oke workload
otaviojava Nov 11, 2024
e7da0e0
feat: include deployment type
otaviojava Nov 11, 2024
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
33 changes: 21 additions & 12 deletions ...nosql/src/main/java/org/eclipse/jnosql/databases/oracle/communication/DeploymentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public enum DeploymentType implements Function<Settings, Optional<AuthorizationP
* Usage: Choose this deployment type when your software solutions are hosted and managed within your organization's physical infrastructure.
* - Authentication: Uses username and password for access.
* - Configuration: Requires USER (username) and PASSWORD (password).
* If not provided, it falls back to default values or empty credentials.
* If not provided, it falls back to default values or empty credentials.
*/
ON_PREMISES {
@Override
Expand All @@ -47,7 +47,7 @@ public Optional<AuthorizationProvider> apply(Settings settings) {
String password = settings.get(List.of(OracleNoSQLConfigurations.PASSWORD.get(), Configurations.PASSWORD.get()))
.map(Object::toString).orElse(null);
if (user != null && password != null) {
return Optional.of(new StoreAccessTokenProvider(user, password.toCharArray()));
return Optional.of(new StoreAccessTokenProvider(user, password.toCharArray()));
} else {
return Optional.of(new StoreAccessTokenProvider());
}
Expand All @@ -67,18 +67,18 @@ public Optional<AuthorizationProvider> apply(Settings settings) {
char[] password = settings.get(List.of(OracleNoSQLConfigurations.PASSWORD.get(), Configurations.PASSWORD.get()))
.map(Object::toString).map(String::toCharArray).orElse(new char[0]);
String tenantId = settings.get(OracleNoSQLConfigurations.TENANT, String.class).orElse(null);
String fingerprint= settings.get(OracleNoSQLConfigurations.FINGERPRINT, String.class).orElse(null);
String fingerprint = settings.get(OracleNoSQLConfigurations.FINGERPRINT, String.class).orElse(null);
String privateKey = settings.get(OracleNoSQLConfigurations.PRIVATE_KEY, String.class).orElse(null);
String profileName = settings.get(OracleNoSQLConfigurations.PROFILE_NAME, String.class).orElse(null);
String configFile = settings.get(OracleNoSQLConfigurations.CONFIG_FILE, String.class).orElse(null);

if(user != null && tenantId != null && fingerprint != null && privateKey != null) {
if (user != null && tenantId != null && fingerprint != null && privateKey != null) {
return Optional.of(new SignatureProvider(tenantId, user, fingerprint, new File(privateKey), password));
}
try {
if(profileName != null && configFile != null) {
if (profileName != null && configFile != null) {
return Optional.of(new SignatureProvider(configFile, profileName));
} else if(profileName != null) {
} else if (profileName != null) {
return Optional.of(new SignatureProvider(profileName));
}
return Optional.of(new SignatureProvider());
Expand Down Expand Up @@ -125,14 +125,24 @@ public Optional<AuthorizationProvider> apply(Settings settings) {

String profileName = settings.get(OracleNoSQLConfigurations.PROFILE_NAME, String.class).orElse(null);
String configFile = settings.get(OracleNoSQLConfigurations.CONFIG_FILE, String.class).orElse(null);
if(profileName != null && configFile != null) {
if (profileName != null && configFile != null) {
return Optional.of(SignatureProvider.createWithSessionToken(configFile, profileName));
} else if(profileName != null) {
} else if (profileName != null) {
return Optional.of(SignatureProvider.createWithSessionToken(profileName));
} else {
} else {
return Optional.of(SignatureProvider.createWithSessionToken());
}
}
},

/**
* Represents a "Cloud" deployment using OKE workload identity for authentication and authorization.
*/
CLOUD_OKE_WORKLOAD_IDENTITY {
@Override
public Optional<AuthorizationProvider> apply(Settings settings) {
return Optional.of(SignatureProvider.createWithOkeWorkloadIdentity());
}
};


Expand All @@ -142,12 +152,11 @@ public Optional<AuthorizationProvider> apply(Settings settings) {
*
* @param value the string representation of the deployment type (case-insensitive)
* @return the corresponding {@link DeploymentType} enum value, or {@link DeploymentType#ON_PREMISES}
* if the input is invalid or null
*
* if the input is invalid or null
*/
public static DeploymentType parse(String value) {
try {
if(value == null) {
if (value == null) {
return DeploymentType.ON_PREMISES;
}
return DeploymentType.valueOf(value.toUpperCase());
Expand Down