config env vars must be set only on startup (#36)

* config env vars must be set only on startup, not on the fly

Author: dinuta

.circleci/config.yml

@@ -22,7 +22,7 @@ jobs: # a collection of steps
             - ~/.m2
           key: estuary-agent-{{ checksum "pom.xml" }}
       - run:
-          command: wget https://estuary-agent-go.s3.eu-central-1.amazonaws.com/4.1.0/runcmd-linux
+          command: wget https://github.com/estuaryoss/runcmd/releases/download/1.0.0/runcmd-linux
           name: "download runcmd-linux"
       - run:
           command: mv runcmd-linux  runcmd
@@ -52,5 +52,5 @@ jobs: # a collection of steps
 
       - store_artifacts: # store the jar as an artifact
           # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
-          path: target/agent-4.2.0-SNAPSHOT-exec.jar
+          path: target/agent-4.2.2-SNAPSHOT-exec.jar
       # See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples

Dockerfile

@@ -9,7 +9,7 @@ ENV COMMAND_TIMEOUT 1200
 RUN mkdir $APP_DIR
 WORKDIR $APP_DIR
 
-COPY target/agent-4.2.1-SNAPSHOT-exec.jar $APP_DIR/agent-exec.jar
+COPY target/agent-4.2.2-SNAPSHOT-exec.jar $APP_DIR/agent-exec.jar
 ADD https://estuary-agent-go.s3.eu-central-1.amazonaws.com/4.1.0/runcmd-linux $APP_DIR/runcmd
 COPY https $APP_DIR/https
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.estuaryoss</groupId>
     <artifactId>agent</artifactId>
-    <version>4.2.1-SNAPSHOT</version>
+    <version>4.2.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Estuary Agent</name>

src/main/java/com/github/estuaryoss/agent/api/ApiOriginFilter.java

@@ -48,7 +48,7 @@ public void doFilter(ServletRequest request, ServletResponse response,
         log.debug(HeaderConstants.X_REQUEST_ID + " : " + xRequestId);
 
         if (!(String.valueOf(tokenHeader)
-                .equals(String.valueOf(environment.getEnvAndVirtualEnv().get(HTTP_AUTH_TOKEN))))) {
+                .equals(String.valueOf(environment.getEnv().get(HTTP_AUTH_TOKEN))))) {
             httpResponse.sendError(HttpStatus.UNAUTHORIZED.value());
             return;
         }

src/main/java/com/github/estuaryoss/agent/configuration/SwaggerConfig.java

@@ -19,7 +19,7 @@ public class SwaggerConfig {
     ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 .title("estuary-agent")
-                .description("Estuary agent will run your shell commands via REST API")
+                .description("Estuary Agent will run your shell commands via REST API")
                 .license("Apache 2.0")
                 .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
                 .termsOfServiceUrl("")

src/main/java/com/github/estuaryoss/agent/service/FluentdService.java

@@ -99,7 +99,7 @@ private String emit(String loggingLevel, EnrichedMessage message) {
             enrichedMsgCopy.setMsg(parentMessage);
         }
 
-        if (virtualEnvironment.getEnvAndVirtualEnv().get(EnvConstants.FLUENTD_IP_PORT) == null) {
+        if (virtualEnvironment.getEnv().get(EnvConstants.FLUENTD_IP_PORT) == null) {
             return String.format("Fluentd logging not enabled",
                     EnvConstants.FLUENTD_IP_PORT);
         }