From 4e28d9d1bd11b3b05fa919a52c74db9aa2cc374d Mon Sep 17 00:00:00 2001
From: Himadri Singh <himadri.singh@gmail.com>
Date: Fri, 30 Oct 2020 12:54:03 +0530
Subject: [PATCH 1/5] AWS Web Identity Support

required for AWS IRSA
---
 .../org/apache/druid/common/aws/AWSCredentialsUtils.java   | 2 ++
 extensions-core/s3-extensions/pom.xml                      | 5 +++++
 licenses.yaml                                              | 3 ++-
 pom.xml                                                    | 7 ++++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cloud/aws-common/src/main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java b/cloud/aws-common/src/main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java
index 6e93d4a4c4db..10843e8de087 100644
--- a/cloud/aws-common/src/main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java
+++ b/cloud/aws-common/src/main/java/org/apache/druid/common/aws/AWSCredentialsUtils.java
@@ -24,6 +24,7 @@
 import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
 import com.amazonaws.auth.InstanceProfileCredentialsProvider;
 import com.amazonaws.auth.SystemPropertiesCredentialsProvider;
+import com.amazonaws.auth.WebIdentityTokenCredentialsProvider;
 import com.amazonaws.auth.profile.ProfileCredentialsProvider;
 
 public class AWSCredentialsUtils
@@ -35,6 +36,7 @@ public static AWSCredentialsProviderChain defaultAWSCredentialsProviderChain(fin
         new LazyFileSessionCredentialsProvider(config),
         new EnvironmentVariableCredentialsProvider(),
         new SystemPropertiesCredentialsProvider(),
+        WebIdentityTokenCredentialsProvider.create(),        
         new ProfileCredentialsProvider(),
         new EC2ContainerCredentialsProviderWrapper(),
         InstanceProfileCredentialsProvider.getInstance());
diff --git a/extensions-core/s3-extensions/pom.xml b/extensions-core/s3-extensions/pom.xml
index 755728316ad5..30c63f672bbf 100644
--- a/extensions-core/s3-extensions/pom.xml
+++ b/extensions-core/s3-extensions/pom.xml
@@ -112,6 +112,11 @@
       <artifactId>aws-java-sdk-s3</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk-sts</artifactId>
+      <scope>provided</scope>
+    </dependency>    
     <!-- Tests -->
     <dependency>
       <groupId>org.apache.druid</groupId>
diff --git a/licenses.yaml b/licenses.yaml
index 2759bf296182..5da0f83822b3 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -3583,10 +3583,11 @@ name: AWS SDK for Java
 license_category: binary
 module: extensions/druid-kinesis-indexing-service
 license_name: Apache License version 2.0
-version: 1.11.199
+version: 1.11.884
 libraries:
   - com.amazonaws: aws-java-sdk-kinesis
   - com.amazonaws: aws-java-sdk-sts
+  - com.amazonaws: jmespath-java  
 
 ---
 
diff --git a/pom.xml b/pom.xml
index 2101f8394c8a..b18dfedb3527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
         <hadoop.compile.version>2.8.5</hadoop.compile.version>
         <mockito.version>3.2.4</mockito.version>
         <powermock.version>2.0.2</powermock.version>
-        <aws.sdk.version>1.11.199</aws.sdk.version>
+        <aws.sdk.version>1.11.884</aws.sdk.version>
         <caffeine.version>2.8.0</caffeine.version>
         <jacoco.version>0.8.5</jacoco.version>
         <!-- Curator requires 3.4.x ZooKeeper clients to maintain compatibility with 3.4.x ZooKeeper servers,
@@ -264,6 +264,11 @@
                 <artifactId>aws-java-sdk-s3</artifactId>
                 <version>${aws.sdk.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-sts</artifactId>
+                <version>${aws.sdk.version}</version>
+            </dependency>            
             <dependency>
                 <groupId>com.ning</groupId>
                 <artifactId>compress-lzf</artifactId>

From 0c75e2a9de52d5c5e27bcbe64ea15bbfd5804921 Mon Sep 17 00:00:00 2001
From: Himadri Singh <himadri.singh@gmail.com>
Date: Fri, 6 Nov 2020 11:48:23 +0530
Subject: [PATCH 2/5] Update kinesis-ingestion.md

---
 docs/development/extensions-core/kinesis-ingestion.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development/extensions-core/kinesis-ingestion.md b/docs/development/extensions-core/kinesis-ingestion.md
index 36b89e7b81d0..620f1f9a5d1a 100644
--- a/docs/development/extensions-core/kinesis-ingestion.md
+++ b/docs/development/extensions-core/kinesis-ingestion.md
@@ -236,7 +236,7 @@ To authenticate with AWS, you must provide your AWS access key and AWS secret ke
 -Ddruid.kinesis.accessKey=123 -Ddruid.kinesis.secretKey=456
 ```
 The AWS access key ID and secret access key are used for Kinesis API requests. If this is not provided, the service will
-look for credentials set in environment variables, in the default profile configuration file, and from the EC2 instance
+look for credentials set in environment variables, via [Web Identity Token](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_oidc.html), in the default profile configuration file, and from the EC2 instance
 profile provider (in this order).
 
 ### Getting Supervisor Status Report

From f1cd7aedda79590b10d9f4bc9a75707ef88eff92 Mon Sep 17 00:00:00 2001
From: Himadri Singh <himadri.singh@gmail.com>
Date: Fri, 22 Jan 2021 12:26:20 +0530
Subject: [PATCH 3/5] disabling coverage tests

https://github.com/apache/druid/pull/10541#issuecomment-737558213
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b18dfedb3527..f0fbc110ddd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1282,7 +1282,8 @@
                         <!-- Ignore initialization classes, these are tested by the integration tests. -->
                         <exclude>org/apache/druid/cli/Cli*</exclude>
                         <exclude>org/apache/druid/cli/*JettyServerInitializer*</exclude>
-                        <exclude>org/apache/druid/server/initialization/*Module*</exclude>
+                        <!-- as per comments, disabling coverage tests-->
+                        <!-- <exclude>org/apache/druid/server/initialization/*Module*</exclude> -->
                         <exclude>org/apache/druid/server/initialization/jetty/*Module*</exclude>
                         <exclude>org/apache/druid/guice/http/*</exclude>
 

From 1ca8dce7c678629b48c9c4878b2491acf16c67f4 Mon Sep 17 00:00:00 2001
From: Himadri Singh <himadri.singh@gmail.com>
Date: Fri, 22 Jan 2021 12:57:38 +0530
Subject: [PATCH 4/5] exclude coverage

---
 pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f0fbc110ddd4..97e5c39b5ea2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1282,8 +1282,7 @@
                         <!-- Ignore initialization classes, these are tested by the integration tests. -->
                         <exclude>org/apache/druid/cli/Cli*</exclude>
                         <exclude>org/apache/druid/cli/*JettyServerInitializer*</exclude>
-                        <!-- as per comments, disabling coverage tests-->
-                        <!-- <exclude>org/apache/druid/server/initialization/*Module*</exclude> -->
+                        <exclude>org/apache/druid/server/initialization/*Module*</exclude>
                         <exclude>org/apache/druid/server/initialization/jetty/*Module*</exclude>
                         <exclude>org/apache/druid/guice/http/*</exclude>
 
@@ -1299,7 +1298,9 @@
 
                         <!-- Exceptions -->
                         <exclude>org/apache/druid/query/TruncatedResponseContextException.class</exclude>
-                    </excludes>
+
+                        <exclude>org/apache/druid/common/aws/AWSCredentials*</exclude>                      
+                  </excludes>
                 </configuration>
                 <executions>
                     <execution>

From f1d3a562ca6703602a1c5cdd0bcb0624a32feb4d Mon Sep 17 00:00:00 2001
From: Himadri Singh <himadri.singh@gmail.com>
Date: Fri, 22 Jan 2021 23:49:46 +0530
Subject: [PATCH 5/5] Update licenses.yaml

---
 licenses.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.yaml b/licenses.yaml
index 5da0f83822b3..219256e4fc1e 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -151,7 +151,7 @@ name: AWS RDS SDK for Java
 license_category: source
 module: extensions/druid-aws-rds-extensions
 license_name: Apache License version 2.0
-version: 1.11.199
+version: 1.11.884
 libraries:
   - com.amazonaws: aws-java-sdk-rds