Merge pull request #221 from mbj/regen/services

Regen services

ci/setup-stack.sh

@@ -4,8 +4,12 @@
 
 set -e
 
-curl --location --output stack https://github.com/commercialhaskell/stack/releases/download/v2.9.1/stack-2.9.1-linux-x86_64-bin
+curl            \
+ --location     \
+ --output stack \
+ https://github.com/commercialhaskell/stack/releases/download/v2.11.1/stack-2.11.1-linux-x86_64-bin
 
-echo 'dc4c60b2f018aadb2ebd40d81e5d10aada881d804a69911eea2da67906fc058c  stack' | sha256sum -c
+echo '5c7a9f86c126d4af15d03ddc03f95f3ceafedd3b9d3dcc7818f2ea60ed6a0ef9  stack' | sha256sum -c
 
 chmod +x ./stack
+

generator/src/Stratosphere/Generator/Declaration.hs

@@ -88,7 +88,7 @@ genTypeAlias propertyTypeName Raw.PropertyType{..} = runGen $ do
     { propertyType              = propertyTypeType
     , propertyPrimitiveType     = propertyTypePrimitiveType
     , propertyItemType          = propertyTypeItemType
-    , propertyPrimitiveItemType = Nothing
+    , propertyPrimitiveItemType = propertyTypePrimitiveItemType
     , ..
     }
 

generator/src/Stratosphere/Generator/Raw.hs

@@ -124,13 +124,14 @@ instance JSON.FromJSON PrimitiveType where
     other       -> fail $ "Unsupported primitive type: " <> Text.unpack other
 
 data PropertyType = PropertyType
-  { propertyTypeDocumentation :: Text
-  , propertyTypeItemType      :: Maybe PropertyName
-  , propertyTypePrimitiveType :: Maybe PrimitiveType
-  , propertyTypeProperties    :: Maybe (Map PropertyName Property)
-  , propertyTypeRequired      :: Maybe Bool
-  , propertyTypeType          :: Maybe ComposedType
-  , propertyTypeUpdateType    :: Maybe Text
+  { propertyTypeDocumentation     :: Text
+  , propertyTypeItemType          :: Maybe PropertyName
+  , propertyTypePrimitiveType     :: Maybe PrimitiveType
+  , propertyTypePrimitiveItemType :: Maybe PrimitiveType
+  , propertyTypeProperties        :: Maybe (Map PropertyName Property)
+  , propertyTypeRequired          :: Maybe Bool
+  , propertyTypeType              :: Maybe ComposedType
+  , propertyTypeUpdateType        :: Maybe Text
   }
   deriving (Show, Eq, Generic)
 

services/amplifyuibuilder/gen/Stratosphere/AmplifyUIBuilder/Form.hs

@@ -18,6 +18,7 @@ data Form
           environmentName :: (Prelude.Maybe (Value Prelude.Text)),
           fields :: (Prelude.Map Prelude.Text FieldConfigProperty),
           formActionType :: (Value Prelude.Text),
+          labelDecorator :: (Prelude.Maybe (Value Prelude.Text)),
           name :: (Value Prelude.Text),
           schemaVersion :: (Value Prelude.Text),
           sectionalElements :: (Prelude.Map Prelude.Text SectionalElementProperty),
@@ -45,7 +46,8 @@ mkForm
        schemaVersion = schemaVersion,
        sectionalElements = sectionalElements, style = style,
        appId = Prelude.Nothing, cta = Prelude.Nothing,
-       environmentName = Prelude.Nothing, tags = Prelude.Nothing}
+       environmentName = Prelude.Nothing,
+       labelDecorator = Prelude.Nothing, tags = Prelude.Nothing}
 instance ToResourceProperties Form where
   toResourceProperties Form {..}
     = ResourceProperties
@@ -62,6 +64,7 @@ instance ToResourceProperties Form where
                               [(JSON..=) "AppId" Prelude.<$> appId,
                                (JSON..=) "Cta" Prelude.<$> cta,
                                (JSON..=) "EnvironmentName" Prelude.<$> environmentName,
+                               (JSON..=) "LabelDecorator" Prelude.<$> labelDecorator,
                                (JSON..=) "Tags" Prelude.<$> tags]))}
 instance JSON.ToJSON Form where
   toJSON Form {..}
