Skip to content

Commit fb69b22

Browse files
Jithendar12Jithendar12
committed
Upgrade to Java 17
1 parent 9853060 commit fb69b22

File tree

74 files changed

+538
-37
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+538
-37
lines changed

‎athena-aws-cmdb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-aws-cmdb-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-aws-cmdb/athena-aws-cmdb.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,19 @@ Parameters:
4040
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
4141
Default: ''
4242
Type: String
43+
JavaVersion:
44+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
45+
Type: String
46+
AllowedValues:
47+
- "17"
48+
- "11"
49+
- "8"
50+
Default: "17"
4351
Conditions:
4452
HasPermissionsBoundary: !Not [ !Equals [ !Ref PermissionsBoundaryARN, "" ] ]
4553
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
4654
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
55+
IsJava17: !Equals [!Ref JavaVersion, "17"]
4756
Resources:
4857
ConnectorConfig:
4958
Type: 'AWS::Serverless::Function'
@@ -53,6 +62,7 @@ Resources:
5362
disable_spill_encryption: !Ref DisableSpillEncryption
5463
spill_bucket: !Ref SpillBucket
5564
spill_prefix: !Ref SpillPrefix
65+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
5666
FunctionName: !Ref AthenaCatalogName
5767
PackageType: "Image"
5868
ImageUri: !Sub

‎athena-clickhouse/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-clickhouse-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-clickhouse/athena-clickhouse.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,20 @@ Parameters:
5656
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
5757
Default: ''
5858
Type: String
59+
JavaVersion:
60+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
61+
Type: String
62+
AllowedValues:
63+
- "17"
64+
- "11"
65+
- "8"
66+
Default: "17"
5967
Conditions:
6068
HasPermissionsBoundary: !Not [ !Equals [ !Ref PermissionsBoundaryARN, "" ] ]
6169
NotHasLambdaRole: !Equals [!Ref LambdaRoleARN, ""]
6270
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
6371
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
72+
IsJava17: !Equals [!Ref JavaVersion, "17"]
6473
Resources:
6574
JdbcConnectorConfig:
6675
Type: 'AWS::Serverless::Function'
@@ -71,6 +80,7 @@ Resources:
7180
spill_bucket: !Ref SpillBucket
7281
spill_prefix: !Ref SpillPrefix
7382
default: !Ref DefaultConnectionString
83+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
7484
FunctionName: !Ref LambdaFunctionName
7585
PackageType: "Image"
7686
ImageUri: !Sub

‎athena-cloudera-hive/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-cloudera-hive-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-cloudera-hive/athena-cloudera-hive.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,19 @@ Parameters:
5252
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
5353
Default: ''
5454
Type: String
55+
JavaVersion:
56+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
57+
Type: String
58+
AllowedValues:
59+
- "17"
60+
- "11"
61+
- "8"
62+
Default: "17"
5563
Conditions:
5664
HasPermissionsBoundary: !Not [ !Equals [ !Ref PermissionsBoundaryARN, "" ] ]
5765
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
5866
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
67+
IsJava17: !Equals [!Ref JavaVersion, "17"]
5968
Resources:
6069
JdbcConnectorConfig:
6170
Type: 'AWS::Serverless::Function'
@@ -66,6 +75,7 @@ Resources:
6675
spill_bucket: !Ref SpillBucket
6776
spill_prefix: !Ref SpillPrefix
6877
default: !Ref DefaultConnectionString
78+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
6979
FunctionName: !Ref LambdaFunctionName
7080
PackageType: "Image"
7181
ImageUri: !Sub

‎athena-cloudera-impala/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-cloudera-impala-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-cloudera-impala/athena-cloudera-impala.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ Parameters:
5252
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
5353
Default: ''
5454
Type: String
55+
JavaVersion:
56+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
57+
Type: String
58+
AllowedValues:
59+
- "17"
60+
- "11"
61+
- "8"
62+
Default: "17"
5563
LambdaEncryptionKmsKeyARN:
5664
Description: "(Optional) The KMS Key ARN used for encrypting your Lambda environment variables."
5765
Default: ""
@@ -61,6 +69,7 @@ Conditions:
6169
HasLambdaEncryptionKmsKeyARN: !Not [ !Equals [ !Ref LambdaEncryptionKmsKeyARN, "" ] ]
6270
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
6371
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
72+
IsJava17: !Equals [!Ref JavaVersion, "17"]
6473
Resources:
6574
JdbcConnectorConfig:
6675
Type: 'AWS::Serverless::Function'
@@ -71,6 +80,7 @@ Resources:
7180
spill_bucket: !Ref SpillBucket
7281
spill_prefix: !Ref SpillPrefix
7382
default: !Ref DefaultConnectionString
83+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
7484
FunctionName: !Ref LambdaFunctionName
7585
PackageType: "Image"
7686
ImageUri: !Sub

