Skip to content

Configure SecretsResolver in RPM #22991

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
Praveen2112 merged 1 commit into from
Aug 9, 2024
Merged

Configure SecretsResolver in RPM #22991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/trino-server-rpm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ After installing Trino from the RPM, you can run:
We use the following directory structure to deploy various Trino artifacts.

* `/usr/lib/trino/lib/`: Various libraries needed to run the product. Plugins go in a `plugin` subdirectory.
* `/etc/trino`: General Trino configuration files like `node.properties`, `jvm.config`, `config.properties`. Connector configs go in a `catalog` subdirectory
* `/etc/trino`: General Trino configuration files like `node.properties`, `jvm.config`, `config.properties`, `secrets.toml`. Connector configs go in a `catalog` subdirectory
* `/etc/trino/env.sh`: Java installation path used by Trino
* `/var/log/trino`: Log files
* `/var/lib/trino/data`: Data directory
Expand Down
2 changes: 2 additions & 0 deletions core/trino-server-rpm/src/main/resources/dist/config/secrets.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[env]
secrets-provider.name="env"
1 change: 1 addition & 0 deletions core/trino-server-rpm/src/main/resources/dist/etc/init.d/trino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ CONFIGURATION=(
--node-config "$NODE_PROPERTIES"
--jvm-config /etc/trino/jvm.config
--config /etc/trino/config.properties
--secrets-config /etc/trino/secrets.toml
--launcher-log-file "${LAUNCHER_LOG_FILE:-/var/log/trino/launcher.log}"
--server-log-file "${SERVER_LOG_FILE:-/var/log/trino/server.log}"
)
Expand Down
6 changes: 6 additions & 0 deletions core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ public void testRpmContents()
assertThatPaths(files)
Copy link
Copy Markdown
Member

@kokosing kokosing Aug 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have similar test for DockerIT?

Copy link
Copy Markdown
Member Author

@Praveen2112 Praveen2112 Aug 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could have something similar to it

Copy link
Copy Markdown
Member Author

@Praveen2112 Praveen2112 Aug 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DockerIT test is not available but we could work on something similar.

.path("/usr/lib/trino/etc").linksTo("/etc/trino")
.exists("/etc/trino/config.properties")
.exists("/etc/trino/secrets.toml")
.exists("/etc/trino/jvm.config")
.exists("/etc/trino/env.sh")
.exists("/etc/trino/log.properties")
Expand All @@ -190,6 +191,11 @@ public void testRpmContents()
.paths("/usr/lib/trino/plugin/[a-z_]+\\.jar", path -> {
String filename = Path.of(path.getPath()).getFileName().toString();
path.isLink().linksTo("../../shared/" + filename);
})
// secrets-plugins libs are always hardlinks
.paths("/usr/lib/trino/secrets-plugin/[a-z_]+\\.jar", path -> {
String filename = Path.of(path.getPath()).getFileName().toString();
path.isLink().linksTo("../../shared/" + filename);
});
}
}
Expand Down