@@ -77,6 +80,7 @@ instance JSON.ToJSON Form where
                  [(JSON..=) "AppId" Prelude.<$> appId,
                   (JSON..=) "Cta" Prelude.<$> cta,
                   (JSON..=) "EnvironmentName" Prelude.<$> environmentName,
+                  (JSON..=) "LabelDecorator" Prelude.<$> labelDecorator,
                   (JSON..=) "Tags" Prelude.<$> tags])))
 instance Property "AppId" Form where
   type PropertyType "AppId" Form = Value Prelude.Text
@@ -97,6 +101,10 @@ instance Property "Fields" Form where
 instance Property "FormActionType" Form where
   type PropertyType "FormActionType" Form = Value Prelude.Text
   set newValue Form {..} = Form {formActionType = newValue, ..}
+instance Property "LabelDecorator" Form where
+  type PropertyType "LabelDecorator" Form = Value Prelude.Text
+  set newValue Form {..}
+    = Form {labelDecorator = Prelude.pure newValue, ..}
 instance Property "Name" Form where
   type PropertyType "Name" Form = Value Prelude.Text
   set newValue Form {..} = Form {name = newValue, ..}

services/amplifyuibuilder/gen/Stratosphere/AmplifyUIBuilder/Form/FieldInputConfigProperty.hs

