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

#298: refactoring setting environment variables #1098

Merged
merged 11 commits into from
Mar 7, 2025
Merged

#298: refactoring setting environment variables #1098

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
211a00e
#298: refactoring setting environment variables
paz-capgemini Feb 28, 2025
627e8bf
Merge branch 'devonfw:main' into feature/298-refactoring-environment-…
paz-capgemini Mar 3, 2025
c20a447
#298: remove unnecessary setting of environment variable for graalvm
paz-capgemini Mar 3, 2025
cee0a09
Merge branch 'main' into feature/298-refactoring-environment-variables
jan-vcapgemini Mar 3, 2025
9dc3fbe
#298: remove unnecessary override of method
paz-capgemini Mar 5, 2025
f7c1cfd
Merge branch 'main' into feature/298-refactoring-environment-variables
paz-capgemini Mar 5, 2025
e766682
Merge branch 'main' into feature/298-refactoring-environment-variables
paz-capgemini Mar 6, 2025
98733bf
#298: add tests for Aws
paz-capgemini Mar 6, 2025
7060bf6
#298: add execute permissions for linux install script
paz-capgemini Mar 6, 2025
8b87187
#298: remove disabled test
paz-capgemini Mar 6, 2025
0f7ef84
#298: fix test
paz-capgemini Mar 6, 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
20 changes: 11 additions & 9 deletions cli/src/main/java/com/devonfw/tools/ide/tool/aws/Aws.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

import com.devonfw.tools.ide.common.Tag;
import com.devonfw.tools.ide.context.IdeContext;
import com.devonfw.tools.ide.environment.EnvironmentVariables;
import com.devonfw.tools.ide.environment.EnvironmentVariablesType;
import com.devonfw.tools.ide.io.FileAccess;
import com.devonfw.tools.ide.nls.NlsBundle;
import com.devonfw.tools.ide.process.EnvironmentContext;
import com.devonfw.tools.ide.process.ProcessContext;
import com.devonfw.tools.ide.tool.LocalToolCommandlet;
import com.devonfw.tools.ide.tool.ToolInstallation;

/**
* {@link LocalToolCommandlet} for <a href="https://docs.aws.amazon.com/cli/">AWS CLI</a> (Amazon Web Services Command Line Interface).
Expand All @@ -32,15 +32,8 @@ public Aws(IdeContext context) {
public void postInstall() {

super.postInstall();
EnvironmentVariables variables = this.context.getVariables();
EnvironmentVariables typeVariables = variables.getByType(EnvironmentVariablesType.CONF);
Path awsConfigDir = this.context.getConfPath().resolve("aws");
this.context.getFileAccess().mkdirs(awsConfigDir);
Path awsConfigFile = awsConfigDir.resolve("config");
Path awsCredentialsFile = awsConfigDir.resolve("credentials");
typeVariables.set("AWS_CONFIG_FILE", awsConfigFile.toString(), true);
typeVariables.set("AWS_SHARED_CREDENTIALS_FILE", awsCredentialsFile.toString(), true);
typeVariables.save();
}

@Override
Expand Down Expand Up @@ -78,4 +71,13 @@ public void printHelp(NlsBundle bundle) {
this.context.info("To get detailed help about the usage of the AWS CLI, use \"aws help\"");
}

@Override
public void setEnvironment(EnvironmentContext environmentContext, ToolInstallation toolInstallation, boolean extraInstallation) {

super.setEnvironment(environmentContext, toolInstallation, extraInstallation);
Path awsConfigDir = this.context.getConfPath().resolve("aws");
environmentContext.withEnvVar("AWS_CONFIG_FILE", awsConfigDir.resolve("config").toString());
environmentContext.withEnvVar("AWS_SHARED_CREDENTIALS_FILE", awsConfigDir.resolve("credentials").toString());
}

}
16 changes: 9 additions & 7 deletions cli/src/main/java/com/devonfw/tools/ide/tool/az/Azure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import com.devonfw.tools.ide.common.Tag;
import com.devonfw.tools.ide.context.IdeContext;
import com.devonfw.tools.ide.environment.EnvironmentVariables;
import com.devonfw.tools.ide.environment.EnvironmentVariablesType;
import com.devonfw.tools.ide.process.EnvironmentContext;
import com.devonfw.tools.ide.tool.LocalToolCommandlet;
import com.devonfw.tools.ide.tool.ToolCommandlet;
import com.devonfw.tools.ide.tool.ToolInstallation;

/**
* {@link ToolCommandlet} for azure CLI (azure).
Expand All @@ -30,11 +30,6 @@ public Azure(IdeContext context) {
public void postInstall() {

super.postInstall();

EnvironmentVariables variables = this.context.getVariables();
EnvironmentVariables typeVariables = variables.getByType(EnvironmentVariablesType.CONF);
typeVariables.set("AZURE_CONFIG_DIR", this.context.getConfPath().resolve(".azure").toString(), true);
typeVariables.save();
this.context.getFileAccess().symlink(Path.of("wbin"), getToolPath().resolve("bin"));
}

Expand All @@ -43,4 +38,11 @@ public String getToolHelpArguments() {

return "-h";
}

@Override
public void setEnvironment(EnvironmentContext environmentContext, ToolInstallation toolInstallation, boolean extraInstallation) {

super.setEnvironment(environmentContext, toolInstallation, extraInstallation);
environmentContext.withEnvVar("AZURE_CONFIG_DIR", this.context.getConfPath().resolve(".azure").toString());
}
}
7 changes: 0 additions & 7 deletions cli/src/main/java/com/devonfw/tools/ide/tool/graalvm/GraalVm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@

import com.devonfw.tools.ide.common.Tag;
import com.devonfw.tools.ide.context.IdeContext;
import com.devonfw.tools.ide.environment.EnvironmentVariables;
import com.devonfw.tools.ide.environment.EnvironmentVariablesType;
import com.devonfw.tools.ide.tool.LocalToolCommandlet;
import com.devonfw.tools.ide.tool.ToolCommandlet;
import com.devonfw.tools.ide.tool.plugin.PluginBasedCommandlet;
import com.devonfw.tools.ide.version.VersionIdentifier;

/**
Expand Down Expand Up @@ -48,9 +44,6 @@ protected String getBinaryName() {
@Override
public void postInstall() {

EnvironmentVariables envVars = this.context.getVariables().getByType(EnvironmentVariablesType.CONF);
envVars.set("GRAALVM_HOME", getToolPath().toString(), true);
envVars.save();
super.postInstall();
}

Expand Down