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

DATAGO-78232: Add new spring variable to override the use of user.home #189

Merged
merged 1 commit into from
Jun 28, 2024
Merged

DATAGO-78232: Add new spring variable to override the use of user.home #189

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 service/application/src/main/resources/command-configs.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
COMMAND_PATH=${user.home}${file.separator}commands
COMMAND_PATH=${app.commandroot:-${user.home}}${file.separator}commands
2 changes: 1 addition & 1 deletion ...ce/maas/ep/event/management/agent/plugin/terraform/configuration/TerraformProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
@Service
@Data
public class TerraformProperties {
@Value("${COMMAND_PATH:${user.home}${file.separator}tfcommands}")
@Value("${app.commandroot:${user.home}}${file.separator}tfcommands")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need to update README instructions to include this new variable for those running EMA locally as a docker container?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This issue seems to be specific to the way we are deploying the container in k8s. I'm not sure if it's a rootless deployment or something, but this issue does not occur when running the docker container using the commands in the README. If you don't specify the app.commandroot Spring variable, it defaults to the previous behaviour of using the user.home as the root for the command and tfcommand directories so a user following instructions from our README will see no change.
If you'd like, I can add a section explaining how the new app.commandroot spring variable works and how they can use it to customize where the logs and terraform artifacts are created. Let me know and I can add it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I see, ok let's leave things this level of flexibility is not needed for local users. If some asks for it we can update the readme of how to do it.

private String workingDirectoryRoot;
}
Loading