Fix EC2 and MSK issues from the 91.0.0 spec

cloudtools · Oct 12, 2022 · ee2c1a7 · ee2c1a7
1 parent b20900e
commit ee2c1a7
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 46 deletions.
diff --git a/scripts/patches/ec2.py b/scripts/patches/ec2.py
@@ -398,5 +398,9 @@ def targetgroupconfig_patches():
             "path": "/PropertyTypes/AWS::EC2::SpotFleet.SpotFleetRequestConfigData/Properties/LaunchTemplateConfigs/ItemType",
             "value": "LaunchTemplateConfigs",
         },
+        {
+            "op": "remove",
+            "path": "/PropertyTypes/AWS::EC2::NetworkInsightsAnalysis.AdditionalDetail",
+        },
     ]
 )
diff --git a/scripts/patches/msk.py b/scripts/patches/msk.py
@@ -0,0 +1,10 @@
+patches = [
+    {
+        "op": "remove",
+        "path": "/PropertyTypes/AWS::MSK::ServerlessCluster.ClientAuthentication",
+    },
+    {
+        "op": "remove",
+        "path": "/PropertyTypes/AWS::MSK::ServerlessCluster.Sasl",
+    },
+]
diff --git a/troposphere/ec2.py b/troposphere/ec2.py
@@ -2673,17 +2673,6 @@ class VolumeAttachment(AWSObject):
     }
 
 
-class AdditionalDetail(AWSProperty):
-    """
-    `AdditionalDetail <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-additionaldetail.html>`__
-    """
-
-    props: PropsDictType = {
-        "AdditionalDetailType": (str, False),
-        "Component": (AnalysisComponent, False),
-    }
-
-
 class EbsBlockDevice(AWSProperty):
     """
     `EbsBlockDevice <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-ebsblockdevice.html>`__

diff --git a/troposphere/msk.py b/troposphere/msk.py
@@ -100,23 +100,57 @@ class Iam(AWSProperty):
     }
 
 
+class Scram(AWSProperty):
+    """
+    `Scram <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-scram.html>`__
+    """
+
+    props: PropsDictType = {
+        "Enabled": (boolean, True),
+    }
+
+
 class Sasl(AWSProperty):
     """
-    `Sasl <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-serverlesscluster-sasl.html>`__
+    `Sasl <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-sasl.html>`__
     """
 
     props: PropsDictType = {
-        "Iam": (Iam, True),
+        "Iam": (Iam, False),
+        "Scram": (Scram, False),
+    }
+
+
+class Tls(AWSProperty):
+    """
+    `Tls <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-tls.html>`__
+    """
+
+    props: PropsDictType = {
+        "CertificateAuthorityArnList": ([str], False),
+        "Enabled": (boolean, False),
+    }
+
+
+class Unauthenticated(AWSProperty):
+    """
+    `Unauthenticated <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-unauthenticated.html>`__
+    """
+
+    props: PropsDictType = {
+        "Enabled": (boolean, True),
     }
 
 
 class ClientAuthentication(AWSProperty):
     """
-    `ClientAuthentication <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-serverlesscluster-clientauthentication.html>`__
+    `ClientAuthentication <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-clientauthentication.html>`__
     """
 
     props: PropsDictType = {
-        "Sasl": (Sasl, True),
+        "Sasl": (Sasl, False),
+        "Tls": (Tls, False),
+        "Unauthenticated": (Unauthenticated, False),
     }
 
 
@@ -322,34 +356,3 @@ class ServerlessCluster(AWSObject):
         "Tags": (dict, False),
         "VpcConfigs": ([VpcConfig], True),
     }
-
-
-class Scram(AWSProperty):
-    """
-    `Scram <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-scram.html>`__
-    """
-
-    props: PropsDictType = {
-        "Enabled": (boolean, True),
-    }
-
-
-class Tls(AWSProperty):
-    """
-    `Tls <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-tls.html>`__
-    """
-
-    props: PropsDictType = {
-        "CertificateAuthorityArnList": ([str], False),
-        "Enabled": (boolean, False),
-    }
-
-
-class Unauthenticated(AWSProperty):
-    """
-    `Unauthenticated <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-unauthenticated.html>`__
-    """
-
-    props: PropsDictType = {
-        "Enabled": (boolean, True),
-    }