Merge remote-tracking branch 'origin/main' into develop

Author: nikki-t

.github/workflows/build.yml

@@ -164,7 +164,7 @@ jobs:
           terraform init -backend=false
           terraform validate -no-color
       - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@master
+        uses: SonarSource/sonarqube-scan-action@v5.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

CHANGELOG.md

@@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## [1.6.1]
+ 
+### Added
+    - Issue 282 - API Key request for bulk download (Fathom API key)
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
 ## [1.6.0]
 
 ### Added

terraform/hydrocron-apigw.tf

@@ -105,6 +105,11 @@ resource "aws_api_gateway_api_key" "confluence-user-key" {
 }
 
 
+resource "aws_api_gateway_api_key" "fathom-user-key" {
+  name = "${local.aws_resource_prefix}-api-key-fathom"
+}
+
+
 # Usage Plans
 resource "aws_api_gateway_usage_plan" "default-user-usage-plan" {
   name        = "${local.aws_resource_prefix}-usage-plan-default"
@@ -131,8 +136,8 @@ resource "aws_api_gateway_usage_plan_key" "default-user-usage-key" {
 }
 
 
-resource "aws_api_gateway_usage_plan" "trusted-user-usage-plan" {
-  name        = "${local.aws_resource_prefix}-usage-plan-trusted"
+resource "aws_api_gateway_usage_plan" "confluence-user-usage-plan" {
+  name        = "${local.aws_resource_prefix}-usage-plan-confluence"
   description = "Hydrocron trusted user usage plan"
   api_stages {
     api_id = aws_api_gateway_rest_api.hydrocron-api-gateway.id
@@ -152,5 +157,30 @@ resource "aws_api_gateway_usage_plan" "trusted-user-usage-plan" {
 resource "aws_api_gateway_usage_plan_key" "confluence-user-usage-key" {
   key_id        = aws_api_gateway_api_key.confluence-user-key.id
   key_type      = "API_KEY"
-  usage_plan_id = aws_api_gateway_usage_plan.trusted-user-usage-plan.id
+  usage_plan_id = aws_api_gateway_usage_plan.confluence-user-usage-plan.id
+}
+
+
+resource "aws_api_gateway_usage_plan" "fathom-user-usage-plan" {
+  name        = "${local.aws_resource_prefix}-usage-plan-fathom"
+  description = "Hydrocron trusted user usage plan"
+  api_stages {
+    api_id = aws_api_gateway_rest_api.hydrocron-api-gateway.id
+    stage  = aws_api_gateway_stage.hydrocron-api-gateway-stage.stage_name
+  }
+  quota_settings {
+    limit  = 11200000
+    period = "MONTH"
+  }
+  throttle_settings {
+    burst_limit = 200
+    rate_limit  = 2000
+  }
+}
+
+
+resource "aws_api_gateway_usage_plan_key" "fathom-user-usage-key" {
+  key_id        = aws_api_gateway_api_key.fathom-user-key.id
+  key_type      = "API_KEY"
+  usage_plan_id = aws_api_gateway_usage_plan.fathom-user-usage-plan.id
 }

terraform/hydrocron-ssm.tf

@@ -19,7 +19,8 @@ resource "aws_ssm_parameter" "trusted-user-parameter" {
   type        = "SecureString"
   value = jsonencode(
     [
-      "${aws_api_gateway_api_key.confluence-user-key.value}"
+      "${aws_api_gateway_api_key.confluence-user-key.value}",
+      "${aws_api_gateway_api_key.fathom-user-key.value}"
     ]
   )
 }