Skip to content

Commit

Permalink
Cut release 2024.51.1
Browse files Browse the repository at this point in the history
  - Revert various cleanup fixes (#2467) (#2498)
  - Revert 'various cleanup fixes (#2467)'
  • Loading branch information
athena_federation_cut_release_workflow committed Dec 23, 2024
1 parent 1c686a9 commit 16dc34e
Show file tree
Hide file tree
Showing 136 changed files with 359 additions and 359 deletions.
4 changes: 2 additions & 2 deletions athena-aws-cmdb/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM public.ecr.aws/lambda/java:11

# Copy function code and runtime dependencies from Maven layout
COPY target/athena-aws-cmdb-2022.47.1.jar ${LAMBDA_TASK_ROOT}
COPY target/athena-aws-cmdb-2024.51.1.jar ${LAMBDA_TASK_ROOT}
# Unpack the jar
RUN jar xf athena-aws-cmdb-2022.47.1.jar
RUN jar xf athena-aws-cmdb-2024.51.1.jar

# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
CMD [ "com.amazonaws.athena.connectors.aws.cmdb.AwsCmdbCompositeHandler" ]
4 changes: 2 additions & 2 deletions athena-aws-cmdb/athena-aws-cmdb-connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
LambdaFunctionName:
Expand Down Expand Up @@ -49,7 +49,7 @@ Resources:
FunctionName: !Ref LambdaFunctionName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-aws-cmdb:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-aws-cmdb:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
Description: "Enables Amazon Athena to communicate with various AWS Services, making your resource inventories accessible via SQL."
Timeout: 900
Expand Down
4 changes: 2 additions & 2 deletions athena-aws-cmdb/athena-aws-cmdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
AthenaCatalogName:
Expand Down Expand Up @@ -56,7 +56,7 @@ Resources:
FunctionName: !Ref AthenaCatalogName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-aws-cmdb:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-aws-cmdb:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
Description: "Enables Amazon Athena to communicate with various AWS Services, making your resource inventories accessible via SQL."
Timeout: !Ref LambdaTimeout
Expand Down
6 changes: 3 additions & 3 deletions athena-aws-cmdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<parent>
<artifactId>aws-athena-query-federation</artifactId>
<groupId>com.amazonaws</groupId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>athena-aws-cmdb</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-athena-federation-sdk</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<classifier>withdep</classifier>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions athena-clickhouse/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM public.ecr.aws/lambda/java:11

# Copy function code and runtime dependencies from Maven layout
COPY target/athena-clickhouse-2022.47.1.jar ${LAMBDA_TASK_ROOT}
COPY target/athena-clickhouse-2024.51.1.jar ${LAMBDA_TASK_ROOT}
# Unpack the jar
RUN jar xf athena-clickhouse-2022.47.1.jar
RUN jar xf athena-clickhouse-2024.51.1.jar

# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
CMD [ "com.amazonaws.athena.connectors.clickhouse.ClickHouseMuxCompositeHandler" ]
4 changes: 2 additions & 2 deletions athena-clickhouse/athena-clickhouse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
LambdaFunctionName:
Expand Down Expand Up @@ -74,7 +74,7 @@ Resources:
FunctionName: !Ref LambdaFunctionName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-clickhouse:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-clickhouse:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
Description: "Enables Amazon Athena to communicate with ClickHouse using JDBC"
Timeout: !Ref LambdaTimeout
Expand Down
12 changes: 6 additions & 6 deletions athena-clickhouse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<parent>
<artifactId>aws-athena-query-federation</artifactId>
<groupId>com.amazonaws</groupId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>athena-clickhouse</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-jdbc</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-mysql</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</dependency>
<dependency>
<groupId>com.clickhouse</groupId>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-jdbc</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -74,5 +74,5 @@
</executions>
</plugin>
</plugins>
</build>
</build>
</project>
4 changes: 2 additions & 2 deletions athena-cloudera-hive/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM public.ecr.aws/lambda/java:11

# Copy function code and runtime dependencies from Maven layout
COPY target/athena-cloudera-hive-2022.47.1.jar ${LAMBDA_TASK_ROOT}
COPY target/athena-cloudera-hive-2024.51.1.jar ${LAMBDA_TASK_ROOT}
# Unpack the jar
RUN jar xf athena-cloudera-hive-2022.47.1.jar
RUN jar xf athena-cloudera-hive-2024.51.1.jar

# Command can be overwritten by providing a different command in the template directly.
# No need to specify here (already defined in .yaml file because legacy and connections use different)
4 changes: 2 additions & 2 deletions athena-cloudera-hive/athena-cloudera-hive-connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
LambdaFunctionName:
Expand Down Expand Up @@ -56,7 +56,7 @@ Resources:
FunctionName: !Ref LambdaFunctionName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-hive:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-hive:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
ImageConfig:
Command: [ "com.amazonaws.athena.connectors.cloudera.HiveCompositeHandler" ]
Expand Down
4 changes: 2 additions & 2 deletions athena-cloudera-hive/athena-cloudera-hive.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
LambdaFunctionName:
Expand Down Expand Up @@ -69,7 +69,7 @@ Resources:
FunctionName: !Ref LambdaFunctionName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-hive:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-hive:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
ImageConfig:
Command: [ "com.amazonaws.athena.connectors.cloudera.HiveMuxCompositeHandler" ]
Expand Down
10 changes: 5 additions & 5 deletions athena-cloudera-hive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<parent>
<artifactId>aws-athena-query-federation</artifactId>
<groupId>com.amazonaws</groupId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>athena-cloudera-hive</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<properties>
<clouderaVersion>2.6.23.1027</clouderaVersion>
</properties>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-federation-integ-test</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-jdbc</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</dependency>
<dependency>
<groupId>Hive</groupId>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-jdbc</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions athena-cloudera-impala/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM public.ecr.aws/lambda/java:11

# Copy function code and runtime dependencies from Maven layout
COPY target/athena-cloudera-impala-2022.47.1.jar ${LAMBDA_TASK_ROOT}
COPY target/athena-cloudera-impala-2024.51.1.jar ${LAMBDA_TASK_ROOT}
# Unpack the jar
RUN jar xf athena-cloudera-impala-2022.47.1.jar
RUN jar xf athena-cloudera-impala-2024.51.1.jar

# Command can be overwritten by providing a different command in the template directly.
# No need to specify here (already defined in .yaml file because legacy and connections use different)
4 changes: 2 additions & 2 deletions athena-cloudera-impala/athena-cloudera-impala-connection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
LambdaFunctionName:
Expand Down Expand Up @@ -56,7 +56,7 @@ Resources:
FunctionName: !Ref LambdaFunctionName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-impala:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-impala:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
ImageConfig:
Command: [ "com.amazonaws.athena.connectors.cloudera.ImpalaCompositeHandler" ]
Expand Down
4 changes: 2 additions & 2 deletions athena-cloudera-impala/athena-cloudera-impala.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
LambdaFunctionName:
Expand Down Expand Up @@ -74,7 +74,7 @@ Resources:
FunctionName: !Ref LambdaFunctionName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-impala:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-impala:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
ImageConfig:
Command: [ "com.amazonaws.athena.connectors.cloudera.ImpalaMuxCompositeHandler" ]
Expand Down
10 changes: 5 additions & 5 deletions athena-cloudera-impala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<parent>
<artifactId>aws-athena-query-federation</artifactId>
<groupId>com.amazonaws</groupId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>athena-cloudera-impala</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<properties>
<clouderaVersion>2.6.32.1041</clouderaVersion>
</properties>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-federation-integ-test</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-jdbc</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</dependency>
<dependency>
<groupId>Impala</groupId>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>athena-jdbc</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions athena-cloudwatch-metrics/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM public.ecr.aws/lambda/java:11

# Copy function code and runtime dependencies from Maven layout
COPY target/athena-cloudwatch-metrics-2022.47.1.jar ${LAMBDA_TASK_ROOT}
COPY target/athena-cloudwatch-metrics-2024.51.1.jar ${LAMBDA_TASK_ROOT}
# Unpack the jar
RUN jar xf athena-cloudwatch-metrics-2022.47.1.jar
RUN jar xf athena-cloudwatch-metrics-2024.51.1.jar

# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
CMD [ "com.amazonaws.athena.connectors.cloudwatch.metrics.MetricsCompositeHandler" ]
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
LambdaFunctionName:
Expand Down Expand Up @@ -49,7 +49,7 @@ Resources:
FunctionName: !Ref LambdaFunctionName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudwatch-metrics:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudwatch-metrics:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
Description: "Enables Amazon Athena to communicate with Cloudwatch Metrics, making your metrics data accessible via SQL"
Timeout: 900
Expand Down
4 changes: 2 additions & 2 deletions athena-cloudwatch-metrics/athena-cloudwatch-metrics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata:
Labels:
- athena-federation
HomePageUrl: 'https://github.com/awslabs/aws-athena-query-federation'
SemanticVersion: 2022.47.1
SemanticVersion: 2024.51.1
SourceCodeUrl: 'https://github.com/awslabs/aws-athena-query-federation'
Parameters:
AthenaCatalogName:
Expand Down Expand Up @@ -56,7 +56,7 @@ Resources:
FunctionName: !Ref AthenaCatalogName
PackageType: "Image"
ImageUri: !Sub
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudwatch-metrics:2022.47.1'
- '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudwatch-metrics:2024.51.1'
- Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
Description: "Enables Amazon Athena to communicate with Cloudwatch Metrics, making your metrics data accessible via SQL"
Timeout: !Ref LambdaTimeout
Expand Down
6 changes: 3 additions & 3 deletions athena-cloudwatch-metrics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<parent>
<artifactId>aws-athena-query-federation</artifactId>
<groupId>com.amazonaws</groupId>
<version>2022.47.1</version>
<version>2024.51.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>athena-cloudwatch-metrics</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-athena-federation-sdk</artifactId>
<version>2022.47.1</version>
<version>2024.51.1</version>
<classifier>withdep</classifier>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions athena-cloudwatch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM public.ecr.aws/lambda/java:11

# Copy function code and runtime dependencies from Maven layout
COPY target/athena-cloudwatch-2022.47.1.jar ${LAMBDA_TASK_ROOT}
COPY target/athena-cloudwatch-2024.51.1.jar ${LAMBDA_TASK_ROOT}
# Unpack the jar
RUN jar xf athena-cloudwatch-2022.47.1.jar
RUN jar xf athena-cloudwatch-2024.51.1.jar

# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
CMD [ "com.amazonaws.athena.connectors.cloudwatch.CloudwatchCompositeHandler" ]
Loading

0 comments on commit 16dc34e

Please sign in to comment.