Changes for parsing PURL to GAV component (#206)

saif-ericsson · web-flow · commit 01c809f909c3 · 2019-05-13T15:50:32.000+02:00
* adding JEMSPATH 'match' method in subscription condition

* reviewed change
diff --git a/src/functionaltest/resources/responses/DefaultInstanceSubscriptionResponse.json b/src/functionaltest/resources/responses/DefaultInstanceSubscriptionResponse.json
@@ -16,7 +16,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
diff --git a/src/functionaltest/resources/responses/NewInstanceSubscriptionResponse.json b/src/functionaltest/resources/responses/NewInstanceSubscriptionResponse.json
@@ -16,7 +16,7 @@
       {
         "conditions":[
           {
-            "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
diff --git a/src/functionaltest/resources/responses/SubscriptionForSaveCase.json b/src/functionaltest/resources/responses/SubscriptionForSaveCase.json
@@ -16,7 +16,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'",
+            "jmespath": "match(identity, '[a-z]+\\\\.[a-z.]+[a-z]') =='com.mycompany.myproduct'"
           }
         ]
       }
@@ -43,7 +43,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [0] =='pkg:maven'"
           }
         ]
       }
diff --git a/src/functionaltest/resources/responses/SubscriptionForUploadCase.json b/src/functionaltest/resources/responses/SubscriptionForUploadCase.json
@@ -17,7 +17,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
@@ -45,7 +45,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
diff --git a/src/functionaltest/resources/responses/SubscriptionForUploadLDAP.json b/src/functionaltest/resources/responses/SubscriptionForUploadLDAP.json
@@ -17,7 +17,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
@@ -46,7 +46,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
diff --git a/src/functionaltest/resources/responses/SubscriptionObjects.json b/src/functionaltest/resources/responses/SubscriptionObjects.json
@@ -16,7 +16,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
@@ -43,7 +43,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
diff --git a/src/functionaltest/resources/responses/SubscriptionTemplate.json b/src/functionaltest/resources/responses/SubscriptionTemplate.json
@@ -16,7 +16,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
@@ -43,7 +43,7 @@
       {
         "conditions":[
           {
-            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           }
         ]
       }
