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.

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

Deploy configurations #3751

Merged
merged 18 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix build failure
Add new line

Rename .env file

Rename .env file
  • Loading branch information
kalaiyarasiganeshalingam committed Nov 21, 2024
commit 5246e9f6f2cdd7b250bcc540ca2e2bbb775d9575
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ typings/
# dotenv environment variables file
.env
.env.test
!test.env

# parcel-bundler cache (https://parceljs.org/)
.cache
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,21 @@ public String getMessageString() {
public void setMessageFlowTracingState(int tracingState){
}

@Override
public Object getVariable(String s) {
return null;
}

@Override
public void setVariable(String s, Object o) {
//
}

@Override
public Set getVariableKeySet() {
return null;
}

public int getMessageFlowTracingState(){
return SynapseConstants.TRACING_OFF;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,4 @@ public String getHome() {
public String getSystemDependentPath(String path) {
return path.replace(URL_SEPARATOR_CHAR, File.separatorChar);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void testConfigurablePropertyWithSystemProperty() throws IOException, Aut
@Test(groups = {"wso2.esb"}, description = "Configurable property", priority = 3)
public void testConfigurablePropertyWithEnvVariable() throws IOException, AutomationUtilException {
Map<String, String> commands = new HashMap<>();
commands.put("--env-file", FrameworkPathUtil.getSystemResourceLocation() + ".env");
commands.put("--env-file", FrameworkPathUtil.getSystemResourceLocation() + "test.env");
serverConfigurationManager.restartMicroIntegrator(commands);
Map<String, String> headers = new HashMap<>();
URL endpoint = new URL(getApiInvocationURL("apiConfig/test"));
Expand All @@ -72,7 +72,7 @@ public void testConfigurableProperty() throws IOException, AutomationUtilExcepti
Map<String, String> commands = new HashMap<>();
commands.put("-Dname", "sys");
commands.put("-Dmsg", "Hi");
commands.put("--env-file", FrameworkPathUtil.getSystemResourceLocation() + ".env");
commands.put("--env-file", FrameworkPathUtil.getSystemResourceLocation() + "test.env");
serverConfigurationManager.restartMicroIntegrator(commands);
Map<String, String> headers = new HashMap<>();
URL endpoint = new URL(getApiInvocationURL("apiConfig/test"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
import org.wso2.carbon.automation.engine.frameworkutils.FrameworkPathUtil;
import org.wso2.carbon.automation.test.utils.http.client.HttpRequestUtil;
import org.wso2.carbon.automation.test.utils.http.client.HttpResponse;
import org.wso2.carbon.base.CarbonBaseUtils;
import org.wso2.carbon.integration.common.utils.exceptions.AutomationUtilException;
import org.wso2.esb.integration.common.utils.ESBIntegrationTest;
import org.wso2.esb.integration.common.utils.common.ServerConfigurationManager;

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
Expand Down Expand Up @@ -72,7 +70,7 @@ public void testConfigurablePropertyWithSystemProperty() throws IOException, Aut
@Test(groups = {"wso2.esb"}, description = "Configurable property", priority = 3)
public void testConfigurablePropertyWithEnvVariable() throws IOException, AutomationUtilException {
Map<String, String> commands = new HashMap<>();
commands.put("--env-file", FrameworkPathUtil.getSystemResourceLocation() + ".env");
commands.put("--env-file", FrameworkPathUtil.getSystemResourceLocation() + "test.env");
serverConfigurationManager.restartMicroIntegrator(commands);
Map<String, String> headers = new HashMap<>();
URL endpoint = new URL(getApiInvocationURL("getdata/env"));
Expand All @@ -85,7 +83,7 @@ public void testConfigurablePropertyWithEnvVariable() throws IOException, Automa
public void testConfigurableProperty() throws IOException, AutomationUtilException {
Map<String, String> commands = new HashMap<>();
commands.put("-Dcommon_url", "http://localhost:8480/endpoint/sys");
commands.put("--env-file", FrameworkPathUtil.getSystemResourceLocation() + ".env");
commands.put("--env-file", FrameworkPathUtil.getSystemResourceLocation() + "test.env");
serverConfigurationManager.restartMicroIntegrator(commands);
Map<String, String> headers = new HashMap<>();
URL endpoint = new URL(getApiInvocationURL("getdata/common"));
Expand Down