From d68fb04ee1fdf33c485b00fb40500406ac32d857 Mon Sep 17 00:00:00 2001
From: Bert Blommers <bblommers@users.noreply.github.com>
Date: Tue, 3 Jan 2023 21:21:52 +0000
Subject: [PATCH] IOTData: Fix bug where publish() could only be called once
 (#5812)

---
 .github/workflows/test_outdated_versions.yml |  4 ++--
 moto/iotdata/responses.py                    | 20 ++++++++------------
 moto/iotdata/urls.py                         |  9 ---------
 tests/test_iotdata/test_iotdata.py           | 10 +++++++---
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/test_outdated_versions.yml b/.github/workflows/test_outdated_versions.yml
index 1aeff3d79..6a49974fe 100644
--- a/.github/workflows/test_outdated_versions.yml
+++ b/.github/workflows/test_outdated_versions.yml
@@ -41,7 +41,7 @@ jobs:
 
     - name: Run tests
       run: |
-        pytest -sv tests/test_core ./tests/test_apigateway/test_apigateway_integration.py ./tests/test_s3/test_server.py
+        pytest -sv tests/test_core ./tests/test_apigateway/test_apigateway_integration.py tests/test_iotdata ./tests/test_s3/test_server.py
 
     - name: Start MotoServer
       run: |
@@ -52,7 +52,7 @@ jobs:
       env:
         TEST_SERVER_MODE: ${{ true }}
       run: |
-        pytest -sv tests/test_core tests/test_awslambda tests/test_cloudformation
+        pytest -sv tests/test_core tests/test_awslambda tests/test_cloudformation tests/test_iotdata
     - name: "Stop MotoServer"
       if: always()
       run: |
diff --git a/moto/iotdata/responses.py b/moto/iotdata/responses.py
index 6aa157327..ca31eb811 100644
--- a/moto/iotdata/responses.py
+++ b/moto/iotdata/responses.py
@@ -8,6 +8,12 @@ class IoTDataPlaneResponse(BaseResponse):
     def __init__(self):
         super().__init__(service_name="iot-data")
 
+    def _get_action(self) -> str:
+        if self.path and self.path.startswith("/topics/"):
+            # Special usecase - there is no way identify this action, besides the URL
+            return "publish"
+        return super()._get_action()
+
     @property
     def iotdata_backend(self):
         return iotdata_backends[self.current_account][self.region]
@@ -30,18 +36,8 @@ class IoTDataPlaneResponse(BaseResponse):
         payload = self.iotdata_backend.delete_thing_shadow(thing_name=thing_name)
         return json.dumps(payload.to_dict())
 
-    def dispatch_publish(self, request, full_url, headers):
-        # This endpoint requires specialized handling because it has
-        # a uri parameter containing forward slashes that is not
-        # correctly url encoded when we're running in server mode.
-        # https://github.com/pallets/flask/issues/900
-        self.setup_class(request, full_url, headers)
-        self.querystring["Action"] = ["Publish"]
-        topic = self.path.partition("/topics/")[-1]
-        self.querystring["target"] = [unquote(topic)] if "%" in topic else [topic]
-        return self.call_action()
-
     def publish(self):
-        topic = self._get_param("target")
+        topic = self.path.split("/topics/")[-1]
+        topic = unquote(topic) if "%" in topic else topic
         self.iotdata_backend.publish(topic=topic, payload=self.body)
         return json.dumps(dict())
diff --git a/moto/iotdata/urls.py b/moto/iotdata/urls.py
index 6e1adbbb9..44f9cffde 100644
--- a/moto/iotdata/urls.py
+++ b/moto/iotdata/urls.py
@@ -10,18 +10,9 @@ response = IoTDataPlaneResponse()
 
 
 url_paths = {
-    #
-    # Paths for :class:`moto.core.models.MockAWS`
-    #
-    # This route requires special handling.
-    "{0}/topics/(?P<topic>.*)$": response.dispatch_publish,
-    # The remaining routes can be handled by the default dispatcher.
     "{0}/.*$": response.dispatch,
     #
     # (Flask) Paths for :class:`moto.core.models.ServerModeMockAWS`
     #
-    # This route requires special handling.
-    "{0}/topics/<path:topic>$": response.dispatch_publish,
-    # The remaining routes can be handled by the default dispatcher.
     "{0}/<path:route>$": response.dispatch,
 }
diff --git a/tests/test_iotdata/test_iotdata.py b/tests/test_iotdata/test_iotdata.py
index 0a0b7a350..59df5c06d 100644
--- a/tests/test_iotdata/test_iotdata.py
+++ b/tests/test_iotdata/test_iotdata.py
@@ -110,12 +110,16 @@ def test_update():
 def test_publish():
     region_name = "ap-northeast-1"
     client = boto3.client("iot-data", region_name=region_name)
-    client.publish(topic="test/topic", qos=1, payload=b"pl")
+    client.publish(topic="test/topic1", qos=1, payload=b"pl1")
+    client.publish(topic="test/topic2", qos=1, payload=b"pl2")
+    client.publish(topic="test/topic3", qos=1, payload=b"pl3")
 
     if not settings.TEST_SERVER_MODE:
         mock_backend = moto.iotdata.models.iotdata_backends[ACCOUNT_ID][region_name]
-        mock_backend.published_payloads.should.have.length_of(1)
-        mock_backend.published_payloads.should.contain(("test/topic", "pl"))
+        mock_backend.published_payloads.should.have.length_of(3)
+        mock_backend.published_payloads.should.contain(("test/topic1", "pl1"))
+        mock_backend.published_payloads.should.contain(("test/topic2", "pl2"))
+        mock_backend.published_payloads.should.contain(("test/topic3", "pl3"))
 
 
 @mock_iot