Upgrade model and regen

services/accessanalyzer/gen/Stratosphere/AccessAnalyzer/Analyzer/AnalysisRuleCriteriaProperty.hs

@@ -0,0 +1,42 @@
+module Stratosphere.AccessAnalyzer.Analyzer.AnalysisRuleCriteriaProperty (
+        AnalysisRuleCriteriaProperty(..), mkAnalysisRuleCriteriaProperty
+    ) where
+import qualified Data.Aeson as JSON
+import qualified Stratosphere.Prelude as Prelude
+import Stratosphere.Property
+import Stratosphere.ResourceProperties
+import Stratosphere.Value
+data AnalysisRuleCriteriaProperty
+  = AnalysisRuleCriteriaProperty {accountIds :: (Prelude.Maybe (ValueList Prelude.Text)),
+                                  resourceTags :: (Prelude.Maybe JSON.Object)}
+  deriving stock (Prelude.Eq, Prelude.Show)
+mkAnalysisRuleCriteriaProperty :: AnalysisRuleCriteriaProperty
+mkAnalysisRuleCriteriaProperty
+  = AnalysisRuleCriteriaProperty
+      {accountIds = Prelude.Nothing, resourceTags = Prelude.Nothing}
+instance ToResourceProperties AnalysisRuleCriteriaProperty where
+  toResourceProperties AnalysisRuleCriteriaProperty {..}
+    = ResourceProperties
+        {awsType = "AWS::AccessAnalyzer::Analyzer.AnalysisRuleCriteria",
+         supportsTags = Prelude.False,
+         properties = Prelude.fromList
+                        (Prelude.catMaybes
+                           [(JSON..=) "AccountIds" Prelude.<$> accountIds,
+                            (JSON..=) "ResourceTags" Prelude.<$> resourceTags])}
+instance JSON.ToJSON AnalysisRuleCriteriaProperty where
+  toJSON AnalysisRuleCriteriaProperty {..}
+    = JSON.object
+        (Prelude.fromList
+           (Prelude.catMaybes
+              [(JSON..=) "AccountIds" Prelude.<$> accountIds,
+               (JSON..=) "ResourceTags" Prelude.<$> resourceTags]))
+instance Property "AccountIds" AnalysisRuleCriteriaProperty where
+  type PropertyType "AccountIds" AnalysisRuleCriteriaProperty = ValueList Prelude.Text
+  set newValue AnalysisRuleCriteriaProperty {..}
+    = AnalysisRuleCriteriaProperty
+        {accountIds = Prelude.pure newValue, ..}
+instance Property "ResourceTags" AnalysisRuleCriteriaProperty where
+  type PropertyType "ResourceTags" AnalysisRuleCriteriaProperty = JSON.Object
+  set newValue AnalysisRuleCriteriaProperty {..}
+    = AnalysisRuleCriteriaProperty
+        {resourceTags = Prelude.pure newValue, ..}

services/accessanalyzer/gen/Stratosphere/AccessAnalyzer/Analyzer/AnalysisRuleCriteriaProperty.hs-boot

@@ -0,0 +1,9 @@
+module Stratosphere.AccessAnalyzer.Analyzer.AnalysisRuleCriteriaProperty where
+import qualified Data.Aeson as JSON
+import qualified Stratosphere.Prelude as Prelude
+import Stratosphere.ResourceProperties
+data AnalysisRuleCriteriaProperty :: Prelude.Type
+instance ToResourceProperties AnalysisRuleCriteriaProperty
+instance Prelude.Eq AnalysisRuleCriteriaProperty
+instance Prelude.Show AnalysisRuleCriteriaProperty
+instance JSON.ToJSON AnalysisRuleCriteriaProperty

services/accessanalyzer/gen/Stratosphere/AccessAnalyzer/Analyzer/AnalysisRuleProperty.hs

@@ -0,0 +1,32 @@
+module Stratosphere.AccessAnalyzer.Analyzer.AnalysisRuleProperty (
+        module Exports, AnalysisRuleProperty(..), mkAnalysisRuleProperty
+    ) where
+import qualified Data.Aeson as JSON
+import qualified Stratosphere.Prelude as Prelude
+import Stratosphere.Property
+import {-# SOURCE #-} Stratosphere.AccessAnalyzer.Analyzer.AnalysisRuleCriteriaProperty as Exports
+import Stratosphere.ResourceProperties
+data AnalysisRuleProperty
+  = AnalysisRuleProperty {exclusions :: (Prelude.Maybe [AnalysisRuleCriteriaProperty])}
+  deriving stock (Prelude.Eq, Prelude.Show)
+mkAnalysisRuleProperty :: AnalysisRuleProperty
+mkAnalysisRuleProperty
+  = AnalysisRuleProperty {exclusions = Prelude.Nothing}
+instance ToResourceProperties AnalysisRuleProperty where
+  toResourceProperties AnalysisRuleProperty {..}
+    = ResourceProperties
+        {awsType = "AWS::AccessAnalyzer::Analyzer.AnalysisRule",
+         supportsTags = Prelude.False,
+         properties = Prelude.fromList
+                        (Prelude.catMaybes
+                           [(JSON..=) "Exclusions" Prelude.<$> exclusions])}
+instance JSON.ToJSON AnalysisRuleProperty where
+  toJSON AnalysisRuleProperty {..}
+    = JSON.object
+        (Prelude.fromList
+           (Prelude.catMaybes
+              [(JSON..=) "Exclusions" Prelude.<$> exclusions]))
+instance Property "Exclusions" AnalysisRuleProperty where
+  type PropertyType "Exclusions" AnalysisRuleProperty = [AnalysisRuleCriteriaProperty]
+  set newValue AnalysisRuleProperty {}
+    = AnalysisRuleProperty {exclusions = Prelude.pure newValue, ..}

services/accessanalyzer/gen/Stratosphere/AccessAnalyzer/Analyzer/AnalysisRuleProperty.hs-boot

@@ -0,0 +1,9 @@
+module Stratosphere.AccessAnalyzer.Analyzer.AnalysisRuleProperty where
+import qualified Data.Aeson as JSON
+import qualified Stratosphere.Prelude as Prelude
+import Stratosphere.ResourceProperties
+data AnalysisRuleProperty :: Prelude.Type
+instance ToResourceProperties AnalysisRuleProperty
+instance Prelude.Eq AnalysisRuleProperty
+instance Prelude.Show AnalysisRuleProperty
+instance JSON.ToJSON AnalysisRuleProperty

services/accessanalyzer/gen/Stratosphere/AccessAnalyzer/Analyzer/UnusedAccessConfigurationProperty.hs

@@ -1,36 +1,45 @@
 module Stratosphere.AccessAnalyzer.Analyzer.UnusedAccessConfigurationProperty (
-        UnusedAccessConfigurationProperty(..),
+        module Exports, UnusedAccessConfigurationProperty(..),
         mkUnusedAccessConfigurationProperty
     ) where
 import qualified Data.Aeson as JSON
 import qualified Stratosphere.Prelude as Prelude
 import Stratosphere.Property
+import {-# SOURCE #-} Stratosphere.AccessAnalyzer.Analyzer.AnalysisRuleProperty as Exports
 import Stratosphere.ResourceProperties
 import Stratosphere.Value
 data UnusedAccessConfigurationProperty
-  = UnusedAccessConfigurationProperty {unusedAccessAge :: (Prelude.Maybe (Value Prelude.Integer))}
+  = UnusedAccessConfigurationProperty {analysisRule :: (Prelude.Maybe AnalysisRuleProperty),
+                                       unusedAccessAge :: (Prelude.Maybe (Value Prelude.Integer))}
   deriving stock (Prelude.Eq, Prelude.Show)
 mkUnusedAccessConfigurationProperty ::
   UnusedAccessConfigurationProperty
 mkUnusedAccessConfigurationProperty
   = UnusedAccessConfigurationProperty
-      {unusedAccessAge = Prelude.Nothing}
+      {analysisRule = Prelude.Nothing, unusedAccessAge = Prelude.Nothing}
 instance ToResourceProperties UnusedAccessConfigurationProperty where
   toResourceProperties UnusedAccessConfigurationProperty {..}
     = ResourceProperties
         {awsType = "AWS::AccessAnalyzer::Analyzer.UnusedAccessConfiguration",
          supportsTags = Prelude.False,
          properties = Prelude.fromList
                         (Prelude.catMaybes
-                           [(JSON..=) "UnusedAccessAge" Prelude.<$> unusedAccessAge])}
+                           [(JSON..=) "AnalysisRule" Prelude.<$> analysisRule,
+                            (JSON..=) "UnusedAccessAge" Prelude.<$> unusedAccessAge])}
 instance JSON.ToJSON UnusedAccessConfigurationProperty where
   toJSON UnusedAccessConfigurationProperty {..}
     = JSON.object
         (Prelude.fromList
            (Prelude.catMaybes
-              [(JSON..=) "UnusedAccessAge" Prelude.<$> unusedAccessAge]))
+              [(JSON..=) "AnalysisRule" Prelude.<$> analysisRule,
+               (JSON..=) "UnusedAccessAge" Prelude.<$> unusedAccessAge]))
+instance Property "AnalysisRule" UnusedAccessConfigurationProperty where
+  type PropertyType "AnalysisRule" UnusedAccessConfigurationProperty = AnalysisRuleProperty
+  set newValue UnusedAccessConfigurationProperty {..}
+    = UnusedAccessConfigurationProperty
+        {analysisRule = Prelude.pure newValue, ..}
 instance Property "UnusedAccessAge" UnusedAccessConfigurationProperty where
   type PropertyType "UnusedAccessAge" UnusedAccessConfigurationProperty = Value Prelude.Integer
