update

formkiq · Oct 5, 2023 · 452b0cb · 452b0cb
1 parent 4bcb068
commit 452b0cb
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 10 deletions.
diff --git a/docs/openapi/openapi-iam.yaml b/docs/openapi/openapi-iam.yaml
@@ -4188,9 +4188,15 @@
                 contentLength:
                   type: integer
                   description: Document size
-                versionId:
+                version:
                   type: string
                   description: Document version
+                versionKey:
+                  type: string
+                  description: Document Version Identifier
+                s3version:
+                  type: string
+                  description: Document storage version
                 belongsToDocumentId:
                   type: string
                   description: Parent Document Identifier

diff --git a/docs/openapi/openapi-jwt.yaml b/docs/openapi/openapi-jwt.yaml
@@ -4188,9 +4188,15 @@
                 contentLength:
                   type: integer
                   description: Document size
-                versionId:
+                version:
                   type: string
                   description: Document version
+                versionKey:
+                  type: string
+                  description: Document Version Identifier
+                s3version:
+                  type: string
+                  description: Document storage version
                 belongsToDocumentId:
                   type: string
                   description: Parent Document Identifier

diff --git a/docs/openapi/openapi-key.yaml b/docs/openapi/openapi-key.yaml
@@ -4188,9 +4188,15 @@
                 contentLength:
                   type: integer
                   description: Document size
-                versionId:
+                version:
                   type: string
                   description: Document version
+                versionKey:
+                  type: string
+                  description: Document Version Identifier
+                s3version:
+                  type: string
+                  description: Document storage version
                 belongsToDocumentId:
                   type: string
                   description: Parent Document Identifier
@@ -5215,7 +5221,7 @@
               x-amazon-apigateway-authorizer:
                 identitySource: $request.header.Authorization
                 authorizerUri:
-                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ApiKeyAuthorizer.Arn}/invocations
+                  Fn::Sub: arn:${Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ApiKeyAuthorizer.Arn}/invocations
                 authorizerResultTtlInSeconds: 300
                 authorizerPayloadFormatVersion: "2.0"
                 enableSimpleResponses: true

diff --git a/fkq-test-utils/src/main/java/com/formkiq/testutils/aws/FkqDocumentService.java b/fkq-test-utils/src/main/java/com/formkiq/testutils/aws/FkqDocumentService.java
@@ -239,12 +239,14 @@ public static Map<String, Object> toMap(final HttpResponse<String> response) thr
    * @param client {@link ApiClient}
    * @param siteId {@link String}
    * @param documentId {@link String}
+   * @param actionStatus {@link String}
    * @return {@link GetDocumentActionsResponse}
    * @throws ApiException ApiException
    * @throws InterruptedException InterruptedException
    */
-  public static GetDocumentActionsResponse waitForActionsComplete(final ApiClient client,
-      final String siteId, final String documentId) throws ApiException, InterruptedException {
+  public static GetDocumentActionsResponse waitForActions(final ApiClient client,
+      final String siteId, final String documentId, final String actionStatus)
+      throws ApiException, InterruptedException {
 
     GetDocumentActionsResponse response = null;
     DocumentActionsApi api = new DocumentActionsApi(client);
@@ -256,7 +258,7 @@ public static GetDocumentActionsResponse waitForActionsComplete(final ApiClient
       try {
         response = api.getDocumentActions(documentId, siteId, null);
 
-        o = response.getActions().stream().filter(a -> a.getStatus().equalsIgnoreCase("COMPLETE"))
+        o = response.getActions().stream().filter(a -> a.getStatus().equalsIgnoreCase(actionStatus))
             .findAny();
       } catch (ApiException e) {
         // ignore
@@ -270,6 +272,21 @@ public static GetDocumentActionsResponse waitForActionsComplete(final ApiClient
     return response;
   }
 
+  /**
+   * Wait for Actions to Complete.
+   * 
+   * @param client {@link ApiClient}
+   * @param siteId {@link String}
+   * @param documentId {@link String}
+   * @return {@link GetDocumentActionsResponse}
+   * @throws ApiException ApiException
+   * @throws InterruptedException InterruptedException
+   */
+  public static GetDocumentActionsResponse waitForActionsComplete(final ApiClient client,
+      final String siteId, final String documentId) throws ApiException, InterruptedException {
+    return waitForActions(client, siteId, documentId, "COMPLETE");
+  }
+
   /**
    * Wait for Actions to Complete.
    * 

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/api-apikey.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/api-apikey.yaml
@@ -4190,9 +4190,15 @@ Resources:
                 contentLength:
                   type: "integer"
                   description: "Document size"
-                versionId:
+                version:
                   type: "string"
                   description: "Document version"
+                versionKey:
+                  type: "string"
+                  description: "Document Version Identifier"
+                s3version:
+                  type: "string"
+                  description: "Document storage version"
                 belongsToDocumentId:
                   type: "string"
                   description: "Parent Document Identifier"

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/api-iam.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/api-iam.yaml
@@ -4190,9 +4190,15 @@ Resources:
                 contentLength:
                   type: "integer"
                   description: "Document size"
-                versionId:
+                version:
                   type: "string"
                   description: "Document version"
+                versionKey:
+                  type: "string"
+                  description: "Document Version Identifier"
+                s3version:
+                  type: "string"
+                  description: "Document storage version"
                 belongsToDocumentId:
                   type: "string"
                   description: "Parent Document Identifier"

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/api.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/api.yaml
@@ -4190,9 +4190,15 @@ Resources:
                 contentLength:
                   type: "integer"
                   description: "Document size"
-                versionId:
+                version:
                   type: "string"
                   description: "Document version"
+                versionKey:
+                  type: "string"
+                  description: "Document Version Identifier"
+                s3version:
+                  type: "string"
+                  description: "Document storage version"
                 belongsToDocumentId:
                   type: "string"
                   description: "Parent Document Identifier"