From 3d506d5e05b55d1cd2891ac59bb0def94cf6fc78 Mon Sep 17 00:00:00 2001
From: Shaun Ford <shaun.ford@nike.com>
Date: Thu, 20 Jul 2017 10:10:02 -0700
Subject: [PATCH] Allow X-Cerberus-Client override + update copyright

---
 build.gradle                                  |  2 +-
 codequality/suppressions.xml                  |  2 +-
 gradle.properties                             |  4 +--
 gradle/bintray.gradle                         |  2 +-
 gradle/buildscript.gradle                     |  2 +-
 gradle/check.gradle                           |  2 +-
 gradle/dependencies.gradle                    |  2 +-
 gradle/integration.gradle                     |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle                               |  2 +-
 .../client/auth/aws/VaultClientTest.java      | 16 +++++++++++
 .../nike/cerberus/client/ClientVersion.java   | 16 +++++++++++
 .../client/DefaultCerberusClientFactory.java  |  2 +-
 .../client/DefaultCerberusUrlResolver.java    |  2 +-
 ...faultCerberusCredentialsProviderChain.java | 25 ++++++++++++++++-
 ...nvironmentCerberusCredentialsProvider.java |  2 +-
 ...emPropertyCerberusCredentialsProvider.java |  2 +-
 .../auth/aws/BaseAwsCredentialsProvider.java  | 16 ++++++++++-
 ...nceProfileArnVaultCredentialsProvider.java | 27 +++++++++++++++++++
 ...stanceProfileVaultCredentialsProvider.java | 27 +++++++++++++++++++
 .../InstanceRoleVaultCredentialsProvider.java | 13 ++++++++-
 .../LambdaRoleVaultCredentialsProvider.java   |  2 +-
 ...StaticIamRoleVaultCredentialsProvider.java | 16 +++++++++++
 .../resources/cerberus-java-client.properties | 16 +++++++++++
 .../cerberus/client/ClientVersionTest.java    | 16 +++++++++++
 .../DefaultCerberusClientFactoryTest.java     | 16 +++++++++++
 .../DefaultCerberusUrlResolverTest.java       |  2 +-
 ...tCerberusCredentialsProviderChainTest.java |  2 +-
 ...onmentCerberusCredentialsProviderTest.java |  2 +-
 ...opertyCerberusCredentialsProviderTest.java |  2 +-
 .../aws/BaseAwsCredentialsProviderTest.java   | 16 +++++++++++
 .../auth/aws/BaseCredentialsProviderTest.java | 16 +++++++++++
 ...ceProfileVaultCredentialsProviderTest.java | 16 +++++++++++
 ...tanceRoleVaultCredentialsProviderTest.java |  2 +-
 ...ambdaRoleVaultCredentialsProviderTest.java | 16 +++++++++++
 ...icIamRoleVaultCredentialsProviderTest.java | 16 +++++++++++
 36 files changed, 302 insertions(+), 24 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3b931ad..2f90b26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/codequality/suppressions.xml b/codequality/suppressions.xml
index b57b7b3..26d6174 100644
--- a/codequality/suppressions.xml
+++ b/codequality/suppressions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  ~ Copyright (c) 2016 Nike, Inc.
+  ~ Copyright (c) 2017 Nike, Inc.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/gradle.properties b/gradle.properties
index cab3a17..1b371a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 Nike, Inc.
+# Copyright (c) 2017 Nike, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=2.4.0
+version=3.0.0
 groupId=com.nike
 artifactId=cerberus-client
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
index c38c1b8..f682992 100644
--- a/gradle/bintray.gradle
+++ b/gradle/bintray.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle
index 6019a59..e95b084 100644
--- a/gradle/buildscript.gradle
+++ b/gradle/buildscript.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gradle/check.gradle b/gradle/check.gradle
index 96dac07..4a2ab70 100644
--- a/gradle/check.gradle
+++ b/gradle/check.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 53e4187..478fde5 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gradle/integration.gradle b/gradle/integration.gradle
index 38a8acb..a7fa769 100644
--- a/gradle/integration.gradle
+++ b/gradle/integration.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7131545..d6a4f0f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016 Nike, Inc.
+# Copyright (c) 2017 Nike, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/settings.gradle b/settings.gradle
index 7a9c03e..e430f56 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/integration/java/com/nike/cerberus/client/auth/aws/VaultClientTest.java b/src/integration/java/com/nike/cerberus/client/auth/aws/VaultClientTest.java
index e27cc17..11c270b 100644
--- a/src/integration/java/com/nike/cerberus/client/auth/aws/VaultClientTest.java
+++ b/src/integration/java/com/nike/cerberus/client/auth/aws/VaultClientTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.fieldju.commons.EnvUtils;
diff --git a/src/main/java/com/nike/cerberus/client/ClientVersion.java b/src/main/java/com/nike/cerberus/client/ClientVersion.java
index 3877801..24e2e36 100644
--- a/src/main/java/com/nike/cerberus/client/ClientVersion.java
+++ b/src/main/java/com/nike/cerberus/client/ClientVersion.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client;
 
 import org.slf4j.Logger;