-  set newValue UnusedAccessConfigurationProperty {}
+  set newValue UnusedAccessConfigurationProperty {..}
     = UnusedAccessConfigurationProperty
         {unusedAccessAge = Prelude.pure newValue, ..}

services/accessanalyzer/stratosphere-accessanalyzer.cabal

@@ -26,6 +26,8 @@ flag development
 library
   exposed-modules:
       Stratosphere.AccessAnalyzer.Analyzer
+      Stratosphere.AccessAnalyzer.Analyzer.AnalysisRuleCriteriaProperty
+      Stratosphere.AccessAnalyzer.Analyzer.AnalysisRuleProperty
       Stratosphere.AccessAnalyzer.Analyzer.AnalyzerConfigurationProperty
       Stratosphere.AccessAnalyzer.Analyzer.ArchiveRuleProperty
       Stratosphere.AccessAnalyzer.Analyzer.FilterProperty

services/acmpca/gen/Stratosphere/ACMPCA/CertificateAuthority/CrlConfigurationProperty.hs

@@ -11,44 +11,47 @@ import Stratosphere.Value
 data CrlConfigurationProperty
   = CrlConfigurationProperty {crlDistributionPointExtensionConfiguration :: (Prelude.Maybe CrlDistributionPointExtensionConfigurationProperty),
                               customCname :: (Prelude.Maybe (Value Prelude.Text)),
-                              enabled :: (Prelude.Maybe (Value Prelude.Bool)),
+                              enabled :: (Value Prelude.Bool),
                               expirationInDays :: (Prelude.Maybe (Value Prelude.Integer)),
                               s3BucketName :: (Prelude.Maybe (Value Prelude.Text)),
                               s3ObjectAcl :: (Prelude.Maybe (Value Prelude.Text))}
   deriving stock (Prelude.Eq, Prelude.Show)
-mkCrlConfigurationProperty :: CrlConfigurationProperty
-mkCrlConfigurationProperty
+mkCrlConfigurationProperty ::
+  Value Prelude.Bool -> CrlConfigurationProperty
+mkCrlConfigurationProperty enabled
   = CrlConfigurationProperty
-      {crlDistributionPointExtensionConfiguration = Prelude.Nothing,
-       customCname = Prelude.Nothing, enabled = Prelude.Nothing,
-       expirationInDays = Prelude.Nothing, s3BucketName = Prelude.Nothing,
-       s3ObjectAcl = Prelude.Nothing}
+      {enabled = enabled,
+       crlDistributionPointExtensionConfiguration = Prelude.Nothing,
+       customCname = Prelude.Nothing, expirationInDays = Prelude.Nothing,
+       s3BucketName = Prelude.Nothing, s3ObjectAcl = Prelude.Nothing}
 instance ToResourceProperties CrlConfigurationProperty where
   toResourceProperties CrlConfigurationProperty {..}
     = ResourceProperties
         {awsType = "AWS::ACMPCA::CertificateAuthority.CrlConfiguration",
          supportsTags = Prelude.False,
          properties = Prelude.fromList
-                        (Prelude.catMaybes
-                           [(JSON..=) "CrlDistributionPointExtensionConfiguration"
-                              Prelude.<$> crlDistributionPointExtensionConfiguration,
-                            (JSON..=) "CustomCname" Prelude.<$> customCname,
-                            (JSON..=) "Enabled" Prelude.<$> enabled,
-                            (JSON..=) "ExpirationInDays" Prelude.<$> expirationInDays,
-                            (JSON..=) "S3BucketName" Prelude.<$> s3BucketName,
-                            (JSON..=) "S3ObjectAcl" Prelude.<$> s3ObjectAcl])}
+                        ((Prelude.<>)
+                           ["Enabled" JSON..= enabled]
+                           (Prelude.catMaybes
+                              [(JSON..=) "CrlDistributionPointExtensionConfiguration"
+                                 Prelude.<$> crlDistributionPointExtensionConfiguration,
+                               (JSON..=) "CustomCname" Prelude.<$> customCname,
+                               (JSON..=) "ExpirationInDays" Prelude.<$> expirationInDays,
+                               (JSON..=) "S3BucketName" Prelude.<$> s3BucketName,
+                               (JSON..=) "S3ObjectAcl" Prelude.<$> s3ObjectAcl]))}
 instance JSON.ToJSON CrlConfigurationProperty where
   toJSON CrlConfigurationProperty {..}
     = JSON.object
         (Prelude.fromList
-           (Prelude.catMaybes
-              [(JSON..=) "CrlDistributionPointExtensionConfiguration"
-                 Prelude.<$> crlDistributionPointExtensionConfiguration,
-               (JSON..=) "CustomCname" Prelude.<$> customCname,
-               (JSON..=) "Enabled" Prelude.<$> enabled,
-               (JSON..=) "ExpirationInDays" Prelude.<$> expirationInDays,
-               (JSON..=) "S3BucketName" Prelude.<$> s3BucketName,
-               (JSON..=) "S3ObjectAcl" Prelude.<$> s3ObjectAcl]))
+           ((Prelude.<>)
+              ["Enabled" JSON..= enabled]
+              (Prelude.catMaybes
+                 [(JSON..=) "CrlDistributionPointExtensionConfiguration"
+                    Prelude.<$> crlDistributionPointExtensionConfiguration,
+                  (JSON..=) "CustomCname" Prelude.<$> customCname,
+                  (JSON..=) "ExpirationInDays" Prelude.<$> expirationInDays,
+                  (JSON..=) "S3BucketName" Prelude.<$> s3BucketName,
+                  (JSON..=) "S3ObjectAcl" Prelude.<$> s3ObjectAcl])))
 instance Property "CrlDistributionPointExtensionConfiguration" CrlConfigurationProperty where
   type PropertyType "CrlDistributionPointExtensionConfiguration" CrlConfigurationProperty = CrlDistributionPointExtensionConfigurationProperty
   set newValue CrlConfigurationProperty {..}
@@ -64,7 +67,7 @@ instance Property "CustomCname" CrlConfigurationProperty where
 instance Property "Enabled" CrlConfigurationProperty where
   type PropertyType "Enabled" CrlConfigurationProperty = Value Prelude.Bool
   set newValue CrlConfigurationProperty {..}
-    = CrlConfigurationProperty {enabled = Prelude.pure newValue, ..}
+    = CrlConfigurationProperty {enabled = newValue, ..}
 instance Property "ExpirationInDays" CrlConfigurationProperty where
   type PropertyType "ExpirationInDays" CrlConfigurationProperty = Value Prelude.Integer
   set newValue CrlConfigurationProperty {..}

services/acmpca/gen/Stratosphere/ACMPCA/CertificateAuthority/EdiPartyNameProperty.hs

@@ -7,30 +7,36 @@ import Stratosphere.Property
 import Stratosphere.ResourceProperties
 import Stratosphere.Value
 data EdiPartyNameProperty
-  = EdiPartyNameProperty {nameAssigner :: (Value Prelude.Text),
+  = EdiPartyNameProperty {nameAssigner :: (Prelude.Maybe (Value Prelude.Text)),
                           partyName :: (Value Prelude.Text)}
   deriving stock (Prelude.Eq, Prelude.Show)
 mkEdiPartyNameProperty ::
-  Value Prelude.Text -> Value Prelude.Text -> EdiPartyNameProperty
-mkEdiPartyNameProperty nameAssigner partyName
+  Value Prelude.Text -> EdiPartyNameProperty
+mkEdiPartyNameProperty partyName
   = EdiPartyNameProperty
-      {nameAssigner = nameAssigner, partyName = partyName}
+      {partyName = partyName, nameAssigner = Prelude.Nothing}
 instance ToResourceProperties EdiPartyNameProperty where
   toResourceProperties EdiPartyNameProperty {..}
     = ResourceProperties
         {awsType = "AWS::ACMPCA::CertificateAuthority.EdiPartyName",
          supportsTags = Prelude.False,
-         properties = ["NameAssigner" JSON..= nameAssigner,
-                       "PartyName" JSON..= partyName]}
+         properties = Prelude.fromList
+                        ((Prelude.<>)
+                           ["PartyName" JSON..= partyName]
+                           (Prelude.catMaybes
+                              [(JSON..=) "NameAssigner" Prelude.<$> nameAssigner]))}
 instance JSON.ToJSON EdiPartyNameProperty where
   toJSON EdiPartyNameProperty {..}
     = JSON.object
