From b7592d0e6387396304b39ba49822ea69e3dd380c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 09:39:55 -0700
Subject: [PATCH 01/11] change config
---
nshms.yml | 92 ++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 67 insertions(+), 25 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index f60efbac..6feb724b 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -1,6 +1,33 @@
####
# NSHMs to use for unit tests and for deployments.
+#
+# Example with mixed deployment:
+#
+# repo: 'nshm-conus'
+# tag: '6.1.0'
+# year: 2023
+# deployment:
+# baseHref: '/ws/nshmp/conus-2023/dynamic'
+# environments:
+# development:
+# type: 'LAMBDA'
+# staging:
+# type: 'LAMBDA'
+# production:
+# type: 'EC2'
+# cpu: 8
+# memory: 32
+# min: 1
+# max: 3
+# label: '2023 Conterminous U.S. Dynamic Services'
+# model: 'CONUS_2023'
+# test:
+# site:
+# latitude: 37.75
+# longitude: -122.4
+# treeId: 3199
####
+
nshms:
# Alaska 2007 NSHM
-
@@ -9,11 +36,13 @@ nshms:
year: 2007
deployment:
baseHref: '/ws/nshmp/alaska-2007/dynamic'
- type: 'LAMBDA'
environments:
- - 'development'
- - 'staging'
- # - production
+ development:
+ type: 'LAMBDA'
+ staging:
+ type: 'LAMBDA'
+ # production:
+ # type: 'LAMBDA'
label: '2007 Alaska Dynamic Services'
model: 'ALASKA_2007'
test:
@@ -29,11 +58,13 @@ nshms:
year: 2023
deployment:
baseHref: '/ws/nshmp/alaska-2023/dynamic'
- type: 'LAMBDA'
environments:
- - 'development'
- - 'staging'
- - 'production'
+ development:
+ type: 'LAMBDA'
+ staging:
+ type: 'LAMBDA'
+ production:
+ type: 'LAMBDA'
label: '2023 Alaska Dynamic Services (beta)'
model: 'ALASKA_2023'
test:
@@ -49,11 +80,13 @@ nshms:
year: 2018
deployment:
baseHref: '/ws/nshmp/conus-2018/dynamic'
- type: 'LAMBDA'
environments:
- - 'development'
- - 'staging'
- - 'production'
+ development:
+ type: 'LAMBDA'
+ staging:
+ type: 'LAMBDA'
+ production:
+ type: 'LAMBDA'
label: '2018 Conterminous U.S. Dynamic Services'
model: 'CONUS_2018'
test:
@@ -69,11 +102,17 @@ nshms:
year: 2023
deployment:
baseHref: '/ws/nshmp/conus-2023/dynamic'
- type: 'LAMBDA'
environments:
- - 'development'
- - 'staging'
- - 'production'
+ development:
+ type: 'EC2'
+ cpu: 8
+ memory: 32
+ min: 1
+ max: 3
+ staging:
+ type: 'LAMBDA'
+ production:
+ type: 'LAMBDA'
label: '2023 Conterminous U.S. Dynamic Services'
model: 'CONUS_2023'
test:
@@ -89,11 +128,13 @@ nshms:
year: 2021
deployment:
baseHref: '/ws/nshmp/hawaii-2021/dynamic'
- type: 'LAMBDA'
environments:
- - 'development'
- - 'staging'
- - 'production'
+ development:
+ type: 'LAMBDA'
+ staging:
+ type: 'LAMBDA'
+ production:
+ type: 'LAMBDA'
label: '2021 Hawaii Dynamic Services'
model: 'HAWAII_2021'
test:
@@ -109,11 +150,13 @@ nshms:
year: 2025
deployment:
baseHref: '/ws/nshmp/prvi-2025/dynamic'
- type: 'LAMBDA'
environments:
- - 'development'
- - 'staging'
- # - production:
+ development:
+ type: 'LAMBDA'
+ staging:
+ type: 'LAMBDA'
+ production:
+ type: 'LAMBDA'
label: '2025 PRVI Dynamic Services'
model: 'PRVI_2025'
test:
@@ -121,4 +164,3 @@ nshms:
latitude: 18.47
longitude: -66.12
treeId: 7400
-
--
GitLab
From f421bd32635460912185f1d1f785c7eeb56eae96 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 11:16:01 -0700
Subject: [PATCH 02/11] change to lambda
---
nshms.yml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index 6feb724b..2d794b6c 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -104,11 +104,7 @@ nshms:
baseHref: '/ws/nshmp/conus-2023/dynamic'
environments:
development:
- type: 'EC2'
- cpu: 8
- memory: 32
- min: 1
- max: 3
+ type: 'LAMBDA'
staging:
type: 'LAMBDA'
production:
--
GitLab
From 2365b85a0c8c064d686eff754c4f480f275e7327 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 12:49:13 -0700
Subject: [PATCH 03/11] add server dep for ec2 deployment
---
gradle/dependencies.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index b1a32d9e..7adc00fc 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -20,6 +20,7 @@ dependencies {
implementation("io.micronaut.crac:micronaut-crac")
implementation("jakarta.annotation:jakarta.annotation-api")
implementation("io.micronaut.aws:micronaut-function-aws-api-proxy")
+ implementation "io.micronaut:micronaut-http-server-netty"
runtimeOnly("ch.qos.logback:logback-classic")
// Swagger
--
GitLab
From 947744de27c53e9febbf60070f654e30db182c4d Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 12:49:27 -0700
Subject: [PATCH 04/11] cahnge to input stream
---
.../gov/usgs/earthquake/nshmp/www/SwaggerUIController.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
index d18a7ff4..14c085c1 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
@@ -1,7 +1,7 @@
package gov.usgs.earthquake.nshmp.www;
-import java.io.BufferedInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
@@ -112,9 +112,10 @@ public class SwaggerUIController {
private String getResourceString(String path) throws IOException {
Optional<URL> resource = loader.getResource(path);
+ resource.get().getContent();
return IOUtils.toString(
- (BufferedInputStream) resource.orElseThrow().getContent(),
+ (InputStream) resource.orElseThrow().getContent(),
StandardCharsets.UTF_8);
}
}
--
GitLab
From 8b3d7441abb5105990e6cf82ba7d4ad9c0fb692b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 12:53:45 -0700
Subject: [PATCH 05/11] test
---
nshms.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/nshms.yml b/nshms.yml
index 2d794b6c..1481259f 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -104,7 +104,12 @@ nshms:
baseHref: '/ws/nshmp/conus-2023/dynamic'
environments:
development:
- type: 'LAMBDA'
+ # type: 'LAMBDA'
+ type: 'EC2'
+ cpu: 8
+ memory: 32
+ min: 1
+ max: 3
staging:
type: 'LAMBDA'
production:
--
GitLab
From 7d2a34cebc93d2d56a237d2f0e09a337e91dfa78 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 14:25:32 -0700
Subject: [PATCH 06/11] switch back to Lambda
---
nshms.yml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index 1481259f..2d794b6c 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -104,12 +104,7 @@ nshms:
baseHref: '/ws/nshmp/conus-2023/dynamic'
environments:
development:
- # type: 'LAMBDA'
- type: 'EC2'
- cpu: 8
- memory: 32
- min: 1
- max: 3
+ type: 'LAMBDA'
staging:
type: 'LAMBDA'
production:
--
GitLab
From 30c2ace8e9931bdd86979a21bb6604a42f8e9700 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 14:35:13 -0700
Subject: [PATCH 07/11] test
---
gradle/dependencies.gradle | 3 ++-
nshms.yml | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 7adc00fc..87ea9d7c 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -20,7 +20,8 @@ dependencies {
implementation("io.micronaut.crac:micronaut-crac")
implementation("jakarta.annotation:jakarta.annotation-api")
implementation("io.micronaut.aws:micronaut-function-aws-api-proxy")
- implementation "io.micronaut:micronaut-http-server-netty"
+ implementation("io.micronaut:micronaut-http-server-netty")
+ implementation("io.micronaut:micronaut-http-client")
runtimeOnly("ch.qos.logback:logback-classic")
// Swagger
diff --git a/nshms.yml b/nshms.yml
index 2d794b6c..1481259f 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -104,7 +104,12 @@ nshms:
baseHref: '/ws/nshmp/conus-2023/dynamic'
environments:
development:
- type: 'LAMBDA'
+ # type: 'LAMBDA'
+ type: 'EC2'
+ cpu: 8
+ memory: 32
+ min: 1
+ max: 3
staging:
type: 'LAMBDA'
production:
--
GitLab
From 9cd5dff3f1c1adc11a6b80a6990d2880bc07c805 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 14:43:23 -0700
Subject: [PATCH 08/11] test
---
nshms.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index 1481259f..fdc3ad9f 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -38,7 +38,12 @@ nshms:
baseHref: '/ws/nshmp/alaska-2007/dynamic'
environments:
development:
- type: 'LAMBDA'
+ # type: 'LAMBDA'
+ type: 'EC2'
+ cpu: 4
+ memory: 8
+ min: 1
+ max: 3
staging:
type: 'LAMBDA'
# production:
@@ -104,12 +109,7 @@ nshms:
baseHref: '/ws/nshmp/conus-2023/dynamic'
environments:
development:
- # type: 'LAMBDA'
- type: 'EC2'
- cpu: 8
- memory: 32
- min: 1
- max: 3
+ type: 'LAMBDA'
staging:
type: 'LAMBDA'
production:
--
GitLab
From 40856968a9a0ad334517c65360b2d6fed37c22db Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 14:44:55 -0700
Subject: [PATCH 09/11] change deps
---
gradle/dependencies.gradle | 1 -
1 file changed, 1 deletion(-)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 87ea9d7c..8440bb3a 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -21,7 +21,6 @@ dependencies {
implementation("jakarta.annotation:jakarta.annotation-api")
implementation("io.micronaut.aws:micronaut-function-aws-api-proxy")
implementation("io.micronaut:micronaut-http-server-netty")
- implementation("io.micronaut:micronaut-http-client")
runtimeOnly("ch.qos.logback:logback-classic")
// Swagger
--
GitLab
From 428a408cfb7ab0959b56232635d13d157bcbff45 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 15:27:43 -0700
Subject: [PATCH 10/11] switch to lambda
---
nshms.yml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index fdc3ad9f..2d794b6c 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -38,12 +38,7 @@ nshms:
baseHref: '/ws/nshmp/alaska-2007/dynamic'
environments:
development:
- # type: 'LAMBDA'
- type: 'EC2'
- cpu: 4
- memory: 8
- min: 1
- max: 3
+ type: 'LAMBDA'
staging:
type: 'LAMBDA'
# production:
--
GitLab
From 7bf3f74bf950decc095cabaffa3fdc12631e91ba Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 15:30:29 -0700
Subject: [PATCH 11/11] clean
---
.../java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
index 14c085c1..6712f929 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
@@ -112,7 +112,6 @@ public class SwaggerUIController {
private String getResourceString(String path) throws IOException {
Optional<URL> resource = loader.getResource(path);
- resource.get().getContent();
return IOUtils.toString(
(InputStream) resource.orElseThrow().getContent(),
--
GitLab