diff --git a/src/functionaltest/resources/responses/SubscriptionUpload.json b/src/functionaltest/resources/responses/SubscriptionUpload.json
@@ -17,7 +17,7 @@
       "type": "ARTIFACT_1",
       "conditions": [
         {
-          "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+          "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
         },
         {
           "jmespath": "testCaseExecutions[?testCase.conclusion == 'SUCCESSFUL' && testCase.id=='TC5']"
@@ -28,7 +28,7 @@
       "type": "ARTIFACT_1",
       "conditions": [
         {
-          "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+          "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
         },
         {
           "jmespath": "testCaseExecutions[?testCaseStartedEventId == '13af4a14-f951-4346-a1ba-624c79f10e98']"
diff --git a/src/functionaltest/resources/responses/subscription.json b/src/functionaltest/resources/responses/subscription.json
@@ -17,7 +17,7 @@
         "type": "ARTIFACT_1",
         "conditions": [
           {
-            "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           },
           {
             "jmespath": "testCaseExecutions[?testCase.conclusion == 'SUCCESSFUL' && testCase.id=='TC5']"
@@ -28,7 +28,7 @@
         "type": "ARTIFACT_1",
         "conditions": [
           {
-            "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           },
           {
             "jmespath": "testCaseExecutions[?testCaseStartedEventId == '13af4a14-f951-4346-a1ba-624c79f10e98']"
diff --git a/src/integrationtest/resources/bodies/subscription_single.json b/src/integrationtest/resources/bodies/subscription_single.json
@@ -15,7 +15,7 @@
       {
         "conditions": [
           {
-            "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           },
           {
             "jmespath": "testCaseExecutions[?testCase.conclusion == 'SUCCESSFUL' && testCase.id=='TC5']"
@@ -26,7 +26,7 @@
       {
         "conditions": [
           {
-            "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           },
           {
             "jmespath": "testCaseExecutions[?testCaseStartedEventId == '13af4a14-f951-4346-a1ba-624c79f10e98']"
diff --git a/src/integrationtest/resources/bodies/subscription_single_modify.json b/src/integrationtest/resources/bodies/subscription_single_modify.json
@@ -15,7 +15,7 @@
       {
         "conditions": [
           {
-            "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           },
           {
             "jmespath": "testCaseExecutions[?testCase.conclusion == 'SUCCESSFUL' && testCase.id=='TC5']"
@@ -26,7 +26,7 @@
       {
         "conditions": [
           {
-            "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0'"
+            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
           },
           {
             "jmespath": "testCaseExecutions[?testCaseStartedEventId == '13af4a14-f951-4346-a1ba-624c79f10e98']"
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -32,4 +32,4 @@ ei.eiffel.documentation.urls={ "EI Frontend GitHub": "https://github.com/eiffel-
 #### LOGGING #########
 logging.level.root: INFO
 logging.level.org.springframework.web: INFO
-logging.level.com.ericsson.ei: INFO
+logging.level.com.ericsson.ei: INFO
diff --git a/src/test/resources/backendResponses/subscriptionsOneResponse.json b/src/test/resources/backendResponses/subscriptionsOneResponse.json
@@ -15,15 +15,15 @@
         {
             "type": "ARTIFACT_1",
             "conditions": [
-                {"jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@3.0.0'"},
+                {"jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"},
                 {"jmespath": "testCaseExecutions[?testCase.conclusion == 'SUCCESSFUL' && testCase.id=='TC5']"}
             ]
 
         },
         {
             "type": "ARTIFACT_1",
             "conditions": [
-                {"jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@3.0.0'"},
+                {"jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"},
                 {"jmespath": "testCaseExecutions[?testCaseStartedEventId == '13af4a14-f951-4346-a1ba-624c79f10e98']"}
             ]
 
diff --git a/wiki/markdown/curl-examples.md b/wiki/markdown/curl-examples.md
@@ -374,7 +374,7 @@ The back-end used is running on localhost and port 8080. EI front-end forwards t
                 {
                     "conditions":[
                         {
-                            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+                            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
                         }
                     ]
                 }
@@ -406,7 +406,7 @@ The back-end used is running on localhost and port 8080. EI front-end forwards t
                 {
                     "conditions":[
                         {
-                            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+                            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
                         }
                     ]
                 }
@@ -437,7 +437,7 @@ The back-end used is running on localhost and port 8080. EI front-end forwards t
                 {
                     "conditions":[
                         {
-                            "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"
+                            "jmespath": "split(identity, '/') | [1] =='com.mycompany.myproduct'"
                         }
                     ]
                 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`{`
`17`	`17`	`"conditions":[`
`18`	`18`	`{`
`19`		`- "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"`
	`19`	`+ "jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"`
`20`	`20`	`}`
`21`	`21`	`]`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`{`
`18`	`18`	`"conditions":[`
`19`	`19`	`{`
`20`		`- "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"`
	`20`	`+ "jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"`
`21`	`21`	`}`
`22`	`22`	`]`
`23`	`23`	`}`
`@@ -45,7 +45,7 @@`
`45`	`45`	`{`
`46`	`46`	`"conditions":[`
`47`	`47`	`{`
`48`		`- "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"`
	`48`	`+ "jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"`
`49`	`49`	`}`
`50`	`50`	`]`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`{`
`16`	`16`	`"conditions": [`
`17`	`17`	`{`
`18`		`- "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0'"`
	`18`	`+ "jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"jmespath": "testCaseExecutions[?testCase.conclusion == 'SUCCESSFUL' && testCase.id=='TC5']"`
`@@ -26,7 +26,7 @@`
`26`	`26`	`{`
`27`	`27`	`"conditions": [`
`28`	`28`	`{`
`29`		`- "jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@2.0.0'"`
	`29`	`+ "jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"`
`30`	`30`	`},`
`31`	`31`	`{`
`32`	`32`	`"jmespath": "testCaseExecutions[?testCaseStartedEventId == '13af4a14-f951-4346-a1ba-624c79f10e98']"`
Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@`
`15`	`15`	`{`
`16`	`16`	`"type": "ARTIFACT_1",`
`17`	`17`	`"conditions": [`
`18`		`- {"jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@3.0.0'"},`
	`18`	`+ {"jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"},`
`19`	`19`	`{"jmespath": "testCaseExecutions[?testCase.conclusion == 'SUCCESSFUL' && testCase.id=='TC5']"}`
`20`	`20`	`]`
`21`	`21`
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`"type": "ARTIFACT_1",`
`25`	`25`	`"conditions": [`
`26`		`- {"jmespath": "identity=='pkg:maven/com.mycompany.myproduct/artifact-name@3.0.0'"},`
	`26`	`+ {"jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"},`
`27`	`27`	`{"jmespath": "testCaseExecutions[?testCaseStartedEventId == '13af4a14-f951-4346-a1ba-624c79f10e98']"}`
`28`	`28`	`]`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ The back-end used is running on localhost and port 8080. EI front-end forwards t`
`374`	`374`	`{`
`375`	`375`	`"conditions":[`
`376`	`376`	`{`
`377`		`- "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"`
	`377`	`+ "jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"`
`378`	`378`	`}`
`379`	`379`	`]`
`380`	`380`	`}`
`@@ -406,7 +406,7 @@ The back-end used is running on localhost and port 8080. EI front-end forwards t`
`406`	`406`	`{`
`407`	`407`	`"conditions":[`
`408`	`408`	`{`
`409`		`- "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"`
	`409`	`+ "jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"`
`410`	`410`	`}`
`411`	`411`	`]`
`412`	`412`	`}`
`@@ -437,7 +437,7 @@ The back-end used is running on localhost and port 8080. EI front-end forwards t`
`437`	`437`	`{`
`438`	`438`	`"conditions":[`
`439`	`439`	`{`
`440`		`- "jmespath":"identity=='pkg:maven/com.mycompany.myproduct/artifact-name@1.0.0'"`
	`440`	`+ "jmespath": "split(identity, '/') \| [1] =='com.mycompany.myproduct'"`
`441`	`441`	`}`
`442`	`442`	`]`
`443`	`443`	`}`