-        ["NameAssigner" JSON..= nameAssigner,
-         "PartyName" JSON..= partyName]
+        (Prelude.fromList
+           ((Prelude.<>)
+              ["PartyName" JSON..= partyName]
+              (Prelude.catMaybes
+                 [(JSON..=) "NameAssigner" Prelude.<$> nameAssigner])))
 instance Property "NameAssigner" EdiPartyNameProperty where
   type PropertyType "NameAssigner" EdiPartyNameProperty = Value Prelude.Text
   set newValue EdiPartyNameProperty {..}
-    = EdiPartyNameProperty {nameAssigner = newValue, ..}
+    = EdiPartyNameProperty {nameAssigner = Prelude.pure newValue, ..}
 instance Property "PartyName" EdiPartyNameProperty where
   type PropertyType "PartyName" EdiPartyNameProperty = Value Prelude.Text
   set newValue EdiPartyNameProperty {..}

services/acmpca/gen/Stratosphere/ACMPCA/CertificateAuthority/OcspConfigurationProperty.hs

@@ -7,33 +7,36 @@ import Stratosphere.Property
 import Stratosphere.ResourceProperties
 import Stratosphere.Value
 data OcspConfigurationProperty
-  = OcspConfigurationProperty {enabled :: (Prelude.Maybe (Value Prelude.Bool)),
+  = OcspConfigurationProperty {enabled :: (Value Prelude.Bool),
                                ocspCustomCname :: (Prelude.Maybe (Value Prelude.Text))}
   deriving stock (Prelude.Eq, Prelude.Show)
-mkOcspConfigurationProperty :: OcspConfigurationProperty
-mkOcspConfigurationProperty
+mkOcspConfigurationProperty ::
+  Value Prelude.Bool -> OcspConfigurationProperty
+mkOcspConfigurationProperty enabled
   = OcspConfigurationProperty
-      {enabled = Prelude.Nothing, ocspCustomCname = Prelude.Nothing}
+      {enabled = enabled, ocspCustomCname = Prelude.Nothing}
 instance ToResourceProperties OcspConfigurationProperty where
   toResourceProperties OcspConfigurationProperty {..}
     = ResourceProperties
         {awsType = "AWS::ACMPCA::CertificateAuthority.OcspConfiguration",
          supportsTags = Prelude.False,
          properties = Prelude.fromList
-                        (Prelude.catMaybes
-                           [(JSON..=) "Enabled" Prelude.<$> enabled,
-                            (JSON..=) "OcspCustomCname" Prelude.<$> ocspCustomCname])}
+                        ((Prelude.<>)
+                           ["Enabled" JSON..= enabled]
+                           (Prelude.catMaybes
+                              [(JSON..=) "OcspCustomCname" Prelude.<$> ocspCustomCname]))}
 instance JSON.ToJSON OcspConfigurationProperty where
   toJSON OcspConfigurationProperty {..}
     = JSON.object
         (Prelude.fromList
-           (Prelude.catMaybes
-              [(JSON..=) "Enabled" Prelude.<$> enabled,
-               (JSON..=) "OcspCustomCname" Prelude.<$> ocspCustomCname]))
+           ((Prelude.<>)
+              ["Enabled" JSON..= enabled]
+              (Prelude.catMaybes
+                 [(JSON..=) "OcspCustomCname" Prelude.<$> ocspCustomCname])))
 instance Property "Enabled" OcspConfigurationProperty where
   type PropertyType "Enabled" OcspConfigurationProperty = Value Prelude.Bool
   set newValue OcspConfigurationProperty {..}
-    = OcspConfigurationProperty {enabled = Prelude.pure newValue, ..}
+    = OcspConfigurationProperty {enabled = newValue, ..}
 instance Property "OcspCustomCname" OcspConfigurationProperty where
   type PropertyType "OcspCustomCname" OcspConfigurationProperty = Value Prelude.Text
   set newValue OcspConfigurationProperty {..}