diff --git a/src/main/java/com/nike/cerberus/client/DefaultCerberusClientFactory.java b/src/main/java/com/nike/cerberus/client/DefaultCerberusClientFactory.java
index 75c841e..0fa4f4d 100644
--- a/src/main/java/com/nike/cerberus/client/DefaultCerberusClientFactory.java
+++ b/src/main/java/com/nike/cerberus/client/DefaultCerberusClientFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/nike/cerberus/client/DefaultCerberusUrlResolver.java b/src/main/java/com/nike/cerberus/client/DefaultCerberusUrlResolver.java
index 71a59ac..fb6fc7a 100644
--- a/src/main/java/com/nike/cerberus/client/DefaultCerberusUrlResolver.java
+++ b/src/main/java/com/nike/cerberus/client/DefaultCerberusUrlResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/nike/cerberus/client/auth/DefaultCerberusCredentialsProviderChain.java b/src/main/java/com/nike/cerberus/client/auth/DefaultCerberusCredentialsProviderChain.java
index 855b708..3de46ea 100644
--- a/src/main/java/com/nike/cerberus/client/auth/DefaultCerberusCredentialsProviderChain.java
+++ b/src/main/java/com/nike/cerberus/client/auth/DefaultCerberusCredentialsProviderChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,4 +57,27 @@ public DefaultCerberusCredentialsProviderChain(UrlResolver urlResolver) {
                 new InstanceProfileArnVaultCredentialsProvider(urlResolver),
                 new InstanceRoleVaultCredentialsProvider(urlResolver));
     }
+
+    /**
+     * Constructor that sets up a provider chain using the specified implementation of UrlResolver.
+     *
+     * @param xCerberusClientOverride - Overrides the default header value for the 'X-Cerberus-Client' header
+     */
+    public DefaultCerberusCredentialsProviderChain(String xCerberusClientOverride) {
+        this(new DefaultCerberusUrlResolver(), xCerberusClientOverride);
+    }
+
+    /**
+     * Constructor that sets up a provider chain using the specified implementation of UrlResolver.
+     *
+     * @param urlResolver Resolves the Cerberus URL
+     * @param xCerberusClientOverride - Overrides the default header value for the 'X-Cerberus-Client' header
+     */
+    public DefaultCerberusCredentialsProviderChain(UrlResolver urlResolver, String xCerberusClientOverride) {
+        super(new EnvironmentCerberusCredentialsProvider(),
+                new SystemPropertyCerberusCredentialsProvider(),
+                new InstanceProfileVaultCredentialsProvider(urlResolver, xCerberusClientOverride),
+                new InstanceProfileArnVaultCredentialsProvider(urlResolver, xCerberusClientOverride),
+                new InstanceRoleVaultCredentialsProvider(urlResolver, xCerberusClientOverride));
+    }
 }
diff --git a/src/main/java/com/nike/cerberus/client/auth/EnvironmentCerberusCredentialsProvider.java b/src/main/java/com/nike/cerberus/client/auth/EnvironmentCerberusCredentialsProvider.java
index 9eaf031..02d289b 100644
--- a/src/main/java/com/nike/cerberus/client/auth/EnvironmentCerberusCredentialsProvider.java
+++ b/src/main/java/com/nike/cerberus/client/auth/EnvironmentCerberusCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/nike/cerberus/client/auth/SystemPropertyCerberusCredentialsProvider.java b/src/main/java/com/nike/cerberus/client/auth/SystemPropertyCerberusCredentialsProvider.java
index 677c7f8..8ecad5f 100644
--- a/src/main/java/com/nike/cerberus/client/auth/SystemPropertyCerberusCredentialsProvider.java
+++ b/src/main/java/com/nike/cerberus/client/auth/SystemPropertyCerberusCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/nike/cerberus/client/auth/aws/BaseAwsCredentialsProvider.java b/src/main/java/com/nike/cerberus/client/auth/aws/BaseAwsCredentialsProvider.java
index b3308e1..cc8dd59 100644
--- a/src/main/java/com/nike/cerberus/client/auth/aws/BaseAwsCredentialsProvider.java
+++ b/src/main/java/com/nike/cerberus/client/auth/aws/BaseAwsCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -107,6 +107,20 @@ public BaseAwsCredentialsProvider(UrlResolver urlResolver) {
         LOGGER.info("Cerberus URL={}", urlResolver.resolve());
     }
 
