Cumulus 4954 2

.gitignore

@@ -37,7 +37,6 @@ cumulus-message-adapter.zip
 dist/
 gitbook
 node_modules
-package-lock.json
 packaged-*
 packages/deployment/app/*.js
 profiles.clj

CHANGELOG.md

@@ -57,6 +57,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
     is now executed automatically by the DB migration Lambda handler post-migration.
 - **CUMULUS-4986**
   - Added `storage_type` variable to `tf-modules/cumulus-rds-tf` module with default value `aurora`.
+- **CUMULUS-4954**
+  - Added `AthenaQueryClient` to `packages/aws-client` that can interact with and run queries in Athena.
 
 ### Changed
 

bamboo/bootstrap-sftp.sh

@@ -12,4 +12,3 @@ if [[ $CI = true ]]; then
 fi
 chgrp user /data/granules
 chmod 775 /data/granules
-/usr/sbin/sshd -D -f /etc/ssh/sshd_config

bamboo/bootstrap-unit-tests.sh

@@ -59,7 +59,7 @@ while ! $docker_command  'curl --connect-timeout 5 -sS -o /dev/null http://127.0
 done
 echo 'HTTP service is available'
 
-$docker_command "mkdir /keys;cp $UNIT_TEST_BUILD_DIR/packages/test-data/keys/ssh_client_rsa_key /keys/; chmod -R 400 /keys"
+$docker_command "mkdir /keys; cp $UNIT_TEST_BUILD_DIR/packages/test-data/keys/ssh_client_rsa_key /keys/; chmod -R 400 /keys; ls -l /keys"
 
 # Wait for the SFTP server to be available
 while ! $docker_command "sftp \
@@ -70,6 +70,7 @@ while ! $docker_command "sftp \
   -o 'UserKnownHostsFile=/dev/null'\
   -o 'PreferredAuthentications=publickey'\
   user@127.0.0.1:/keys/ssh_client_rsa_key.pub /dev/null"; do
+  $docker_command "mkdir /keys; cp $UNIT_TEST_BUILD_DIR/packages/test-data/keys/ssh_client_rsa_key /keys/; chmod -R 400 /keys; ls -l /keys"
   echo 'Waiting for SFTP to start'
   docker ps -a
   sleep 2

bamboo/docker-compose-local.yml

@@ -24,7 +24,8 @@ services:
       - 127.0.0.1:8080:8080
       - 127.0.0.1:9200:9200
   localstack:
-    image: localstack/localstack:4.0.3
+    image: ministackorg/ministack:1.3.65
+    # image: ministackorg/ministack:1.3.65-full
   elasticsearch:
     image: elasticsearch:5.3
   http:

bamboo/docker-compose.yml

@@ -41,10 +41,11 @@ services:
     environment:
       ES_JAVA_OPTS: "-Xms750m -Xmx750m"
   localstack:
-    image: localstack/localstack:4.0.3
+    # image: ministackorg/ministack:1.3.65-full
+    image: ministackorg/ministack:1.3.65
     network_mode: "service:build_env"
     environment:
-      SERVICES: "cloudformation,cloudwatch,cloudwatchlogs,dynamodb,iam,kinesis,kms,lambda,s3,secretsmanager,sns,sqs,stepfunctions,ssm,logs"
+      - ATHENA_ENGINE=mock
   build_env:
     image: $CUMULUS_BASE_IMAGE
     volumes: