Skip to content

Add getSecret method to ProjectMetadata #125830

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 4 commits into from
Apr 2, 2025
Merged

Add getSecret method to ProjectMetadata #125830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d78963
Add getSecret method to ProjectState
jfreden Mar 28, 2025
a37e4f8
fixup! Code review comment
jfreden Mar 28, 2025
643c624
Add hasProject method
jfreden Mar 31, 2025
123298d
Merge remote-tracking branch 'upstream/main' into project_file_realm
jfreden Mar 31, 2025
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
6 changes: 6 additions & 0 deletions server/src/main/java/org/elasticsearch/cluster/metadata/ProjectMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.VersionedNamedWriteable;
import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.common.settings.ProjectSecrets;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.ArrayUtils;
import org.elasticsearch.common.util.Maps;
Expand Down Expand Up @@ -1103,6 +1105,10 @@ static boolean isStateEquals(ProjectMetadata project1, ProjectMetadata project2)
return true;
}

public Optional<SecureString> getSecret(String key) {
return Optional.ofNullable(this.<ProjectSecrets>custom(ProjectSecrets.TYPE)).map(secrets -> secrets.getSettings().getString(key));
}

public static ProjectMetadata.Builder builder(ProjectId id) {
return new ProjectMetadata.Builder().id(id);
}
Expand Down
8 changes: 8 additions & 0 deletions server/src/main/java/org/elasticsearch/cluster/project/ProjectResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ default ProjectMetadata getProjectMetadata(ClusterState clusterState) {
return getProjectMetadata(clusterState.metadata());
}

default boolean hasProject(ClusterState clusterState) {
return hasProject(clusterState.metadata());
}

default boolean hasProject(Metadata metadata) {
return metadata.hasProject(getProjectId());
}

// TODO: What happens if the context does not have a project? throw or return null?
default ProjectState getProjectState(ClusterState clusterState) {
final ProjectId id = getProjectId();
Expand Down