Merge branch 'v1.1-dev' into dev

Author: nashjain

examples/1.0.0/bnpl-arazzo.yaml

@@ -167,10 +167,10 @@ workflows:
       contentType: application/json
       payload: |
         {
-          "firstName": "{$inputs.customer.firstName}",
-          "lastName": "{$inputs.customer.lastName}",
-          "dateOfBirth": "{$inputs.customer.dateOfBirth}",
-          "postalCode": "{$inputs.customer.postalCode}"
+          "firstName": "{$inputs.customer#/firstName}",
+          "lastName": "{$inputs.customer#/lastName}",
+          "dateOfBirth": "{$inputs.customer#/dateOfBirth}",
+          "postalCode": "{$inputs.customer#/postalCode}",
           "termsAndConditionsAccepted": true
         }
     successCriteria:
@@ -194,7 +194,7 @@ workflows:
       contentType: application/json
       payload: | 
         {
-          "enrolledCustomer": "{$inputs.customer.uri}",
+          "enrolledCustomer": "{$inputs.customer#/uri}",
           "newCustomer": "{$steps.createCustomer.outputs.customer}",
           "products": "{$steps.checkLoanCanBeProvided.outputs.eligibleProducts}"
         }

src/arazzo.md

@@ -8,6 +8,11 @@ properties:
     description: The version number of the Arazzo Specification
     type: string
     pattern: '^1\.1\.\d+(-.+)?$'
+  $self:
+    type: string
+    format: uri-reference
+    $comment: MUST NOT contain a fragment
+    pattern: '^[^#]*$'    
   info:
     $ref: '#/$defs/info'
   sourceDescriptions:
@@ -524,20 +529,12 @@ $defs:
             type:
               enum:
                 - goto
-                - retry
         then:
           oneOf:
             - required:
                 - workflowId
             - required:
                 - stepId
-      - if:
-          properties:
-            type:
-              const: retry
-        then:
-          required:
-            - retryAfter
       - if:
           required:
             - parameters
@@ -582,6 +579,7 @@ $defs:
         enum:
           - path
           - query
+          - querystring
           - header
           - cookie
           - channel

src/schemas/validation/schema.yaml

@@ -0,0 +1,16 @@
+arazzo: "1.1.0"
+info:
+  title: Invalid Querystring Test
+  version: 1.0.0
+sourceDescriptions:
+  - name: api
+    url: https://api.example.com/openapi.yaml
+    type: openapi
+workflows:
+  - workflowId: testInvalid
+    steps:
+      - stepId: search
+        operationId: $sourceDescriptions.api.searchItems
+        parameters:
+          - name: q
+            in: querystring

tests/schema/fail/invalid-querystring-without-value.arazzo.yaml

@@ -0,0 +1,14 @@
+arazzo: 1.1.0
+$self: https://example.com/workflows/minimal-with-self.arazzo.yaml#/workflows/basicWorkflow
+info:
+  title: Minimal Arazzo Example
+  version: 1.0.0
+sourceDescriptions:
+  - name: exampleAPI
+    url: https://example.com/openapi.yaml
+    type: openapi
+workflows:
+  - workflowId: basicWorkflow
+    steps:
+      - stepId: step1
+        operationId: getUsers

tests/schema/fail/invalid-self-fragment.arazzo.yaml

@@ -127,6 +127,18 @@ workflows:
           - context: $response.body
             type: jsonpath
             condition: $[?count(@.products) == 0]
+    onFailure:
+      - name: Unauthorized
+        type: end
+        criteria:
+          - condition: $statusCode == 401
+      - name: Too many requests
+        type: retry
+        retryAfter: 1
+        retryLimit: 1
+        criteria:
+          - condition: $statusCode == 429
+        stepId: checkLoanCanBeProvided
     outputs:
       eligibilityCheckRequired: $response.body#/eligibilityCheckRequired
       eligibleProducts: $response.body#/products
@@ -256,4 +268,4 @@ workflows:
     successCriteria:
       - condition: $statusCode == 204
   outputs:
-    finalizedPaymentPlan: $steps.retrieveFinalizedPaymentPlan.outputs.finalizedPaymentPlan
+    finalizedPaymentPlan: $steps.retrieveFinalizedPaymentPlan.outputs.finalizedPaymentPlan

tests/schema/pass/bnpl-example.yaml

@@ -0,0 +1,14 @@
+arazzo: 1.1.0
+$self: https://example.com/workflows/minimal-with-self.arazzo.yaml
+info:
+  title: Minimal Arazzo Example
+  version: 1.0.0
+sourceDescriptions:
+  - name: exampleAPI
+    url: https://example.com/openapi.yaml
+    type: openapi
+workflows:
+  - workflowId: basicWorkflow
+    steps:
+      - stepId: step1
+        operationId: getUsers

tests/schema/pass/minimal-with-self.arazzo.yaml

@@ -0,0 +1,22 @@
+arazzo: "1.1.0"
+info:
+  title: Querystring Runtime Expression Test
+  version: 1.0.0
+sourceDescriptions:
+  - name: api
+    url: https://api.example.com/openapi.yaml
+    type: openapi
+workflows:
+  - workflowId: testQuerystringExpr
+    inputs:
+      type: object
+      properties:
+        filter:
+          type: string
+    steps:
+      - stepId: search
+        operationId: $sourceDescriptions.api.searchItems
+        parameters:
+          - name: q
+            in: querystring
+            value: "filter={$inputs.filter}&limit=20"

tests/schema/pass/parameter-with-querystring-and-runtime-expr.arazzo.yaml

@@ -0,0 +1,17 @@
+arazzo: "1.1.0"
+info:
+  title: Querystring Test
+  version: 1.0.0
+sourceDescriptions:
+  - name: api
+    url: https://api.example.com/openapi.yaml
+    type: openapi
+workflows:
+  - workflowId: testQuerystring
+    steps:
+      - stepId: search
+        operationId: $sourceDescriptions.api.searchItems
+        parameters:
+          - name: q
+            in: querystring
+            value: "filter=active&sort=desc"