Skip to content

Commit 98cca10

Browse files
bios6bios6
authored
Update to version v1.0.7 (#42)
1 parent bc8dc96 commit 98cca10

File tree

28 files changed

+142
-67
lines changed

28 files changed

+142
-67
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Steps to reproduce the behavior.
1717
A clear and concise description of what you expected to happen.
1818

1919
**Please complete the following information about the solution:**
20-
- [ ] Version: [e.g. v1.0.6]
20+
- [ ] Version: [e.g. v1.0.7]
2121

2222
To get the version of the solution, you can look at the description of the created CloudFormation stack. For example, "_(SO0021) - Video On Demand workflow with AWS Step Functions, MediaConvert, MediaPackage, S3, CloudFront and DynamoDB. Version **v5.0.0**_". If the description does not contain the version information, you can look at the mappings section of the template:
2323

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.0.7] - 2024-05-22
9+
10+
### Security
11+
12+
- Upgrade Druid to v33.0.0
13+
- Upgrade Zookeeper to v3.9.3
14+
- Patched aws-cdk libraries
15+
- Upgrade user data scripts to use python 3.12
16+
- Upgrade Druid-Operator version to v1.3.0
17+
818
## [1.0.6] - 2024-04-02
919

1020
### Security

‎NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,4 +840,4 @@ PSF-2.0 - https://opensource.org/license/python-2-0
840840
Python-2.0 - https://opensource.org/license/python-2-0
841841
Public Domain - None
842842
Unicode/ICU License - https://raw.githubusercontent.com/unicode-org/icu/main/icu4c/LICENSE
843-
Unlicense - https://opensource.org/licenses/Unlicense
843+
Unlicense - https://opensource.org/licenses/Unlicense

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ It is important to note that the redirect URI on the IDP side should be configur
302302
- **Druid version**: Apache Druid release version (eg. 27.0.0) that you want to run. It is recommended to use the latest stable [Druid version](#https://druid.apache.org/downloads.html).
303303
304304
```
305-
"druidVersion": "31.0.0",
305+
"druidVersion": "33.0.0",
306306
```
307307
308308
- **Druid cluster name**: A sequence of ASCII characters that uniquely identifies each Druid cluster. If there are multiple deployments, please make sure that you have an unique cluster name for each cluster. The cluster name will be appended to the CloudFormation stack name.

‎deployment/build-s3-dist.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# Parameters:
2222
# - source-bucket-base-name: Name for the S3 bucket location where the template will source the Lambda
2323
# code from. The template will append '-[region_name]' to this bucket name.
24-
# For example: ./build-s3-dist.sh solutions v1.0.6
24+
# For example: ./build-s3-dist.sh solutions v1.0.7
2525
# The template will then expect the source code to be located in the solutions-[region_name] bucket
2626
# - solution-name: name of the solution for consistency
2727
# - version-code: version of the package
@@ -58,7 +58,7 @@ usage()
5858
{
5959
echo "Usage: $0 bucket solution-name version"
6060
echo "Please provide the base source bucket name, trademarked solution name, and version."
61-
echo "For example: ./build-s3-dist.sh mybucket my-solution v1.0.6"
61+
echo "For example: ./build-s3-dist.sh mybucket my-solution v1.0.7"
6262
exit 1
6363
}
6464

‎source/DruidCloudwatchExtension/pom.xml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<groupId>com.amazon.solutions.druid.extensions</groupId>
77
<artifactId>druid-cloudwatch</artifactId>
88
<description>druid-cloudwatch</description>
9-
<version>25.0.0</version>
9+
<version>33.0.0</version>
1010

1111
<properties>
12-
<druid.version>25.0.0</druid.version>
12+
<druid.version>33.0.0</druid.version>
1313
<maven.compiler.source>17</maven.compiler.source>
1414
<maven.compiler.target>17</maven.compiler.target>
1515
<jdk.version>17</jdk.version>
@@ -19,9 +19,23 @@
1919
<!-- https://mvnrepository.com/artifact/org.apache.druid/druid-core -->
2020
<dependency>
2121
<groupId>org.apache.druid</groupId>
22-
<artifactId>druid-core</artifactId>
22+
<artifactId>druid-processing</artifactId>
2323
<version>${druid.version}</version>
2424
<scope>provided</scope>
25+
<exclusions>
26+
<exclusion>
27+
<groupId>io.netty</groupId>
28+
<artifactId>netty</artifactId>
29+
</exclusion>
30+
<exclusion>
31+
<groupId>commons-beanutils</groupId>
32+
<artifactId>commons-beanutils</artifactId>
33+
</exclusion>
34+
<exclusion>
35+
<groupId>net.minidev</groupId>
36+
<artifactId>json-smart</artifactId>
37+
</exclusion>
38+
</exclusions>
2539
</dependency>
2640
<dependency>
2741
<groupId>org.projectlombok</groupId>
@@ -163,4 +177,4 @@
163177
</plugin>
164178
</plugins>
165179
</build>
166-
</project>
180+
</project>

‎source/DruidCloudwatchExtension/src/main/java/com/amazon/solutions/druid/cloudwatch/CloudwatchEmitterConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Data
1414
public class CloudwatchEmitterConfig {
1515
static final int CLOUDWATCH_METRICS_MEMORY_LIMIT = 100000000;
16-
static final String SOLUTION_VERSION = "v1.0.6";
16+
static final String SOLUTION_VERSION = "v1.0.7";
1717

1818
@JsonProperty("batchSize")
1919
@Nullable
@@ -48,4 +48,4 @@ public String toString() {
4848

4949
return sb.toString();
5050
}
51-
}
51+
}

