Skip to content

Commit a7d8c66

Browse files
jmaeng72jmaeng72
committed
update jackson deps and fix access control test
1 parent 6ee2d0c commit a7d8c66

12 files changed

Lines changed: 38 additions & 27 deletions

File tree

‎access-control-app/int-test/cmr/access_control/int_test/acl_search_test.clj‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,15 @@
4747

4848
(defn- generate-query-map-for-group-permissions
4949
"Returns a query map generated from group permission pairs.
50-
group-permissions should be a seqeuence of group/user-identifer permission pairs such as
50+
group-permissions should be a sequence of group/user-identifer permission pairs such as
5151
[\"guest\" \"read\" \"AG10000-PROV1\" \"create\" \"registered\" \"order\"]"
5252
[group-permissions]
53-
(first (reduce (fn [[m count] [group permission]]
54-
[(assoc-in m
55-
[:group-permission (keyword (str count))]
56-
{:permitted-group group
57-
:permission permission})
58-
(inc count)])
59-
[{} 0]
60-
(partition 2 group-permissions))))
53+
(reduce (fn [query-map [index [group permission]]]
54+
(assoc query-map
55+
(str "group-permission[" index "][permitted-group]") group
56+
(str "group-permission[" index "][permission]") permission))
57+
{}
58+
(map-indexed vector (partition 2 group-permissions))))
6159

6260
(deftest acl-search-order-test
6361
;; Conforms to requirements set out in CMR-3590, alphabetical order regardless of case
@@ -415,11 +413,16 @@
415413
;; CMR-3154 acceptance criterium 3
416414
(testing "Search ACLs by group permission just group or permission"
417415
(are3 [query-map acls]
418-
(let [response (ac/search-for-acls (u/conn-context)
419-
{:group-permission {:0 query-map} :page_size 20}
416+
(let [flat-query (into {}
417+
(for [[k v] query-map]
418+
[(str "group-permission[0][" (name k) "]") v]))
419+
;; Merge the flattened query with the page_size parameter
420+
response (ac/search-for-acls (u/conn-context)
421+
(merge flat-query {:page_size 20})
420422
{:token token})]
421423
(is (= (u/acls->search-response (count acls) acls)
422424
(dissoc response :took))))
425+
423426
"Just user type"
424427
{:permitted-group "guest"} guest-acls
425428

@@ -434,22 +437,25 @@
434437

435438
;; CMR-3154 acceptance criterium 4
436439
(testing "Search ACLS by group permission with non integer index is an error"
437-
(let [query {:group-permission {:foo {:permitted-group "guest" :permission "read"}}}]
440+
(let [query {"group-permission[foo][permitted-group]" "guest"
441+
"group-permission[foo][permission]" "read"}]
438442
(is (= {:status 400
439443
:body {:errors ["Parameter group_permission has invalid index value [foo]. Only integers greater than or equal to zero may be specified."]}
440444
:content-type :json}
441445
(ac/search-for-acls (u/conn-context) query {:token token :raw? true})))))
442446

443447
;; CMR-3154 acceptance criterium 5
444448
(testing "Search ACLS by group permission with subfield other than permitted_group or permission is an error"
445-
(let [query {:group-permission {:0 {:allowed-group "guest" :permission "read"}}}]
449+
(let [query {"group-permission[0][allowed-group]" "guest"
450+
"group-permission[0][permission]" "read"}]
446451
(is (= {:status 400
447452
:body {:errors ["Parameter group_permission has invalid subfield [allowed_group]. Only 'permitted_group' and 'permission' are allowed."]}
448453
:content-type :json}
449454
(ac/search-for-acls (u/conn-context) query {:token token :raw? true})))))
450455

451456
(testing "Searching ACLS by group permission with permission values other than read, create, update, delete, or order is an error"
452-
(let [query {:group-permission {:0 {:permitted_group "guest" :permission "foo"}}}]
457+
(let [query {"group-permission[0][permitted_group]" "guest"
458+
"group-permission[0][permission]" "foo"}]
453459
(is (= {:status 400
454460
:body {:errors ["Sub-parameter permission of parameter group_permissions has invalid values [foo]. Only 'read', 'update', 'create', 'delete', or 'order' may be specified."]}
455461
:content-type :json}

‎access-control-app/project.clj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@
3030
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/access-control-app"
3131
:parent-project {:path "../project.clj"
3232
:inherit [:managed-dependencies]}
33-
:dependencies ~(concat '[[cheshire "5.12.0"
34-
:exclusions [com.fasterxml.jackson.core/jackson-core]]
33+
:dependencies ~(concat '[[cheshire
34+
:exclusions [com.fasterxml.jackson.core/jackson-core
35+
com.fasterxml.jackson.dataformat/jackson-dataformat-cbor
36+
com.fasterxml.jackson.dataformat/jackson-dataformat-smile]]
3537
[clj-time "0.15.1"]
3638
[com.fasterxml.jackson.core/jackson-core]
39+
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor]
40+
[com.fasterxml.jackson.dataformat/jackson-dataformat-smile]
3741
[commons-codec/commons-codec "1.11"]
3842
[commons-io "2.18.0"]
3943
[compojure "1.6.1"

‎bootstrap-app/project.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/bootstrap-app"
44
:parent-project {:path "../project.clj"
55
:inherit [:managed-dependencies]}
6-
:dependencies [[cheshire "5.12.0"
6+
:dependencies [[cheshire
77
:exclusions [com.fasterxml.jackson.core/jackson-core]]
88
[clj-http "2.3.0"]
99
[com.fasterxml.jackson.core/jackson-core]

‎common-app-lib/project.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/common-app-lib"
44
:parent-project {:path "../project.clj"
55
:inherit [:managed-dependencies]}
6-
:dependencies [[cheshire "5.12.0"
6+
:dependencies [[cheshire
77
:exclusions [com.fasterxml.jackson.core/jackson-core]]
88
[com.fasterxml.jackson.core/jackson-core]
99
[clj-time "0.15.1"]

‎common-lib/project.clj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
[clojusc/ltest "0.3.0"]
2020
[com.dadrox/quiet-slf4j "0.1"]
2121
[com.fasterxml.jackson.core/jackson-core]
22-
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.21.2"
23-
:exclusions [com.fasterxml.jackson.core/jackson-databind]]
22+
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor]
2423
[com.gfredericks/test.chuck "0.2.9"]
2524
[com.taoensso/timbre "5.1.0"]
2625
[commons-codec/commons-codec "1.11"]

‎es-spatial-plugin/project.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
cmr.elasticsearch.plugins.spatial.engine.core
9292
cmr.elasticsearch.plugins.spatial.plugin]}
9393
:dev {:dependencies [[criterium "0.4.4"]
94-
[cheshire "5.12.0"]
94+
[cheshire "6.2.0"]
9595
[org.clojure/tools.reader "1.3.2"]
9696
[nasa-cmr/cmr-common-lib "0.1.1-SNAPSHOT"]
9797
[nasa-cmr/cmr-spatial-lib "0.1.0-SNAPSHOT"]

‎metadata-db-app/project.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/metadata-db-app"
55
:parent-project {:path "../project.clj"
66
:inherit [:managed-dependencies]}
7-
:dependencies [[cheshire "5.12.0" :exclusions [com.fasterxml.jackson.core/jackson-core]]
7+
:dependencies [[cheshire :exclusions [com.fasterxml.jackson.core/jackson-core]]
88
[clj-http "3.11.0"]
99
[clj-time "0.15.1"]
1010
[com.fasterxml.jackson.core/jackson-core]

‎project.clj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
[lein-parent "0.3.9"]
1919
[lein-shell "0.5.0"]]
2020
:managed-dependencies [[at.yawk.lz4/lz4-java "1.11.1"]
21-
[cheshire "5.12.0"] ;; latest is 6.1.0
21+
[cheshire "6.2.0"] ;; latest is 6.1.0
2222
[clj-http "3.11.0"] ;; latest is 3.13.1
2323
[clj-time "0.15.1"] ;; latest is 0.15.2
2424
[com.fasterxml.jackson.core/jackson-annotations "2.21"]
2525
[com.fasterxml.jackson.core/jackson-core "2.21.4"]
2626
[com.fasterxml.jackson.core/jackson-databind "2.21.4"]
27+
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.21.4"]
28+
[com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.21.4"]
2729
[org.clojure/clojure "1.11.2"] ;; latest is 1.11.4 or 1.12.2
2830
[org.apache.commons/commons-compress "1.28.0"] ;; see testcontainers
2931
[org.apache.logging.log4j/log4j-api "2.25.4"]

‎schema-validation-lib/project.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:plugins [[lein-exec "0.3.7"]
77
[lein-parent "0.3.9"]
88
[lein-shell "0.5.0"]]
9-
:dependencies [[cheshire "5.12.0"
9+
:dependencies [[cheshire
1010
:exclusions [com.fasterxml.jackson.core/jackson-core]]
1111
[com.fasterxml.jackson.core/jackson-core]
1212
[com.github.everit-org.json-schema/org.everit.json.schema "1.14.3"]

‎search-app/project.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/search-app"
44
:parent-project {:path "../project.clj"
55
:inherit [:managed-dependencies]}
6-
:dependencies [[cheshire "5.12.0"
6+
:dependencies [[cheshire
77
:exclusions [com.fasterxml.jackson.core/jackson-core]]
88
[com.fasterxml.jackson.core/jackson-core]
99
[clj-time "0.15.1"]

0 commit comments

Comments
 (0)