Merge branch 'main' into harmony-1495

nasa · Jul 12, 2023 · bfc04eb · bfc04eb
2 parents 21de574 + e41c595
commit bfc04eb
Show file tree

Hide file tree

Showing 8 changed files with 1,205 additions and 388 deletions.
diff --git a/.nsprc b/.nsprc
@@ -4,9 +4,29 @@
     "notes": "Ignored since we don't expose the vulnerability and there is no fix",
     "expiry": "2023-09-01"
   },
-  "1092310": {
+  "1092429": {
+    "active": true,
+    "notes": "Ignored since we don't expose the vulnerability and there is no fix",
+    "expiry": "2023-10-12"
+  },
+  "1092459": {
     "active": true,
     "notes": "Ignored since only affects semver used for development and there is no fix",
-    "expiry": "2023-09-01"
+    "expiry": "2023-10-12"
+  },
+  "1092460": {
+    "active": true,
+    "notes": "Ignored since only affects semver used for development and there is no fix",
+    "expiry": "2023-10-12"
+  },
+  "1092461": {
+    "active": true,
+    "notes": "Ignored since only affects semver used for development and there is no fix",
+    "expiry": "2023-10-12"
+  },
+  "1092470": {
+    "active": true,
+    "notes": "Ignored since we don't expose the vulnerability and there is no fix",
+    "expiry": "2023-10-12"
   }
 }
diff --git a/docs/edl-requirement.md b/docs/edl-requirement.md
@@ -7,6 +7,6 @@ To use Earthdata Login with a locally running Harmony, you must first [set up a
 3. Add the necessary Required Application Group
 4. Update .env with credentials
 
-You must select "401" as the application type for Harmony to work correctly with command line clients and clients like QGIS. Set the redirect URL to http://localhost:3000/oauth2/redirect for local Harmony. Leave `Required User Information` and `Redirect Time for Earthdata Login Splash page` empty. Check the checkbox for `By checking this box, I confirm that my application is compatible with EDL policy`. Leave the other checkbox unchecked. Then create the new application. After the application is created, you can use the "manage" -> "App Groups" tab to add the "EOSDIS Enterprise" group to the application. This "EOSDIS Enterprise" group will allow CMR searches issued by Harmony to be able to use your Earthdata Login tokens.
+Select "OAuth 2" as the application type. Set the redirect URL to http://localhost:3000/oauth2/redirect for local Harmony. Leave `Required User Information` and `Redirect Time for Earthdata Login Splash page` empty. Check the checkbox for `By checking this box, I confirm that my application is compatible with EDL policy`. Leave the other checkbox unchecked. Then create the new application. After the application is created, you can use the "manage" -> "App Groups" tab to add the "EOSDIS Enterprise" group to the application. This "EOSDIS Enterprise" group will allow CMR searches issued by Harmony to be able to use your Earthdata Login tokens.
 
 If you have an .env file ready to go (see bin/create-dotenv), set `OAUTH_CLIENT_ID`, `OAUTH_UID` and `OAUTH_PASSWORD` with the information from your Earthdata Login application. If you are not ready to create a .env file, refer back to these values later on when you are ready to populate it.
diff --git a/kubernetes-services/work-scheduler/.nsprc b/kubernetes-services/work-scheduler/.nsprc
@@ -3,5 +3,10 @@
     "active": true,
     "notes": "Ignored since we don't expose the vunlerability and there is no fix",
     "expiry": "2023-09-01"
+  },
+  "1092470": {
+    "active": true,
+    "notes": "Ignored since we don't expose the vulnerability and there is no fix",
+    "expiry": "2023-10-12"
   }
 }