update

Author: mfriesen

src/main/resources/cloudformation/api/api.yaml

@@ -50,11 +50,6 @@ Resources:
     Type: AWS::ApiGatewayV2::Api
     Properties:
       FailOnWarnings: "true"
-      DisableExecuteApiEndpoint:
-        Fn::If:
-          - HasCertificateStackNameHttpApiDomain
-          - true
-          - false
 
 Outputs:
   DocumentsHttpApi:

src/main/resources/cloudformation/api/openapi-iam.yaml

@@ -132,6 +132,12 @@ Resources:
         servers:
           - url: http://localhost
             description: Local development server
+            x-amazon-apigateway-endpoint-configuration:
+              disableExecuteApiEndpoint:
+                Fn::If:
+                  - HasCertificateStackNameIamApiDomain
+                  - true
+                  - false
         paths:
 
           /version:
@@ -14324,4 +14330,4 @@ Resources:
           allowMethods:
             - "*"
           allowHeaders:
-            - "*"
+            - "*"

src/main/resources/cloudformation/api/openapi-jwt.yaml

@@ -132,6 +132,12 @@ Resources:
         servers:
           - url: http://localhost
             description: Local development server
+            x-amazon-apigateway-endpoint-configuration:
+              disableExecuteApiEndpoint:
+                Fn::If:
+                  - HasCertificateStackNameHttpApiDomain
+                  - true
+                  - false
         paths:
 
           /version:
@@ -14330,4 +14336,4 @@ Resources:
           allowMethods:
             - "*"
           allowHeaders:
-            - "*"
+            - "*"

src/main/resources/cloudformation/api/openapi-key.yaml

@@ -132,6 +132,12 @@ Resources:
         servers:
           - url: http://localhost
             description: Local development server
+            x-amazon-apigateway-endpoint-configuration:
+              disableExecuteApiEndpoint:
+                Fn::If:
+                  - HasCertificateStackNameKeyApiDomain
+                  - true
+                  - false
         paths:
 
           /version:
@@ -14332,4 +14338,4 @@ Resources:
           allowMethods:
             - "*"
           allowHeaders:
-            - "*"
+            - "*"

src/main/resources/cloudformation/api/template.yaml

@@ -551,15 +551,9 @@ Resources:
         Fn::Sub: "/formkiq/${AppEnvironment}/api/DocumentsHttpUrl"
       Type: String
       Value:
-        Fn::If:
-          - HasCertificateStackNameHttpApiDomain
-          - Fn::Join:
-            - ''
-            - - 'https://'
-              - Ref: CertificateStackNameHttpApiDomain
-          - Fn::GetAtt:
-            - HttpApi
-            - Outputs.DocumentsHttpApiUrl
+        Fn::GetAtt:
+          - HttpApi
+          - Outputs.DocumentsHttpApiUrl
       Tags:
         Application: "FormKiQ"
         AppEnvironment: 
@@ -573,15 +567,9 @@ Resources:
         Fn::Sub: "/formkiq/${AppEnvironment}/api/DocumentsPublicHttpUrl"
       Type: String
       Value: 
-        Fn::If:
-          - HasCertificateStackNameHttpApiDomain
-          - Fn::Join:
-            - ''
-            - - 'https://'
-              - Ref: CertificateStackNameHttpApiDomain
-          - Fn::GetAtt:
-            - HttpApi
-            - Outputs.DocumentsHttpApiUrl
+        Fn::GetAtt:
+          - HttpApi
+          - Outputs.DocumentsHttpApiUrl
       Tags:
         Application: "FormKiQ"
         AppEnvironment: 
@@ -595,15 +583,9 @@ Resources:
         Fn::Sub: "/formkiq/${AppEnvironment}/api/DocumentsIamUrl"
       Type: String
       Value: 
-        Fn::If:
-          - HasCertificateStackNameIamApiDomain
-          - Fn::Join:
-            - ''
-            - - 'https://'
-              - Ref: CertificateStackNameIamApiDomain
-          - Fn::GetAtt:
-            - IamApi
-            - Outputs.DocumentsIamApiUrl
+        Fn::GetAtt:
+          - IamApi
+          - Outputs.DocumentsIamApiUrl
       Tags:
         Application: "FormKiQ"
         AppEnvironment: 
@@ -633,15 +615,9 @@ Resources:
         Fn::Sub: "/formkiq/${AppEnvironment}/api/DocumentsKeyUrl"
       Type: String
       Value: 
-        Fn::If:
-          - HasCertificateStackNameKeyApiDomain
-          - Fn::Join:
-            - ''
-            - - 'https://'
-              - Ref: CertificateStackNameKeyApiDomain
-          - Fn::GetAtt:
-            - KeyApi
-            - Outputs.DocumentsKeyApiUrl
+        Fn::GetAtt:
+          - KeyApi
+          - Outputs.DocumentsKeyApiUrl
       Tags:
         Application: "FormKiQ"
         AppEnvironment: 
@@ -807,39 +783,21 @@ Outputs:
   DocumentsIamApiUrl:
     Description: "The endpoint url for the IAM API"
     Value: 
-      Fn::If:
-        - HasCertificateStackNameIamApiDomain
-        - Fn::Join:
-          - ''
-          - - 'https://'
-            - Ref: CertificateStackNameIamApiDomain
-        - Fn::GetAtt:
-          - IamApi
-          - Outputs.DocumentsIamApiUrl
+      Fn::GetAtt:
+        - IamApi
+        - Outputs.DocumentsIamApiUrl
   DocumentsKeyApiUrl:
     Description: "The endpoint url for the Key API"
     Value: 
-      Fn::If:
-        - HasCertificateStackNameKeyApiDomain
-        - Fn::Join:
-          - ''
-          - - 'https://'
-            - Ref: CertificateStackNameKeyApiDomain
-        - Fn::GetAtt:
-          - KeyApi
-          - Outputs.DocumentsKeyApiUrl    
+      Fn::GetAtt:
+        - KeyApi
+        - Outputs.DocumentsKeyApiUrl
   DocumentsHttpApiUrl:
     Description: "The endpoint url for the Http API"
     Value:
-      Fn::If:
-        - HasCertificateStackNameHttpApiDomain
-        - Fn::Join:
-          - ''
-          - - 'https://'
-            - Ref: CertificateStackNameHttpApiDomain
-        - Fn::GetAtt:
-          - HttpApi
-          - Outputs.DocumentsHttpApiUrl
+      Fn::GetAtt:
+        - HttpApi
+        - Outputs.DocumentsHttpApiUrl
 #!  AuthApiUrl:
 #!    Description: "The endpoint url for the Auth API"
 #!    Value: