Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMR-9355: Updating CMR UMM-C to update descriptions #2210

Merged
merged 3 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common-app-lib/src/cmr/common_app/config.clj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
(defconfig collection-umm-version
"Defines the latest collection umm version accepted by ingest - it's the latest official version.
This environment variable needs to be manually set when newer UMM version becomes official"
{:default "1.18.2"})
{:default "1.18.3"})

(defconfig launchpad-token-enforced
"Flag for whether or not launchpad token is enforced."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@
"DOI" : "10.1234/DOIID",
"Authority" : "https://doi.org/"
},
"ShortName" : "Mapping Short Name 1.18.2",
"EntryTitle" : "Mapping Example for UMM-C 1.18.2",
"ShortName" : "Mapping Short Name 1.18.3",
"EntryTitle" : "Mapping Example for UMM-C 1.18.3",
"PublicationReferences" : [ {
"OnlineResource" : {
"Linkage" : "http://www.yahoo.com",
Expand Down Expand Up @@ -814,9 +814,9 @@
"LongName" : "MUSES"
} ],
"MetadataSpecification" : {
"URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.2",
"URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.3",
"Name" : "UMM-C",
"Version" : "1.18.2"
"Version" : "1.18.3"
},
"ArchiveAndDistributionInformation" : {
"FileArchiveInformation" : [ {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
(:require
[clojure.java.io :as io]
[clojure.string :as string]
[clojure.test :refer :all]
[clojure.test :refer [are deftest is testing use-fixtures]]
[cmr.access-control.test.util :as test-util]
[cmr.common-app.config :as common-config]
[cmr.common-app.test.side-api :as side]
Expand Down Expand Up @@ -792,7 +792,7 @@
(testing "Ingest of a json collection with invalid mimetypes. This verifies that we validate mimetypes against kms."
(let [coll-metadata (slurp (io/resource "CMR-7647/CMR-7647.json"))
{:keys [status errors]} (ingest/ingest-concept
(ingest/concept :collection "PROV1" "foo" :umm-json coll-metadata)
(ingest/concept :collection "PROV1" "foo" {:format :umm-json :version "1.18.2"} coll-metadata)
TylerHeald1 marked this conversation as resolved.
Show resolved Hide resolved
{:validate-keywords false})]
(is (= 422 status))
(is (= [["Related URL Content Type, Type, and Subtype [ContactPerson1: BadURLContentType1>HOME PAGE>] are not a valid set together."]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@
(is (= 200 status))))

(testing (format "Translating umm-json to iso19115 produces the right codelist")
(let [input-format :umm-json
(let [input-format {:format :umm-json
:version "1.18.2"}
TylerHeald1 marked this conversation as resolved.
Show resolved Hide resolved
output-format :iso19115
options {:skip-sanitize-umm-c false}
input-json (slurp (io/resource "CMR-7557/test_data.json"))
Expand Down

Large diffs are not rendered by default.

Loading