Merge pull request #27 from podaac/release/4.10.0

Release 4.10.0

CHANGELOG.md

@@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 
+## [4.10.0]
+### Added
+### Changed
+### Removed
+- issue-24: Removed last references to on-prem l2ss and podaac-tools.
+### Fixed
+
 ## [4.9.8]
 ### Added
 - Update github actions to have commit message trigger deploys

CONTRIBUTING.md

@@ -43,7 +43,7 @@ an appropriate label:
     - Anything related to CI/CD or metadata
 - `enhancement`
     - Improvement of an existing feature
-- `new-feature`
+- `new-feature`git 
     - An entirely new feature
 
 Feature and enhancement requests should contain a detailed description 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gov.nasa.jpl.podaac/hitide-profile",
   "service_name": "hitide-profile",
-  "version": "4.9.8",
+  "version": "4.10.0-rc.1",
   "description": "",
   "main": "index.js",
   "scripts": {

server/config/default-config.js

@@ -33,12 +33,6 @@ module.exports = {
     EARTH_DATA_LOGIN_CLIENT_ID: "",
     EARTH_DATA_LOGIN_PASSWORD: "",
 
-    // The url for l2ss /subset/submit endpoint
-    L2SS_SUBSET_SUBMIT_REQUEST_URI:
-        "https://podaac-tools.jpl.nasa.gov/l2ss-services/l2ss/subset/submit",
-    L2SS_SUBSET_STATUS_REQUEST_URI:
-        "https://podaac-tools.jpl.nasa.gov/l2ss-services/l2ss/subset/status",
-
     HARMONY_BASE_URL: 'https://harmony.earthdata.nasa.gov',
 
     // The origin (protocol://host:port) for any apps that should be able to access this API by CORS

server/config/extracter.js

@@ -29,9 +29,6 @@ function extractConfig(source) {
     copyString(config, source, "EARTH_DATA_LOGIN_CLIENT_ID");
     copyString(config, source, "EARTH_DATA_LOGIN_PASSWORD");
 
-    copyString(config, source, "L2SS_SUBSET_SUBMIT_REQUEST_URI");
-    copyString(config, source, "L2SS_SUBSET_STATUS_REQUEST_URI");
-
     copyString(config, source, "HARMONY_BASE_URL");
 
     copyList(config, source, "LIST_OF_AUTHORIZED_CORS_REQUESTER_ORIGINS");

server/config/tests/extracter.test.js

@@ -222,8 +222,6 @@ describe("extractConfig(...)", () => {
         EARTH_DATA_LOGIN_USER_INFO_URI: "edl-user-info",
         EARTH_DATA_LOGIN_CLIENT_ID: "edl-client-id",
         EARTH_DATA_LOGIN_PASSWORD: "edl-password",
-        L2SS_SUBSET_SUBMIT_REQUEST_URI: "l2ss-subset-url",
-        L2SS_SUBSET_STATUS_REQUEST_URI: "l2ss-status-url",
         LIST_OF_AUTHORIZED_CORS_REQUESTER_ORIGINS: ["origin1", "origin2"],
     };
 

server/routes/jobs.js

@@ -1,7 +1,6 @@
 const express = require("express");
 const util = require("../util/util.js");
 const history = require("../util/history-db.js");
-const l2ssController = require("./l2ss-job-service");
 const harmonyController = require("./harmony-job-service");
 const {
     requireLogin,
@@ -24,13 +23,7 @@ route.post(
             const accessToken = util.get(req, "session", "tokenObj", "access_token");
             const timestamp = util.utcTimestamp();
             const job = req.body;
-
-            let submittedJob;
-            if (isL2ssJob(job)) {
-                submittedJob = await l2ssController.submitJob(job, uid, timestamp);
-            } else {
-                submittedJob = await harmonyController.submitJob(job, uid, timestamp, accessToken);
-            }
+            const submittedJob = await harmonyController.submitJob(job, uid, timestamp, accessToken);
 
             await history.addJob(submittedJob);
             res.json(submittedJob);
@@ -57,13 +50,7 @@ route.get(
             const accessToken = util.get(req, "session", "tokenObj", "access_token");
             const job = await history.getJobByToken(token);
 
-            let updatedJob;
-            if (isL2ssJob(job)) {
-                updatedJob = await l2ssController.getJobWithUpdates(job);
-            } else {
-                updatedJob = await harmonyController.getJobWithUpdates(job, accessToken);
-            }
-
+            const updatedJob = await harmonyController.getJobWithUpdates(job, accessToken);
             await history.updateJob(updatedJob);
             res.json(updatedJob);
         } catch (error) {
@@ -120,8 +107,4 @@ route.post(
     }
 );
 
-module.exports = route;
-
-function isL2ssJob(job) {
-    return job.subjobs[0].source !== "cmr";
-}
+module.exports = route;

server/util/generate-citations.js

@@ -48,7 +48,7 @@ function generateCitation(job, subjobIndex) {
     let str = `PO.DAAC 2019. High-Level Tool for Interactive Data Extraction (HiTIDE V ${
         util.getHitideVersion().string
     }). `;
-    str += `PO.DAAC, Jet Propulsion Laboratory, Pasadena, California, USA. https://podaac-tools.jpl.nasa.gov/hitide. `;
+    str += `PO.DAAC, Jet Propulsion Laboratory, Pasadena, California, USA. https://hitide.podaac.earthdatacloud.nasa.gov/. `;
     str += `Accessed ${monthName} ${date}, ${year}. Subset obtained for ${datasetId} product `;
     str += `for region: ${westLon}, ${southLat}, ${eastLon}, ${northLat} time period: ${searchStartDate} to ${searchEndDate}.`;
 

terraform/fargate.tf

@@ -140,14 +140,6 @@ resource "aws_ecs_task_definition" "fargate_task" {
           name  = "EARTH_DATA_LOGIN_USER_INFO_URI"
           value = "${var.earth_data_login_base_url}"
         },
-        {
-          name  = "L2SS_SUBSET_SUBMIT_REQUEST_URI"
-          value = "${var.l2ss_base_url}/subset/submit"
-        },
-        {
-          name  = "L2SS_SUBSET_STATUS_REQUEST_URI"
-          value = "${var.l2ss_base_url}/subset/status"
-        },
         {
           name  = "HARMONY_BASE_URL"
           value = "${var.harmony_base_url}"

terraform/tfvars/ops.tfvars

@@ -3,7 +3,6 @@ stage = "ops"
 load_balancer_name    = "hitide-profile-alb"
 load_balancer_sg_name = "svc-hitide-profile-ops-lb-sg"
 
-l2ss_base_url             = "https://podaac-tools.jpl.nasa.gov/l2ss-services/l2ss"
 earth_data_login_base_url = "https://urs.earthdata.nasa.gov"
 harmony_base_url          = "https://harmony.earthdata.nasa.gov"
-LIST_OF_AUTHORIZED_CORS_REQUESTER_ORIGINS = "https://podaac-tools.jpl.nasa.gov, https://hitide.podaac.earthdatacloud.nasa.gov, http://localhost:8901"
+LIST_OF_AUTHORIZED_CORS_REQUESTER_ORIGINS = "https://hitide.podaac.earthdatacloud.nasa.gov, http://localhost:8901"

terraform/tfvars/sit.tfvars

@@ -3,7 +3,6 @@ stage = "sit"
 load_balancer_name    = "hitide-profile-alb"
 load_balancer_sg_name = "svc-hitide-profile-sit-lb-sg"
 
-l2ss_base_url             = "https://podaac-tools.jpl.nasa.gov/l2ss-services/l2ss"
 earth_data_login_base_url = "https://uat.urs.earthdata.nasa.gov"
 harmony_base_url          = "https://harmony.uat.earthdata.nasa.gov"
 LIST_OF_AUTHORIZED_CORS_REQUESTER_ORIGINS = "https://hitide.podaac.sit.earthdatacloud.nasa.gov, http://localhost:8901"

terraform/tfvars/uat.tfvars

@@ -3,7 +3,6 @@ stage = "uat"
 load_balancer_name    = "hitide-profile-alb"
 load_balancer_sg_name = "svc-hitide-profile-uat-lb-sg"
 
-l2ss_base_url             = "https://podaac-tools.jpl.nasa.gov/l2ss-services/l2ss"
 earth_data_login_base_url = "https://uat.urs.earthdata.nasa.gov"
 harmony_base_url          = "https://harmony.uat.earthdata.nasa.gov"
-LIST_OF_AUTHORIZED_CORS_REQUESTER_ORIGINS = "https://test-tools.jpl.nasa.gov, https://hitide.podaac.uat.earthdatacloud.nasa.gov, http://localhost:8901"
+LIST_OF_AUTHORIZED_CORS_REQUESTER_ORIGINS = "https://hitide.podaac.uat.earthdatacloud.nasa.gov, http://localhost:8901"

terraform/variables.tf

@@ -67,9 +67,6 @@ variable "load_balancer_sg_name" {
 variable "earth_data_login_base_url" {
   default = "https://urs.earthdata.nasa.gov"
 }
-variable "l2ss_base_url" {
-  default = "https://podaac-tools.jpl.nasa.gov/l2ss-services/l2ss"
-}
 
 variable "harmony_base_url" {
   default = "https://harmony.earthdata.nasa.gov"