‎athena-cloudwatch-metrics/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-cloudwatch-metrics-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-cloudwatch-metrics/athena-cloudwatch-metrics.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,19 @@ Parameters:
4040
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
4141
Default: ''
4242
Type: String
43+
JavaVersion:
44+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
45+
Type: String
46+
AllowedValues:
47+
- "17"
48+
- "11"
49+
- "8"
50+
Default: "17"
4351
Conditions:
4452
HasPermissionsBoundary: !Not [ !Equals [ !Ref PermissionsBoundaryARN, "" ] ]
4553
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
4654
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
55+
IsJava17: !Equals [!Ref JavaVersion, "17"]
4756
Resources:
4857
ConnectorConfig:
4958
Type: 'AWS::Serverless::Function'
@@ -53,6 +62,7 @@ Resources:
5362
disable_spill_encryption: !Ref DisableSpillEncryption
5463
spill_bucket: !Ref SpillBucket
5564
spill_prefix: !Ref SpillPrefix
65+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
5666
FunctionName: !Ref AthenaCatalogName
5767
PackageType: "Image"
5868
ImageUri: !Sub

‎athena-cloudwatch/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-cloudwatch-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-cloudwatch/athena-cloudwatch.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ Parameters:
4848
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
4949
Default: ''
5050
Type: String
51+
JavaVersion:
52+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
53+
Type: String
54+
AllowedValues:
55+
- "17"
56+
- "11"
57+
- "8"
58+
Default: "17"
5159

5260
Conditions:
5361
HasKMSKeyId: !Not [!Equals [!Ref KMSKeyId, ""]]
@@ -56,6 +64,7 @@ Conditions:
5664
CreateKMSPolicy: !And [ !Condition HasKMSKeyId, !Condition NotHasLambdaRole ]
5765
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
5866
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
67+
IsJava17: !Equals [!Ref JavaVersion, "17"]
5968
Resources:
6069
ConnectorConfig:
6170
Type: 'AWS::Serverless::Function'
@@ -66,6 +75,7 @@ Resources:
6675
spill_bucket: !Ref SpillBucket
6776
spill_prefix: !Ref SpillPrefix
6877
kms_key_id: !If [HasKMSKeyId, !Ref KMSKeyId, !Ref "AWS::NoValue"]
78+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
6979
FunctionName: !Ref AthenaCatalogName
7080
PackageType: "Image"
7181
ImageUri: !Sub

‎athena-datalakegen2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-datalakegen2-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-datalakegen2/athena-datalakegen2.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,21 @@ Parameters:
5656
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
5757
Default: ''
5858
Type: String
59+
JavaVersion:
60+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
61+
Type: String
62+
AllowedValues:
63+
- "17"
64+
- "11"
65+
- "8"
66+
Default: "17"
5967
Conditions:
6068
HasPermissionsBoundary: !Not [ !Equals [ !Ref PermissionsBoundaryARN, "" ] ]
6169
HasSecurityGroups: !Not [ !Equals [ !Join ["", !Ref SecurityGroupIds], "" ] ]
6270
HasSubnets: !Not [ !Equals [ !Join ["", !Ref SubnetIds], "" ] ]
6371
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
6472
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
73+
IsJava17: !Equals [!Ref JavaVersion, "17"]
6574
Resources:
6675
JdbcConnectorConfig:
6776
Type: 'AWS::Serverless::Function'
@@ -72,6 +81,7 @@ Resources:
7281
spill_bucket: !Ref SpillBucket
7382
spill_prefix: !Ref SpillPrefix
7483
default: !Ref DefaultConnectionString
84+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
7585
FunctionName: !Ref LambdaFunctionName
7686
PackageType: "Image"
7787
ImageUri: !Sub

‎athena-db2-as400/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-db2-as400-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-db2-as400/athena-db2-as400.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,21 @@ Parameters:
5757
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
5858
Default: ''
5959
Type: String
60+
JavaVersion:
61+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
62+
Type: String
63+
AllowedValues:
64+
- "17"
65+
- "11"
66+
- "8"
67+
Default: "17"
6068
Conditions:
6169
HasPermissionsBoundary: !Not [ !Equals [ !Ref PermissionsBoundaryARN, "" ] ]
6270
HasSecurityGroups: !Not [ !Equals [ !Join ["", !Ref SecurityGroupIds], "" ] ]
6371
HasSubnets: !Not [ !Equals [ !Join ["", !Ref SubnetIds], "" ] ]
6472
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
6573
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
74+
IsJava17: !Equals [!Ref JavaVersion, "17"]
6675
Resources:
6776
JdbcConnectorConfig:
6877
Type: 'AWS::Serverless::Function'
@@ -73,6 +82,7 @@ Resources:
7382
spill_bucket: !Ref SpillBucket
7483
spill_prefix: !Ref SpillPrefix
7584
default: !Ref DefaultConnectionString
85+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
7686
FunctionName: !Ref LambdaFunctionName
7787
PackageType: "Image"
7888
ImageUri: !Sub