@@ -5,6 +5,7 @@ module Stratosphere.AmplifyUIBuilder.Form.FieldInputConfigProperty (
 import qualified Data.Aeson as JSON
 import qualified Stratosphere.Prelude as Prelude
 import Stratosphere.Property
+import {-# SOURCE #-} Stratosphere.AmplifyUIBuilder.Form.FileUploaderFieldConfigProperty as Exports
 import {-# SOURCE #-} Stratosphere.AmplifyUIBuilder.Form.ValueMappingsProperty as Exports
 import Stratosphere.ResourceProperties
 import Stratosphere.Value
@@ -13,6 +14,7 @@ data FieldInputConfigProperty
                               defaultCountryCode :: (Prelude.Maybe (Value Prelude.Text)),
                               defaultValue :: (Prelude.Maybe (Value Prelude.Text)),
                               descriptiveText :: (Prelude.Maybe (Value Prelude.Text)),
+                              fileUploaderConfig :: (Prelude.Maybe FileUploaderFieldConfigProperty),
                               isArray :: (Prelude.Maybe (Value Prelude.Bool)),
                               maxValue :: (Prelude.Maybe (Value Prelude.Double)),
                               minValue :: (Prelude.Maybe (Value Prelude.Double)),
@@ -31,11 +33,12 @@ mkFieldInputConfigProperty type'
       {type' = type', defaultChecked = Prelude.Nothing,
        defaultCountryCode = Prelude.Nothing,
        defaultValue = Prelude.Nothing, descriptiveText = Prelude.Nothing,
-       isArray = Prelude.Nothing, maxValue = Prelude.Nothing,
-       minValue = Prelude.Nothing, name = Prelude.Nothing,
-       placeholder = Prelude.Nothing, readOnly = Prelude.Nothing,
-       required = Prelude.Nothing, step = Prelude.Nothing,
-       value = Prelude.Nothing, valueMappings = Prelude.Nothing}
+       fileUploaderConfig = Prelude.Nothing, isArray = Prelude.Nothing,
+       maxValue = Prelude.Nothing, minValue = Prelude.Nothing,
+       name = Prelude.Nothing, placeholder = Prelude.Nothing,
+       readOnly = Prelude.Nothing, required = Prelude.Nothing,
+       step = Prelude.Nothing, value = Prelude.Nothing,
+       valueMappings = Prelude.Nothing}
 instance ToResourceProperties FieldInputConfigProperty where
   toResourceProperties FieldInputConfigProperty {..}
     = ResourceProperties
@@ -49,6 +52,7 @@ instance ToResourceProperties FieldInputConfigProperty where
                                (JSON..=) "DefaultCountryCode" Prelude.<$> defaultCountryCode,
                                (JSON..=) "DefaultValue" Prelude.<$> defaultValue,
                                (JSON..=) "DescriptiveText" Prelude.<$> descriptiveText,
+                               (JSON..=) "FileUploaderConfig" Prelude.<$> fileUploaderConfig,
                                (JSON..=) "IsArray" Prelude.<$> isArray,
                                (JSON..=) "MaxValue" Prelude.<$> maxValue,
                                (JSON..=) "MinValue" Prelude.<$> minValue,
@@ -70,6 +74,7 @@ instance JSON.ToJSON FieldInputConfigProperty where
                   (JSON..=) "DefaultCountryCode" Prelude.<$> defaultCountryCode,
                   (JSON..=) "DefaultValue" Prelude.<$> defaultValue,
                   (JSON..=) "DescriptiveText" Prelude.<$> descriptiveText,
+                  (JSON..=) "FileUploaderConfig" Prelude.<$> fileUploaderConfig,
                   (JSON..=) "IsArray" Prelude.<$> isArray,
                   (JSON..=) "MaxValue" Prelude.<$> maxValue,
                   (JSON..=) "MinValue" Prelude.<$> minValue,
@@ -100,6 +105,11 @@ instance Property "DescriptiveText" FieldInputConfigProperty where
   set newValue FieldInputConfigProperty {..}
     = FieldInputConfigProperty
         {descriptiveText = Prelude.pure newValue, ..}
+instance Property "FileUploaderConfig" FieldInputConfigProperty where
+  type PropertyType "FileUploaderConfig" FieldInputConfigProperty = FileUploaderFieldConfigProperty
+  set newValue FieldInputConfigProperty {..}
+    = FieldInputConfigProperty
+        {fileUploaderConfig = Prelude.pure newValue, ..}
 instance Property "IsArray" FieldInputConfigProperty where
   type PropertyType "IsArray" FieldInputConfigProperty = Value Prelude.Bool
   set newValue FieldInputConfigProperty {..}

services/amplifyuibuilder/gen/Stratosphere/AmplifyUIBuilder/Form/FileUploaderFieldConfigProperty.hs

@@ -0,0 +1,79 @@
+module Stratosphere.AmplifyUIBuilder.Form.FileUploaderFieldConfigProperty (
+        FileUploaderFieldConfigProperty(..),
+        mkFileUploaderFieldConfigProperty
+    ) where
+import qualified Data.Aeson as JSON
+import qualified Stratosphere.Prelude as Prelude
+import Stratosphere.Property
+import Stratosphere.ResourceProperties
+import Stratosphere.Value
+data FileUploaderFieldConfigProperty
+  = FileUploaderFieldConfigProperty {acceptedFileTypes :: (ValueList Prelude.Text),
+                                     accessLevel :: (Value Prelude.Text),
+                                     isResumable :: (Prelude.Maybe (Value Prelude.Bool)),
+                                     maxFileCount :: (Prelude.Maybe (Value Prelude.Double)),
+                                     maxSize :: (Prelude.Maybe (Value Prelude.Double)),
+                                     showThumbnails :: (Prelude.Maybe (Value Prelude.Bool))}
+mkFileUploaderFieldConfigProperty ::
+  ValueList Prelude.Text
+  -> Value Prelude.Text -> FileUploaderFieldConfigProperty
+mkFileUploaderFieldConfigProperty acceptedFileTypes accessLevel
+  = FileUploaderFieldConfigProperty
+      {acceptedFileTypes = acceptedFileTypes, accessLevel = accessLevel,
+       isResumable = Prelude.Nothing, maxFileCount = Prelude.Nothing,
+       maxSize = Prelude.Nothing, showThumbnails = Prelude.Nothing}
+instance ToResourceProperties FileUploaderFieldConfigProperty where
+  toResourceProperties FileUploaderFieldConfigProperty {..}
+    = ResourceProperties
+        {awsType = "AWS::AmplifyUIBuilder::Form.FileUploaderFieldConfig",
+         supportsTags = Prelude.False,
+         properties = Prelude.fromList
+                        ((Prelude.<>)
+                           ["AcceptedFileTypes" JSON..= acceptedFileTypes,
+                            "AccessLevel" JSON..= accessLevel]
+                           (Prelude.catMaybes
+                              [(JSON..=) "IsResumable" Prelude.<$> isResumable,
+                               (JSON..=) "MaxFileCount" Prelude.<$> maxFileCount,
+                               (JSON..=) "MaxSize" Prelude.<$> maxSize,
+                               (JSON..=) "ShowThumbnails" Prelude.<$> showThumbnails]))}
+instance JSON.ToJSON FileUploaderFieldConfigProperty where
+  toJSON FileUploaderFieldConfigProperty {..}
+    = JSON.object
+        (Prelude.fromList
+           ((Prelude.<>)
+              ["AcceptedFileTypes" JSON..= acceptedFileTypes,
+               "AccessLevel" JSON..= accessLevel]
+              (Prelude.catMaybes
+                 [(JSON..=) "IsResumable" Prelude.<$> isResumable,
+                  (JSON..=) "MaxFileCount" Prelude.<$> maxFileCount,
+                  (JSON..=) "MaxSize" Prelude.<$> maxSize,
+                  (JSON..=) "ShowThumbnails" Prelude.<$> showThumbnails])))
+instance Property "AcceptedFileTypes" FileUploaderFieldConfigProperty where
+  type PropertyType "AcceptedFileTypes" FileUploaderFieldConfigProperty = ValueList Prelude.Text
+  set newValue FileUploaderFieldConfigProperty {..}
+    = FileUploaderFieldConfigProperty
+        {acceptedFileTypes = newValue, ..}
+instance Property "AccessLevel" FileUploaderFieldConfigProperty where
+  type PropertyType "AccessLevel" FileUploaderFieldConfigProperty = Value Prelude.Text
+  set newValue FileUploaderFieldConfigProperty {..}
+    = FileUploaderFieldConfigProperty {accessLevel = newValue, ..}
+instance Property "IsResumable" FileUploaderFieldConfigProperty where
+  type PropertyType "IsResumable" FileUploaderFieldConfigProperty = Value Prelude.Bool
+  set newValue FileUploaderFieldConfigProperty {..}
+    = FileUploaderFieldConfigProperty
+        {isResumable = Prelude.pure newValue, ..}
+instance Property "MaxFileCount" FileUploaderFieldConfigProperty where
+  type PropertyType "MaxFileCount" FileUploaderFieldConfigProperty = Value Prelude.Double
+  set newValue FileUploaderFieldConfigProperty {..}
+    = FileUploaderFieldConfigProperty
+        {maxFileCount = Prelude.pure newValue, ..}
+instance Property "MaxSize" FileUploaderFieldConfigProperty where
+  type PropertyType "MaxSize" FileUploaderFieldConfigProperty = Value Prelude.Double
+  set newValue FileUploaderFieldConfigProperty {..}
+    = FileUploaderFieldConfigProperty
+        {maxSize = Prelude.pure newValue, ..}
+instance Property "ShowThumbnails" FileUploaderFieldConfigProperty where
+  type PropertyType "ShowThumbnails" FileUploaderFieldConfigProperty = Value Prelude.Bool
+  set newValue FileUploaderFieldConfigProperty {..}
+    = FileUploaderFieldConfigProperty
+        {showThumbnails = Prelude.pure newValue, ..}

services/amplifyuibuilder/gen/Stratosphere/AmplifyUIBuilder/Form/FileUploaderFieldConfigProperty.hs-boot

@@ -0,0 +1,7 @@
+module Stratosphere.AmplifyUIBuilder.Form.FileUploaderFieldConfigProperty where
+import qualified Data.Aeson as JSON
+import qualified Stratosphere.Prelude as Prelude
+import Stratosphere.ResourceProperties
+data FileUploaderFieldConfigProperty :: Prelude.Type
+instance ToResourceProperties FileUploaderFieldConfigProperty
+instance JSON.ToJSON FileUploaderFieldConfigProperty

services/amplifyuibuilder/stratosphere-amplifyuibuilder.cabal

@@ -45,6 +45,7 @@ library
       Stratosphere.AmplifyUIBuilder.Form.FieldInputConfigProperty
       Stratosphere.AmplifyUIBuilder.Form.FieldPositionProperty
       Stratosphere.AmplifyUIBuilder.Form.FieldValidationConfigurationProperty
+      Stratosphere.AmplifyUIBuilder.Form.FileUploaderFieldConfigProperty
       Stratosphere.AmplifyUIBuilder.Form.FormButtonProperty
       Stratosphere.AmplifyUIBuilder.Form.FormCTAProperty
       Stratosphere.AmplifyUIBuilder.Form.FormDataTypeConfigProperty

services/apigatewayv2/gen/Stratosphere/ApiGatewayV2/RouteResponse.hs

@@ -1,16 +1,17 @@
 module Stratosphere.ApiGatewayV2.RouteResponse (
-        RouteResponse(..), mkRouteResponse
+        module Exports, RouteResponse(..), mkRouteResponse
     ) where
 import qualified Data.Aeson as JSON
 import qualified Stratosphere.Prelude as Prelude
 import Stratosphere.Property
+import {-# SOURCE #-} Stratosphere.ApiGatewayV2.RouteResponse.ParameterConstraintsProperty as Exports
 import Stratosphere.ResourceProperties
 import Stratosphere.Value
 data RouteResponse
   = RouteResponse {apiId :: (Value Prelude.Text),
                    modelSelectionExpression :: (Prelude.Maybe (Value Prelude.Text)),
                    responseModels :: (Prelude.Maybe JSON.Object),
-                   responseParameters :: (Prelude.Maybe JSON.Object),
+                   responseParameters :: (Prelude.Maybe (Prelude.Map Prelude.Text ParameterConstraintsProperty)),
                    routeId :: (Value Prelude.Text),
                    routeResponseKey :: (Value Prelude.Text)}
 mkRouteResponse ::
@@ -63,7 +64,7 @@ instance Property "ResponseModels" RouteResponse where
   set newValue RouteResponse {..}
     = RouteResponse {responseModels = Prelude.pure newValue, ..}
 instance Property "ResponseParameters" RouteResponse where
-  type PropertyType "ResponseParameters" RouteResponse = JSON.Object
+  type PropertyType "ResponseParameters" RouteResponse = Prelude.Map Prelude.Text ParameterConstraintsProperty
   set newValue RouteResponse {..}
     = RouteResponse {responseParameters = Prelude.pure newValue, ..}
 instance Property "RouteId" RouteResponse where

services/apigatewayv2/gen/Stratosphere/ApiGatewayV2/Route/ParameterConstraintsProperty.hs → services/apigatewayv2/gen/Stratosphere/ApiGatewayV2/RouteResponse/ParameterConstraintsProperty.hs

@@ -1,4 +1,4 @@
-module Stratosphere.ApiGatewayV2.Route.ParameterConstraintsProperty (
+module Stratosphere.ApiGatewayV2.RouteResponse.ParameterConstraintsProperty (
         ParameterConstraintsProperty(..), mkParameterConstraintsProperty
     ) where
 import qualified Data.Aeson as JSON
@@ -15,7 +15,7 @@ mkParameterConstraintsProperty required
 instance ToResourceProperties ParameterConstraintsProperty where
   toResourceProperties ParameterConstraintsProperty {..}
     = ResourceProperties
-        {awsType = "AWS::ApiGatewayV2::Route.ParameterConstraints",
+        {awsType = "AWS::ApiGatewayV2::RouteResponse.ParameterConstraints",
          supportsTags = Prelude.False,
          properties = ["Required" JSON..= required]}
 instance JSON.ToJSON ParameterConstraintsProperty where

services/apigatewayv2/gen/Stratosphere/ApiGatewayV2/Route/ParameterConstraintsProperty.hs-boot → services/apigatewayv2/gen/Stratosphere/ApiGatewayV2/RouteResponse/ParameterConstraintsProperty.hs-boot

@@ -1,4 +1,4 @@
-module Stratosphere.ApiGatewayV2.Route.ParameterConstraintsProperty where
+module Stratosphere.ApiGatewayV2.RouteResponse.ParameterConstraintsProperty where
 import qualified Data.Aeson as JSON
 import qualified Stratosphere.Prelude as Prelude
 import Stratosphere.ResourceProperties

services/apigatewayv2/stratosphere-apigatewayv2.cabal

@@ -48,8 +48,8 @@ library
       Stratosphere.ApiGatewayV2.IntegrationResponse
       Stratosphere.ApiGatewayV2.Model
       Stratosphere.ApiGatewayV2.Route
-      Stratosphere.ApiGatewayV2.Route.ParameterConstraintsProperty
       Stratosphere.ApiGatewayV2.RouteResponse
+      Stratosphere.ApiGatewayV2.RouteResponse.ParameterConstraintsProperty
       Stratosphere.ApiGatewayV2.Stage
       Stratosphere.ApiGatewayV2.Stage.AccessLogSettingsProperty
       Stratosphere.ApiGatewayV2.Stage.RouteSettingsProperty