‎source/DruidCloudwatchExtension/src/test/java/com/amazon/solutions/druid/cloudwatch/CloudwatchEmitterConfigTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package com.amazon.solutions.druid.cloudwatch;
66

77
import org.junit.Test;
8-
import com.fasterxml.jackson.databind.ObjectMapper;
98
import static org.junit.Assert.assertEquals;
109
import org.junit.Assert;
1110

@@ -46,16 +45,16 @@ public void testGetBatchSize_withDefaultBatchSize() {
4645
@Test
4746
public void testToString_withValidConfig() {
4847
// arrange
49-
CloudwatchEmitterConfig config = new CloudwatchEmitterConfig("test-cluster", 200, "v1.0.6");
48+
CloudwatchEmitterConfig config = new CloudwatchEmitterConfig("test-cluster", 200, "v1.0.7");
5049

5150
// act
5251
String actual = config.toString();
5352

5453
// assert
5554
Assert.assertTrue(actual.contains("test-cluster"));
5655
Assert.assertTrue(actual.contains("200"));
57-
Assert.assertTrue(actual.contains("v1.0.6"));
56+
Assert.assertTrue(actual.contains("v1.0.7"));
5857
Assert.assertTrue(actual.contains("CloudwatchEmitterConfig"));
5958
}
6059

61-
}
60+
}

‎source/DruidCloudwatchExtension/src/test/java/com/amazon/solutions/druid/cloudwatch/CloudwatchEmitterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public void testEmit_withServiceMetricEvent() throws JsonProcessingException {
188188
ServiceMetricEvent metricEvent = metricEventBuilder
189189
.setDimension("key1", "value1")
190190
.setDimension("key2", "value2")
191-
.build("task/success/count", 1)
191+
.setMetric("task/success/count", 1)
192192
.build("some-service", "some-task");
193193
when(druidMonitoringMetricsFactory.createCloudwatchMetric(any(AlertEvent.class)))
194194
.thenReturn(new MetricDatum().withMetricName("Druid-Alert"));

‎source/DruidCloudwatchExtension/src/test/java/com/amazon/solutions/druid/cloudwatch/DruidMonitoringMetricsFactoryTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ public void testCreateCloudwatchMetric_withServiceMetricEvent() {
8383
ServiceMetricEvent metricEvent = metricEventBuilder
8484
.setDimension("key1", "value1")
8585
.setDimension("key2", "value2")
86-
.build(metricCreateTime, "task/success/count", 1)
86+
.setMetric("task/success/count", 1)
87+
.setCreatedTime(metricCreateTime)
8788
.build("some-service", "some-task");
8889

8990
// Act

‎source/DruidOidcExtension/pom.xml

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<artifactId>druid-oidc</artifactId>
2727
<name>druid-oidc</name>
2828
<description>druid-oidc</description>
29-
<version>29.0.1</version>
29+
<version>33.0.0</version>
3030

3131
<properties>
3232
<pac4j.version>4.5.7</pac4j.version>
@@ -38,14 +38,41 @@
3838
<maven.compiler.source>17</maven.compiler.source>
3939
<maven.compiler.target>17</maven.compiler.target>
4040
<jdk.version>17</jdk.version>
41+
<json.smart.version>2.5.2</json.smart.version>
42+
<commons.beanutils.version>1.9.4</commons.beanutils.version>
4143
</properties>
4244

45+
<dependencyManagement>
46+
<dependencies>
47+
<!-- Override json smart version to fix CVE-2023-1370 -->
48+
<dependency>
49+
<groupId>net.minidev</groupId>
50+
<artifactId>json-smart</artifactId>
51+
<version>${json.smart.version}</version>
52+
</dependency>
53+
</dependencies>
54+
</dependencyManagement>
55+
4356
<dependencies>
4457
<dependency>
4558
<groupId>org.apache.druid</groupId>
4659
<artifactId>druid-server</artifactId>
47-
<version>31.0.0</version>
60+
<version>33.0.0</version>
4861
<scope>provided</scope>
62+
<exclusions>
63+
<exclusion>
64+
<groupId>org.apache.derby</groupId>
65+
<artifactId>*</artifactId>
66+
</exclusion>
67+
<exclusion>
68+
<groupId>io.netty</groupId>
69+
<artifactId>netty</artifactId>
70+
</exclusion>
71+
<exclusion>
72+
<groupId>org.eclipse.jetty</groupId>
73+
<artifactId>*</artifactId>
74+
</exclusion>
75+
</exclusions>
4976
</dependency>
5077
<dependency>
5178
<groupId>joda-time</groupId>
@@ -56,7 +83,23 @@
5683
<dependency>
5784
<groupId>org.apache.druid</groupId>
5885
<artifactId>druid-processing</artifactId>
59-
<version>31.0.0</version>
86+
<version>33.0.0</version>
87+
<scope>provided</scope>
88+
<exclusions>
89+
<exclusion>
90+
<groupId>io.netty</groupId>
91+
<artifactId>netty</artifactId>
92+
</exclusion>
93+
<exclusion>
94+
<groupId>commons-beanutils</groupId>
95+
<artifactId>commons-beanutils</artifactId>
96+
</exclusion>
97+
</exclusions>
98+
</dependency>
99+
<dependency>
100+
<groupId>commons-beanutils</groupId>
101+
<artifactId>commons-beanutils</artifactId>
102+
<version>${commons.beanutils.version}</version>
60103
<scope>provided</scope>
61104
</dependency>
62105
<dependency>
@@ -141,17 +184,22 @@
141184
<scope>test</scope>
142185
<version>5.4.0</version>
143186
</dependency>
187+
<dependency>
188+
<groupId>net.minidev</groupId>
189+
<artifactId>json-smart</artifactId>
190+
<version>${json.smart.version}</version>
191+
</dependency>
144192
<dependency>
145193
<groupId>com.squareup.okhttp3</groupId>
146194
<artifactId>mockwebserver</artifactId>
147195
<version>4.12.0</version>
148196
<scope>test</scope>
149-
</dependency>
150-
<!-- https://mvnrepository.com/artifact/net.minidev/json-smart -->
151-
<dependency>
152-
<groupId>net.minidev</groupId>
153-
<artifactId>json-smart</artifactId>
154-
<version>2.5.2</version>
197+
<exclusions>
198+
<exclusion>
199+
<groupId>net.minidev</groupId>
200+
<artifactId>json-smart</artifactId>
201+
</exclusion>
202+
</exclusions>
155203
</dependency>
156204
</dependencies>
157205

‎source/bin/druid-infra.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { CfnGuardResourcePathRulesSuppressionAspect } from '../lib/constructs/cf
2626

2727
const solutionId = 'SO0262';
2828
const solutionName = 'Scalable Analytics using Apache Druid on AWS';
29-
const solutionVersion = 'v1.0.6';
29+
const solutionVersion = 'v1.0.7';
3030

3131
const fipsEnabledRegions = [
3232
'us-east-1',

‎source/build-dependencies.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ set -e
33
cdk_context="$(npm run -s cdk context -- -j)"
44

55
druid_version=$(echo "$cdk_context" | grep "druidVersion" | awk '/druidVersion/{print $NF}' | tr -d '"' | tr -d ',')
6-
druid_version=${druid_version:-31.0.0}
6+
druid_version=${druid_version:-33.0.0}
77

8-
druid_operator_version="v1.2.3"
8+
druid_operator_version="v1.3.0"
99
druid_operator_repo="https://github.com/datainfrahq/druid-operator"
1010

1111
do_cmd()
@@ -38,7 +38,7 @@ build_druid_cloudwatch()
3838
mvn clean verify package && \
3939
rm -rf ../lib/docker/extensions/druid-cloudwatch/ && \
4040
mkdir -p ../lib/docker/extensions/druid-cloudwatch/ && \
41-
cp -f target/druid-cloudwatch-25.0.0-jar-with-dependencies.jar ../lib/docker/extensions/druid-cloudwatch/ && cd ..
41+
cp -f target/druid-cloudwatch-33.0.0-jar-with-dependencies.jar ../lib/docker/extensions/druid-cloudwatch/ && cd ..
4242
}
4343

4444
build_druid_oidc()
@@ -48,7 +48,7 @@ build_druid_oidc()
4848
mvn clean verify package && \
4949
rm -rf ../lib/docker/extensions/druid-oidc/ && \
5050
mkdir -p ../lib/docker/extensions/druid-oidc/ && \
51-
cp -f target/druid-oidc-29.0.1-jar-with-dependencies.jar ../lib/docker/extensions/druid-oidc/
51+
cp -f target/druid-oidc-33.0.0-jar-with-dependencies.jar ../lib/docker/extensions/druid-oidc/
5252
}
5353

5454
download_druid_operator()
@@ -108,7 +108,7 @@ download_druid()
108108
download_zookeeper()
109109
{
110110
local zookeeper_version=$(echo "$cdk_context" | grep "zookeeperVersion" | awk '/zookeeperVersion/{print $NF}' | tr -d '"' | tr -d ',')
111-
zookeeper_version=${zookeeper_version:-3.8.4}
111+
zookeeper_version=${zookeeper_version:-3.9.3}
112112
download_url="https://archive.apache.org/dist/zookeeper/zookeeper-${zookeeper_version}/apache-zookeeper-${zookeeper_version}-bin.tar.gz"
113113
alt_url="https://dlcdn.apache.org/zookeeper/zookeeper-${zookeeper_version}/apache-zookeeper-${zookeeper_version}-bin.tar.gz"
114114
download_and_verify_file "$zookeeper_version" "$download_url" "$alt_url" "./zookeeper-bin" "apache-zookeeper"

‎source/lib/config/user_data/common_user_data

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ if [[ ! -z $YUM_CMD ]]; then
3131
RETRIES=0
3232
while [ "$STEP_SUCCESS" == false ] && [ $RETRIES -lt 5 ]; do
3333
RETRIES=$((RETRIES+1))
34-
sudo yum install -y python3.11 python3.11-pip
34+
sudo yum install -y python3.12 python3.12-pip
3535
if [ $? -eq 0 ]; then
3636
STEP_SUCCESS=true
3737
fi
3838
done
39-
PYTHON=python3.11
39+
PYTHON=python3.12
4040
elif [[ ! -z $APT_CMD ]]; then
4141
echo " >>druid>> installing apt-get dependencies $(date)"
4242
apt-get update

‎source/lib/config/user_data/zookeeper_user_data

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ if [[ ! -z $YUM_CMD ]]; then
2929
RETRIES=0
3030
while [ "$STEP_SUCCESS" == false ] && [ $RETRIES -lt 5 ]; do
3131
RETRIES=$((RETRIES+1))
32-
sudo yum install -y python3.11 python3.11-pip
32+
sudo yum install -y python3.12 python3.12-pip
3333
if [ $? -eq 0 ]; then
3434
STEP_SUCCESS=true
3535
fi
3636
done
37-
PYTHON=python3.11
37+
PYTHON=python3.12
3838

3939
elif [[ ! -z $APT_CMD ]]; then
4040
echo " >>zookeeper>> installing apt-get dependencies $(date)"

‎source/lib/constructs/configScheme.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export const configScheme = {
9494
title: 'Druid Version',
9595
$id: '#/properties/druidVersion',
9696
description: 'Version of Druid to use.',
97-
examples: ['30.0.0', '31.0.0'],
97+
examples: ['30.0.0', '33.0.0'],
9898
},
9999
druidExtensions: {
100100
type: 'array',

‎source/lib/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG imageTag=24.0.0
1+
ARG imageTag=33.0.0
22
FROM apache/druid:${imageTag}
33
COPY extensions/ /opt/druid/extensions/
44
COPY ca-certs/ /opt/druid/ca-certs/

‎source/lib/utils/constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ export const DEEP_STORAGE_PREFIX = 'druid/segments';
5757

5858
export const DEFAULT_TIER = '_default_tier';
5959

60-
export const ZOOKEEPER_DEFAULT_VERSION = '3.8.4';
60+
export const ZOOKEEPER_DEFAULT_VERSION = '3.9.3';
6161

62-
export const DRUID_DEFAULT_VERSION = '31.0.0';
62+
export const DRUID_DEFAULT_VERSION = '33.0.0';
6363

6464
export const DEFAULT_POSTGRES_PORT = 5432;
6565

0 commit comments

Comments
 (0)