‎athena-db2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-db2-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-db2/athena-db2.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,21 @@ Parameters:
5757
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
5858
Default: ''
5959
Type: String
60+
JavaVersion:
61+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
62+
Type: String
63+
AllowedValues:
64+
- "17"
65+
- "11"
66+
- "8"
67+
Default: "17"
6068
Conditions:
6169
HasPermissionsBoundary: !Not [ !Equals [ !Ref PermissionsBoundaryARN, "" ] ]
6270
HasSecurityGroups: !Not [ !Equals [ !Join ["", !Ref SecurityGroupIds], "" ] ]
6371
HasSubnets: !Not [ !Equals [ !Join ["", !Ref SubnetIds], "" ] ]
6472
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
6573
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
74+
IsJava17: !Equals [!Ref JavaVersion, "17"]
6675
Resources:
6776
JdbcConnectorConfig:
6877
Type: 'AWS::Serverless::Function'
@@ -73,6 +82,7 @@ Resources:
7382
spill_bucket: !Ref SpillBucket
7483
spill_prefix: !Ref SpillPrefix
7584
default: !Ref DefaultConnectionString
85+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
7686
FunctionName: !Ref LambdaFunctionName
7787
PackageType: "Image"
7888
ImageUri: !Sub

‎athena-docdb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-docdb-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-docdb/athena-docdb.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,19 @@ Parameters:
5353
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
5454
Default: ''
5555
Type: String
56+
JavaVersion:
57+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
58+
Type: String
59+
AllowedValues:
60+
- "17"
61+
- "11"
62+
- "8"
63+
Default: "17"
5664
Conditions:
5765
HasPermissionsBoundary: !Not [ !Equals [ !Ref PermissionsBoundaryARN, "" ] ]
5866
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
5967
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
68+
IsJava17: !Equals [!Ref JavaVersion, "17"]
6069
Resources:
6170
ConnectorConfig:
6271
Type: 'AWS::Serverless::Function'
@@ -67,6 +76,7 @@ Resources:
6776
spill_bucket: !Ref SpillBucket
6877
spill_prefix: !Ref SpillPrefix
6978
default_docdb: !Ref DocDBConnectionString
79+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
7080
FunctionName: !Ref AthenaCatalogName
7181
PackageType: "Image"
7282
ImageUri: !Sub

‎athena-dynamodb/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-dynamodb-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-dynamodb/athena-dynamodb.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ Parameters:
4848
Description: "(Optional) An IAM policy ARN to use as the PermissionsBoundary for the created Lambda function's execution role"
4949
Default: ''
5050
Type: String
51+
JavaVersion:
52+
Description: "(Optional) Specify the Java version for the Lambda function. Default is '17'; use '11' for Java 11 or '8' for Java 8."
53+
Type: String
54+
AllowedValues:
55+
- "17"
56+
- "11"
57+
- "8"
58+
Default: "17"
5159

5260
Conditions:
5361
HasKMSKeyId: !Not [!Equals [!Ref KMSKeyId, ""]]
@@ -56,6 +64,7 @@ Conditions:
5664
CreateKMSPolicy: !And [!Condition HasKMSKeyId, !Condition NotHasLambdaRole]
5765
IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
5866
IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
67+
IsJava17: !Equals [!Ref JavaVersion, "17"]
5968
Resources:
6069
ConnectorConfig:
6170
Type: 'AWS::Serverless::Function'
@@ -66,6 +75,7 @@ Resources:
6675
spill_bucket: !Ref SpillBucket
6776
spill_prefix: !Ref SpillPrefix
6877
kms_key_id: !If [HasKMSKeyId, !Ref KMSKeyId, !Ref "AWS::NoValue"]
78+
JAVA_TOOL_OPTIONS: !If [IsJava17, "--add-opens=java.base/java.nio=ALL-UNNAMED", !Ref "AWS::NoValue"]
6979
FunctionName: !Ref AthenaCatalogName
7080
PackageType: "Image"
7181
ImageUri: !Sub

‎athena-elasticsearch/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
FROM public.ecr.aws/lambda/java:17
22

33
# Copy function code and runtime dependencies from Maven layout
44
COPY target/athena-elasticsearch-2022.47.1.jar ${LAMBDA_TASK_ROOT}

0 commit comments

Comments
 (0)