+    /**
+     * Constructor to setup credentials provider using the specified
+     * implementation of {@link UrlResolver}
+     *
+     * @param urlResolver Resolver for resolving the Cerberus URL
+     * @param xCerberusClientOverride - Overrides the default header value for the 'X-Cerberus-Client' header
+     */
+    public BaseAwsCredentialsProvider(UrlResolver urlResolver, String xCerberusClientOverride) {
+        super();
+        this.urlResolver = urlResolver;
+        cerberusJavaClientHeaderValue = xCerberusClientOverride;
+        LOGGER.info("Cerberus URL={}", urlResolver.resolve());
+    }
+
     /**
      * Returns the Vault credentials. If none have been acquired yet or has
      * expired, triggers a refresh.
diff --git a/src/main/java/com/nike/cerberus/client/auth/aws/InstanceProfileArnVaultCredentialsProvider.java b/src/main/java/com/nike/cerberus/client/auth/aws/InstanceProfileArnVaultCredentialsProvider.java
index 55179c2..d721ab8 100644
--- a/src/main/java/com/nike/cerberus/client/auth/aws/InstanceProfileArnVaultCredentialsProvider.java
+++ b/src/main/java/com/nike/cerberus/client/auth/aws/InstanceProfileArnVaultCredentialsProvider.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.amazonaws.regions.Region;
@@ -22,6 +38,17 @@ public InstanceProfileArnVaultCredentialsProvider(UrlResolver urlResolver) {
         super(urlResolver);
     }
 
+    /**
+     * Constructor to setup credentials provider using the specified
+     * implementation of {@link UrlResolver}
+     *
+     * @param urlResolver Resolver for resolving the Cerberus URL
+     * @param xCerberusClientOverride - Overrides the default header value for the 'X-Cerberus-Client' header
+     */
+    public InstanceProfileArnVaultCredentialsProvider(UrlResolver urlResolver, String xCerberusClientOverride) {
+        super(urlResolver, xCerberusClientOverride);
+    }
+
     @Override
     protected void authenticate() {
         EC2MetadataUtils.IAMInfo iamInfo = getIamInfo();
diff --git a/src/main/java/com/nike/cerberus/client/auth/aws/InstanceProfileVaultCredentialsProvider.java b/src/main/java/com/nike/cerberus/client/auth/aws/InstanceProfileVaultCredentialsProvider.java
index 60027b7..4c3fc79 100644
--- a/src/main/java/com/nike/cerberus/client/auth/aws/InstanceProfileVaultCredentialsProvider.java
+++ b/src/main/java/com/nike/cerberus/client/auth/aws/InstanceProfileVaultCredentialsProvider.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.amazonaws.regions.Region;
@@ -25,6 +41,17 @@ public InstanceProfileVaultCredentialsProvider(UrlResolver urlResolver) {
         super(urlResolver);
     }
 
+    /**
+     * Constructor to setup credentials provider using the specified
+     * implementation of {@link UrlResolver}
+     *
+     * @param urlResolver Resolver for resolving the Cerberus URL
+     * @param xCerberusClientOverride - Overrides the default header value for the 'X-Cerberus-Client' header
+     */
+    public InstanceProfileVaultCredentialsProvider(UrlResolver urlResolver, String xCerberusClientOverride) {
+        super(urlResolver, xCerberusClientOverride);
+    }
+
     @Override
     protected void authenticate() {
         EC2MetadataUtils.IAMInfo iamInfo = getIamInfo();
diff --git a/src/main/java/com/nike/cerberus/client/auth/aws/InstanceRoleVaultCredentialsProvider.java b/src/main/java/com/nike/cerberus/client/auth/aws/InstanceRoleVaultCredentialsProvider.java
index 068e1fc..dc10953 100644
--- a/src/main/java/com/nike/cerberus/client/auth/aws/InstanceRoleVaultCredentialsProvider.java
+++ b/src/main/java/com/nike/cerberus/client/auth/aws/InstanceRoleVaultCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,17 @@ public InstanceRoleVaultCredentialsProvider(UrlResolver urlResolver) {
         super(urlResolver);
     }
 
+    /**
+     * Constructor to setup credentials provider using the specified
+     * implementation of {@link UrlResolver}
+     *
+     * @param urlResolver Resolver for resolving the Cerberus URL
+     * @param xCerberusClientOverride - Overrides the default header value for the 'X-Cerberus-Client' header
+     */
+    public InstanceRoleVaultCredentialsProvider(UrlResolver urlResolver, String xCerberusClientOverride) {
+        super(urlResolver, xCerberusClientOverride);
+    }
+
     /**
      * Looks up the IAM roles assigned to the instance via the EC2 metadata
      * service. For each role assigned, an attempt is made to authenticate and
diff --git a/src/main/java/com/nike/cerberus/client/auth/aws/LambdaRoleVaultCredentialsProvider.java b/src/main/java/com/nike/cerberus/client/auth/aws/LambdaRoleVaultCredentialsProvider.java
index 11eb6b6..61fb88f 100644
--- a/src/main/java/com/nike/cerberus/client/auth/aws/LambdaRoleVaultCredentialsProvider.java
+++ b/src/main/java/com/nike/cerberus/client/auth/aws/LambdaRoleVaultCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/nike/cerberus/client/auth/aws/StaticIamRoleVaultCredentialsProvider.java b/src/main/java/com/nike/cerberus/client/auth/aws/StaticIamRoleVaultCredentialsProvider.java
index 93d6c34..bf91229 100644
--- a/src/main/java/com/nike/cerberus/client/auth/aws/StaticIamRoleVaultCredentialsProvider.java
+++ b/src/main/java/com/nike/cerberus/client/auth/aws/StaticIamRoleVaultCredentialsProvider.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.amazonaws.regions.Region;
diff --git a/src/main/resources/cerberus-java-client.properties b/src/main/resources/cerberus-java-client.properties
index e62a4da..d3bb6d3 100644
--- a/src/main/resources/cerberus-java-client.properties
+++ b/src/main/resources/cerberus-java-client.properties
@@ -1 +1,17 @@
+#
+# Copyright (c) 2017 Nike, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 cerberus_java_client.version = @@JAVA_CLIENT_RELEASE@@
\ No newline at end of file
diff --git a/src/test/java/com/nike/cerberus/client/ClientVersionTest.java b/src/test/java/com/nike/cerberus/client/ClientVersionTest.java
index 668f20a..12614ca 100644
--- a/src/test/java/com/nike/cerberus/client/ClientVersionTest.java
+++ b/src/test/java/com/nike/cerberus/client/ClientVersionTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/test/java/com/nike/cerberus/client/DefaultCerberusClientFactoryTest.java b/src/test/java/com/nike/cerberus/client/DefaultCerberusClientFactoryTest.java
index 55421d6..6d6de50 100644
--- a/src/test/java/com/nike/cerberus/client/DefaultCerberusClientFactoryTest.java
+++ b/src/test/java/com/nike/cerberus/client/DefaultCerberusClientFactoryTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client;
 
 import com.nike.vault.client.VaultClient;
diff --git a/src/test/java/com/nike/cerberus/client/DefaultCerberusUrlResolverTest.java b/src/test/java/com/nike/cerberus/client/DefaultCerberusUrlResolverTest.java
index 92658f4..a4da6df 100644
--- a/src/test/java/com/nike/cerberus/client/DefaultCerberusUrlResolverTest.java
+++ b/src/test/java/com/nike/cerberus/client/DefaultCerberusUrlResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/nike/cerberus/client/auth/DefaultCerberusCredentialsProviderChainTest.java b/src/test/java/com/nike/cerberus/client/auth/DefaultCerberusCredentialsProviderChainTest.java
index c417e52..1de49bc 100644
--- a/src/test/java/com/nike/cerberus/client/auth/DefaultCerberusCredentialsProviderChainTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/DefaultCerberusCredentialsProviderChainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/nike/cerberus/client/auth/EnvironmentCerberusCredentialsProviderTest.java b/src/test/java/com/nike/cerberus/client/auth/EnvironmentCerberusCredentialsProviderTest.java
index 7c275fc..9539a77 100644
--- a/src/test/java/com/nike/cerberus/client/auth/EnvironmentCerberusCredentialsProviderTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/EnvironmentCerberusCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/nike/cerberus/client/auth/SystemPropertyCerberusCredentialsProviderTest.java b/src/test/java/com/nike/cerberus/client/auth/SystemPropertyCerberusCredentialsProviderTest.java
index 116fc05..9914f67 100644
--- a/src/test/java/com/nike/cerberus/client/auth/SystemPropertyCerberusCredentialsProviderTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/SystemPropertyCerberusCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/nike/cerberus/client/auth/aws/BaseAwsCredentialsProviderTest.java b/src/test/java/com/nike/cerberus/client/auth/aws/BaseAwsCredentialsProviderTest.java
index 732cd11..1ba3603 100644
--- a/src/test/java/com/nike/cerberus/client/auth/aws/BaseAwsCredentialsProviderTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/aws/BaseAwsCredentialsProviderTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.amazonaws.regions.Region;
diff --git a/src/test/java/com/nike/cerberus/client/auth/aws/BaseCredentialsProviderTest.java b/src/test/java/com/nike/cerberus/client/auth/aws/BaseCredentialsProviderTest.java
index ffba193..760a35b 100644
--- a/src/test/java/com/nike/cerberus/client/auth/aws/BaseCredentialsProviderTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/aws/BaseCredentialsProviderTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.amazonaws.services.kms.AWSKMSClient;
diff --git a/src/test/java/com/nike/cerberus/client/auth/aws/InstanceProfileVaultCredentialsProviderTest.java b/src/test/java/com/nike/cerberus/client/auth/aws/InstanceProfileVaultCredentialsProviderTest.java
index 7719752..307cb3a 100644
--- a/src/test/java/com/nike/cerberus/client/auth/aws/InstanceProfileVaultCredentialsProviderTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/aws/InstanceProfileVaultCredentialsProviderTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.amazonaws.regions.Region;
diff --git a/src/test/java/com/nike/cerberus/client/auth/aws/InstanceRoleVaultCredentialsProviderTest.java b/src/test/java/com/nike/cerberus/client/auth/aws/InstanceRoleVaultCredentialsProviderTest.java
index a4bd8af..1be9b96 100644
--- a/src/test/java/com/nike/cerberus/client/auth/aws/InstanceRoleVaultCredentialsProviderTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/aws/InstanceRoleVaultCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Nike, Inc.
+ * Copyright (c) 2017 Nike, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/nike/cerberus/client/auth/aws/LambdaRoleVaultCredentialsProviderTest.java b/src/test/java/com/nike/cerberus/client/auth/aws/LambdaRoleVaultCredentialsProviderTest.java
index 667fcbb..d20ff76 100644
--- a/src/test/java/com/nike/cerberus/client/auth/aws/LambdaRoleVaultCredentialsProviderTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/aws/LambdaRoleVaultCredentialsProviderTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.amazonaws.regions.RegionUtils;
diff --git a/src/test/java/com/nike/cerberus/client/auth/aws/StaticIamRoleVaultCredentialsProviderTest.java b/src/test/java/com/nike/cerberus/client/auth/aws/StaticIamRoleVaultCredentialsProviderTest.java
index 7b33dbe..de66089 100644
--- a/src/test/java/com/nike/cerberus/client/auth/aws/StaticIamRoleVaultCredentialsProviderTest.java
+++ b/src/test/java/com/nike/cerberus/client/auth/aws/StaticIamRoleVaultCredentialsProviderTest.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017 Nike, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.nike.cerberus.client.auth.aws;
 
 import com.amazonaws.regions.Region;