Merge branch 'master' of github.com:spulec/moto

moto/dynamodb2/models.py

@@ -450,9 +450,9 @@ class Item(BaseModel):
                 old_list_key = list_append_re.group(1)
                 # old_key could be a function itself (if_not_exists)
                 if old_list_key.startswith("if_not_exists"):
-                    old_list = DynamoType(
-                        expression_attribute_values[self._get_default(old_list_key)]
-                    )
+                    old_list = self._get_default(old_list_key)
+                    if not isinstance(old_list, DynamoType):
+                        old_list = DynamoType(expression_attribute_values[old_list])
                 else:
                     old_list = self.attrs[old_list_key.split(".")[0]]
                     if "." in old_list_key:

moto/route53/models.py

@@ -88,6 +88,8 @@ class RecordSet(BaseModel):
         self.hosted_zone_name = kwargs.get("HostedZoneName")
         self.hosted_zone_id = kwargs.get("HostedZoneId")
         self.alias_target = kwargs.get("AliasTarget")
+        self.failover = kwargs.get("Failover")
+        self.geo_location = kwargs.get("GeoLocation")
 
     @classmethod
     def create_from_cloudformation_json(
@@ -154,6 +156,16 @@ class RecordSet(BaseModel):
                 {% if record_set.ttl %}
                     <TTL>{{ record_set.ttl }}</TTL>
                 {% endif %}
+                {% if record_set.failover %}
+                    <Failover>{{ record_set.failover }}</Failover>
+                {% endif %}
+                {% if record_set.geo_location %}
+                <GeoLocation>
+                {% for geo_key in ['ContinentCode','CountryCode','SubdivisionCode'] %}
+                  {% if record_set.geo_location[geo_key] %}<{{ geo_key }}>{{ record_set.geo_location[geo_key] }}</{{ geo_key }}>{% endif %}
+                {% endfor %}
+                </GeoLocation>
+                {% endif %}
                 {% if record_set.alias_target %}
                 <AliasTarget>
                     <HostedZoneId>{{ record_set.alias_target['HostedZoneId'] }}</HostedZoneId>

moto/ssm/models.py

@@ -278,10 +278,7 @@ class SimpleSystemManagerBackend(BaseBackend):
                 self._region = region
 
     def delete_parameter(self, name):
-        try:
-            del self._parameters[name]
-        except KeyError:
-            pass
+        return self._parameters.pop(name, None)
 
     def delete_parameters(self, names):
         result = []

moto/ssm/responses.py

@@ -22,7 +22,13 @@ class SimpleSystemManagerResponse(BaseResponse):
 
     def delete_parameter(self):
         name = self._get_param("Name")
-        self.ssm_backend.delete_parameter(name)
+        result = self.ssm_backend.delete_parameter(name)
+        if result is None:
+            error = {
+                "__type": "ParameterNotFound",
+                "message": "Parameter {0} not found.".format(name),
+            }
+            return json.dumps(error), dict(status=400)
         return json.dumps({})
 
     def delete_parameters(self):

moto/swf/models/__init__.py

@@ -121,6 +121,12 @@ class SWFBackend(BaseBackend):
             raise SWFDomainDeprecatedFault(name)
         domain.status = "DEPRECATED"
 
+    def undeprecate_domain(self, name):
+        domain = self._get_domain(name)
+        if domain.status == "REGISTERED":
+            raise SWFDomainAlreadyExistsFault(name)
+        domain.status = "REGISTERED"
+
     def describe_domain(self, name):
         return self._get_domain(name)
 
@@ -148,6 +154,13 @@ class SWFBackend(BaseBackend):
             raise SWFTypeDeprecatedFault(_type)
         _type.status = "DEPRECATED"
 
+    def undeprecate_type(self, kind, domain_name, name, version):
+        domain = self._get_domain(domain_name)
+        _type = domain.get_type(kind, name, version)
+        if _type.status == "REGISTERED":
+            raise SWFTypeAlreadyExistsFault(_type)
+        _type.status = "REGISTERED"
+
     def describe_type(self, kind, domain_name, name, version):
         domain = self._get_domain(domain_name)
         return domain.get_type(kind, name, version)

moto/swf/responses.py

@@ -92,6 +92,17 @@ class SWFResponse(BaseResponse):
         self.swf_backend.deprecate_type(kind, domain, name, version)
         return ""
 
+    def _undeprecate_type(self, kind):
+        domain = self._params["domain"]
+        _type_args = self._params["{0}Type".format(kind)]
+        name = _type_args["name"]
+        version = _type_args["version"]
+        self._check_string(domain)
+        self._check_string(name)
+        self._check_string(version)
+        self.swf_backend.undeprecate_type(kind, domain, name, version)
+        return ""
+
     # TODO: implement pagination
     def list_domains(self):
         status = self._params["registrationStatus"]
@@ -219,6 +230,12 @@ class SWFResponse(BaseResponse):
         self.swf_backend.deprecate_domain(name)
         return ""
 
+    def undeprecate_domain(self):
+        name = self._params["name"]
+        self._check_string(name)
+        self.swf_backend.undeprecate_domain(name)
+        return ""
+
     def describe_domain(self):
         name = self._params["name"]
         self._check_string(name)
@@ -278,6 +295,9 @@ class SWFResponse(BaseResponse):
     def deprecate_activity_type(self):
         return self._deprecate_type("activity")
 
+    def undeprecate_activity_type(self):
+        return self._undeprecate_type("activity")
+
     def describe_activity_type(self):
         return self._describe_type("activity")
 
@@ -333,6 +353,9 @@ class SWFResponse(BaseResponse):
     def deprecate_workflow_type(self):
         return self._deprecate_type("workflow")
 
+    def undeprecate_workflow_type(self):
+        return self._undeprecate_type("workflow")
+
     def describe_workflow_type(self):
         return self._describe_type("workflow")