From a081886e9b9f4834c3f68dbb6a97d8aa393ff462 Mon Sep 17 00:00:00 2001
From: "John E. Lazos" <jelazos7@gmail.com>
Date: Tue, 6 Nov 2018 14:05:21 -0500
Subject: [PATCH] Cloudforge review (#56)

* Removed session credentials from toString to prevent secret exposure

* Exclude logging libraries to prevent issues with atlassian libs
---
 pom.xml                                             | 13 +++++++++++--
 .../herman/aws/cft/CftPushContext.java              |  1 -
 .../herman/aws/ecs/EcsPushContext.java              |  1 -
 .../herman/aws/ecs/broker/s3/S3CreateContext.java   |  1 -
 .../herman/aws/lambda/LambdaPushContext.java        |  1 -
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 71dca78..b668238 100644
--- a/pom.xml
+++ b/pom.xml
@@ -385,13 +385,11 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Maven Shade Plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <version>3.1.1</version>
         <executions>
-          <!-- Run shade goal on package phase -->
           <execution>
             <phase>package</phase>
             <goals>
@@ -410,6 +408,17 @@
                   </manifestEntries>
                 </transformer>
               </transformers>
+              <artifactSet>
+                <!-- Bringing in additional logging libraries into the atlassian tools can cause adverse effects -->
+                <!-- safeguard for excluding logging libraries-->
+                <excludes>
+                  <exclude>ch.qos.logback:*</exclude>
+                  <exclude>org.apache.logging.log4j:*</exclude>
+                  <exclude>log4j:*</exclude>
+                  <exclude>org.slf4j:*</exclude>
+                  <exclude>commons-logging:*</exclude>
+                </excludes>
+              </artifactSet>
             </configuration>
           </execution>
         </executions>
diff --git a/src/main/java/com/libertymutualgroup/herman/aws/cft/CftPushContext.java b/src/main/java/com/libertymutualgroup/herman/aws/cft/CftPushContext.java
index 063ba66..0de46f3 100644
--- a/src/main/java/com/libertymutualgroup/herman/aws/cft/CftPushContext.java
+++ b/src/main/java/com/libertymutualgroup/herman/aws/cft/CftPushContext.java
@@ -148,7 +148,6 @@ public String toString() {
             "logger=" + logger +
             ", propertyHandler=" + propertyHandler +
             ", envName='" + envName + '\'' +
-            ", sessionCredentials=" + sessionCredentials +
             ", awsClientConfig=" + awsClientConfig +
             ", region=" + region +
             ", rootPath='" + rootPath + '\'' +
diff --git a/src/main/java/com/libertymutualgroup/herman/aws/ecs/EcsPushContext.java b/src/main/java/com/libertymutualgroup/herman/aws/ecs/EcsPushContext.java
index 92a2825..7cb985d 100644
--- a/src/main/java/com/libertymutualgroup/herman/aws/ecs/EcsPushContext.java
+++ b/src/main/java/com/libertymutualgroup/herman/aws/ecs/EcsPushContext.java
@@ -170,7 +170,6 @@ public String toString() {
             "logger=" + logger +
             ", propertyHandler=" + propertyHandler +
             ", envName='" + envName + '\'' +
-            ", sessionCredentials=" + sessionCredentials +
             ", awsClientConfig=" + awsClientConfig +
             ", region=" + region +
             ", timeout=" + timeout +
diff --git a/src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/s3/S3CreateContext.java b/src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/s3/S3CreateContext.java
index fff69f0..3f060c7 100644
--- a/src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/s3/S3CreateContext.java
+++ b/src/main/java/com/libertymutualgroup/herman/aws/ecs/broker/s3/S3CreateContext.java
@@ -143,7 +143,6 @@ public String toString() {
         return "S3CreateContext{" +
             "logger=" + logger +
             ", propertyHandler=" + propertyHandler +
-            ", sessionCredentials=" + sessionCredentials +
             ", region=" + region +
             ", rootPath='" + rootPath + '\'' +
             ", taskProperties=" + taskProperties +
diff --git a/src/main/java/com/libertymutualgroup/herman/aws/lambda/LambdaPushContext.java b/src/main/java/com/libertymutualgroup/herman/aws/lambda/LambdaPushContext.java
index 6288c2b..481ede7 100644
--- a/src/main/java/com/libertymutualgroup/herman/aws/lambda/LambdaPushContext.java
+++ b/src/main/java/com/libertymutualgroup/herman/aws/lambda/LambdaPushContext.java
@@ -98,7 +98,6 @@ public LambdaPushContext withTaskProperties(
     @Override
     public String toString() {
         return "LambdaPushContext{" +
-            "sessionCredentials=" + sessionCredentials +
             ", rootPath='" + rootPath + '\'' +
             ", bambooPropertyHandler=" + bambooPropertyHandler +
             ", logger=" + logger +