-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'efs-development' into CMR-9161
- Loading branch information
Showing
23 changed files
with
12,364 additions
and
37,308 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM node:18 | ||
| FROM node:16 | ||
|
|
||
| # Create and define the node_modules's cache directory. | ||
| RUN mkdir /usr/src/cache | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM node:18 | ||
| FROM node:16 | ||
|
|
||
| WORKDIR /app | ||
| RUN mkdir /app/artifacts | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
167 changes: 75 additions & 92 deletions
167
other/cmr-exchange/service-bridge/resources/config/cmr-opendap/config.edn
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,102 +1,85 @@ | ||
| {:api-version "v3" | ||
| :default-content-type "json" | ||
| :auth-caching {:jwt-public-key "{ | ||
| \"kty\": \"RSA\", | ||
| \"n\": \"3LopSyeoSZZGorSPjk4mMbR0ybVSLvfrONGSGXCNXE6ScX9Y1QC_zV8fVeh4XO8tYDi9CgzqK3Nhjsd5KI0ZzTI8Lf52tyr7OzebZXGZpMvyvdp59wlbPL4WFkIHvWFpgypSrTQIRENKaYW_yQB9srq6JpUx14aRG5TpiBuPqgnGM-qBqPvLq5LX9kVhqbV46TuZd9uPn_gISut7A7K3Y5S24DZd3ebxXPap1cn6-mIY30QG5oYmVlMZxdVPhnTzjj4ZNsfyKSRKq3F_UapEr4ynhr-ONgj8HyozyFqTpUn3o8pKAMVaOEfZmRlqb3jnQknbcsJ9fNxmWUUZr_PysQ\", | ||
| \"e\": \"AQAB\", | ||
| \"kid\": \"edljwtpubkey_sit\" | ||
| }" | ||
| :init {} | ||
| :auth-caching {:init {} | ||
| :ttl {:minutes 60} | ||
| :lru {:threshold 1000} | ||
| :dumpfile "data/cache/authz-dump.edn"} | ||
| :concept-caching {:init {} | ||
| :ttl {:hours 24} | ||
| :dumpfile "data/cache/concept-dump.edn"} | ||
| :cmr { | ||
| :access {:control {:protocol "https" | ||
| :cmr {:access {:control {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov" | ||
| :relative {:root {:url "/access-control"}}}} | ||
| :concept {:variable {:version "1.1"}} | ||
| :edl {:jwt {:public {:key "{ | ||
| \"kty\": \"RSA\", | ||
| \"n\": \"3LopSyeoSZZGorSPjk4mMbR0ybVSLvfrONGSGXCNXE6ScX9Y1QC_zV8fVeh4XO8tYDi9CgzqK3Nhjsd5KI0ZzTI8Lf52tyr7OzebZXGZpMvyvdp59wlbPL4WFkIHvWFpgypSrTQIRENKaYW_yQB9srq6JpUx14aRG5TpiBuPqgnGM-qBqPvLq5LX9kVhqbV46TuZd9uPn_gISut7A7K3Y5S24DZd3ebxXPap1cn6-mIY30QG5oYmVlMZxdVPhnTzjj4ZNsfyKSRKq3F_UapEr4ynhr-ONgj8HyozyFqTpUn3o8pKAMVaOEfZmRlqb3jnQknbcsJ9fNxmWUUZr_PysQ\", | ||
| \"e\": \"AQAB\", | ||
| \"kid\": \"edljwtpubkey_sit\" | ||
| }"}} | ||
| :rest | ||
| {:protocol "https" | ||
| :host "sit.urs.earthdata.nasa.gov"}} | ||
| :echo {:rest {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov" | ||
| :context "/legacy-services/rest"}} | ||
| :max-pagesize 2000 | ||
| :service {:bridge {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov" | ||
| :relative {:root {:url "/access-control"}}}} | ||
| :concept { | ||
| :variable {:version "1.1"}} | ||
| :edl {:rest | ||
| {:protocol "https" | ||
| :host "sit.urs.earthdata.nasa.gov"}} | ||
| :echo {:rest {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov" | ||
| :context "/legacy-services/rest"}} | ||
| :max-pagesize 2000 | ||
| :service { | ||
| :bridge {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov" | ||
| :public {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov"} | ||
| :relative {:root {:url "/service-bridge"}}}} | ||
| :search {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov" | ||
| :relative {:root {:url "/search"}}}} | ||
| :giovanni { | ||
| :search {:protocol "https" | ||
| :host "giovanni.gsfc.nasa.gov" | ||
| :relative {:root {:url "/giovanni"}}}} | ||
| :edsc { | ||
| :search {:protocol "https" | ||
| :host "search.sit.earthdata.nasa.gov" | ||
| :relative {:root {:url "/search"}}}} | ||
| :httpd { | ||
| :port 3013 | ||
| :entry-point-fn cmr.opendap.app.core/main | ||
| :route-fns { | ||
| :api cmr.opendap.app.routes.rest.core/all | ||
| :site cmr.opendap.app.routes.site/all} | ||
| :pages { | ||
| :default-title "CMR Service-Bridge"} | ||
| :base-url "/service-bridge" | ||
| :base-url-fn cmr.opendap.components.config/opendap-base-url | ||
| :docs "resources/public/docs" | ||
| :assets "resources/public/assets" | ||
| :rest-docs | ||
| {:base-url-template "%%BASE_URL%%" | ||
| :source "resources/docs/rest-api/index.md" | ||
| :outdir "resources/public/docs/service-bridge/docs/current/rest-api"} | ||
| :skip-static #{"/service-bridge/docs"} | ||
| :replace-base-url #{"/service-bridge/docs/current/rest-api" | ||
| "/service-bridge/docs/current/reference/2000-usage.html"} | ||
| :index-dirs #{"/service-bridge/docs/1.0.0/marginalia" | ||
| "/service-bridge/docs/1.0.0/reference" | ||
| "/service-bridge/docs/1.0.0/rest-api" | ||
| "/service-bridge/docs/1.5.0/marginalia" | ||
| "/service-bridge/docs/1.5.0/reference" | ||
| "/service-bridge/docs/1.5.0/rest-api" | ||
| "/service-bridge/docs/current/marginalia" | ||
| "/service-bridge/docs/current/reference" | ||
| "/service-bridge/docs/current/rest-api"} | ||
| :streaming { | ||
| :timeout 20000 ; milliseconds (20 seconds * 1000) | ||
| :heartbeat 200 ; milliseconds | ||
| }} | ||
| :logging { | ||
| :level :debug | ||
| :nss [cmr org.httpkit] | ||
| :color false} | ||
| :mission-control { | ||
| :messaging-type :core-async} | ||
| :plugin { | ||
| :jarfiles { | ||
| ;; The reducer factory function must take two args: plugin name and plugin | ||
| ;; type -- both of type ^String. The default reducer checks for an exact | ||
| ;; string match. | ||
| :reducer-factory cmr.plugin.jar.core/create-has-plugin-type-reducer} | ||
| :registry { | ||
| :default { | ||
| :plugin-name "CMR-Plugin" | ||
| :plugin-type "service-bridge-app" | ||
| ;; The fowllowing needs to be an in-JAR path to a plugin's config file, | ||
| ;; which will be read once its plugin has been identifed as a plugin of | ||
| ;; the desired name/type. | ||
| :config-file "config/cmr-plugin/config.edn"} | ||
| :web { | ||
| :route-keys [:httpd :route-fns] | ||
| :api-route-key :api | ||
| :site-route-key :site}}} | ||
| :public {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov"} | ||
| :relative {:root {:url "/service-bridge"}}}} | ||
| :search {:protocol "https" | ||
| :host "cmr.sit.earthdata.nasa.gov" | ||
| :relative {:root {:url "/search"}}}} | ||
| :giovanni {:search {:protocol "https" | ||
| :host "giovanni.gsfc.nasa.gov" | ||
| :relative {:root {:url "/giovanni"}}}} | ||
| :edsc {:search {:protocol "https" | ||
| :host "search.sit.earthdata.nasa.gov" | ||
| :relative {:root {:url "/search"}}}} | ||
| :httpd {:port 3013 | ||
| :entry-point-fn cmr.opendap.app.core/main | ||
| :route-fns {:api cmr.opendap.app.routes.rest.core/all | ||
| :site cmr.opendap.app.routes.site/all} | ||
| :pages {:default-title "CMR Service-Bridge"} | ||
| :base-url "/service-bridge" | ||
| :base-url-fn cmr.opendap.components.config/opendap-base-url | ||
| :docs "resources/public/docs" | ||
| :assets "resources/public/assets" | ||
| :rest-docs | ||
| {:base-url-template "%%BASE_URL%%" | ||
| :source "resources/docs/rest-api/index.md" | ||
| :outdir "resources/public/docs/service-bridge/docs/current/rest-api"} | ||
| :skip-static #{"/service-bridge/docs"} | ||
| :replace-base-url #{"/service-bridge/docs/current/rest-api" | ||
| "/service-bridge/docs/current/reference/2000-usage.html"} | ||
| :index-dirs #{"/service-bridge/docs/1.0.0/marginalia" | ||
| "/service-bridge/docs/1.0.0/reference" | ||
| "/service-bridge/docs/1.0.0/rest-api" | ||
| "/service-bridge/docs/1.5.0/marginalia" | ||
| "/service-bridge/docs/1.5.0/reference" | ||
| "/service-bridge/docs/1.5.0/rest-api" | ||
| "/service-bridge/docs/current/marginalia" | ||
| "/service-bridge/docs/current/reference" | ||
| "/service-bridge/docs/current/rest-api"} | ||
| :streaming {:timeout 20000 ; milliseconds (20 seconds * 1000) | ||
| :heartbeat 200}} ; milliseconds | ||
| :logging {:level :trace | ||
| :nss [cmr org.httpkit] | ||
| :color false} | ||
| :mission-control {:messaging-type :core-async} | ||
| :plugin {:jarfiles {;; The reducer factory function must take two args: plugin name and plugin | ||
| ;; type -- both of type ^String. The default reducer checks for an exact | ||
| ;; string match. | ||
| :reducer-factory cmr.plugin.jar.core/create-has-plugin-type-reducer} | ||
| :registry {:default {:plugin-name "CMR-Plugin" | ||
| :plugin-type "service-bridge-app" | ||
| ;; The following needs to be an in-JAR path to a plugin's config file, | ||
| ;; which will be read once its plugin has been identifed as a plugin of | ||
| ;; the desired name/type. | ||
| :config-file "config/cmr-plugin/config.edn"} | ||
| :web {:route-keys [:httpd :route-fns] | ||
| :api-route-key :api | ||
| :site-route-key :site}}} | ||
| :vendor "cmr-service-bridge"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| {% extends "templates/search-base.html" %} | ||
|
|
||
| {% block title %}CMR Preview{% endblock %} | ||
|
|
||
| {% block head-pre-css %} | ||
| //replace {{ preview-version }} with MMT-3263-10 temporarily for testing purpose. | ||
| <script defer src="{{ preview-root }}/plugin/metadata-preview.MMT-3263-10.js"></script> | ||
| <link href="{{ preview-root }}/plugin/metadata-preview.MMT-3263-10.min.css" rel="stylesheet" type="text/css"> | ||
| {% endblock %} | ||
|
|
||
| {% block main-content %} | ||
| <div id="metadata-preview"> | ||
| <p>Fetching Tool...</p> | ||
| </div> | ||
| {% endblock %} | ||
|
|
||
| {% block body-end %} | ||
| <script> | ||
| // Callback to set the page title when a tool is successfully loaded | ||
| function onSearchComplete(data) { | ||
| var tool = data.tool; | ||
|
|
||
| if (tool && tool.title) { | ||
| document.title = tool.title; | ||
| } | ||
| } | ||
|
|
||
| // Ensure scripts have loaded before initializing the preview plugin | ||
| document.addEventListener("DOMContentLoaded", function() { | ||
| // Get the element where the content should be displayed | ||
| const element = document.getElementById('metadata-preview'); | ||
|
|
||
| // Initialize the preview plugin with `.init(config, element)` | ||
| const config = { | ||
| conceptId: "{{ concept-id }}", | ||
| conceptType: 'tool', | ||
| conceptUrlTemplate: '/search/concepts/{conceptId}.html', | ||
| token: "{{ token }}", | ||
| onSearchComplete: onSearchComplete | ||
| } | ||
|
|
||
| MetadataPreview.init(config, element); | ||
| }); | ||
| </script> | ||
| {% endblock %} |
Oops, something went wrong.