From 73aa7bfef08ae1448d2091286f9b73984d30ae08 Mon Sep 17 00:00:00 2001
From: MinCheTsai <minche@softchef.com>
Date: Thu, 13 Oct 2022 20:55:47 +0800
Subject: [PATCH] Move code

---
 docker-compose.yml   |  1 +
 forwarder/Dockerfile |  4 ++--
 forwarder/app.py     | 47 --------------------------------------------
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 forwarder/app.py

diff --git a/docker-compose.yml b/docker-compose.yml
index 8ac39b0..f772976 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,6 +72,7 @@ services:
       - AWS_CONTAINER_CREDENTIALS_FULL_URI
       - AWS_IOT_THING_NAME
     volumes:
+      - ../forwarder:/forwarder
       - /greengrass/v2:/greengrass/v2
 
 volumes:
diff --git a/forwarder/Dockerfile b/forwarder/Dockerfile
index f5682fe..d086ff2 100644
--- a/forwarder/Dockerfile
+++ b/forwarder/Dockerfile
@@ -4,9 +4,9 @@ COPY requirements.txt ./
 RUN apt-get update && apt-get install -y cmake
 RUN pip install -r ./requirements.txt
 
-COPY app.py ./
+# COPY app.py ./
 
-CMD ["python", "app.py"]
+CMD ["python", "/forwarder/app.py"]
 
 RUN adduser --system forwarder
 USER forwarder
\ No newline at end of file
diff --git a/forwarder/app.py b/forwarder/app.py
deleted file mode 100644
index c1cc017..0000000
--- a/forwarder/app.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import os
-import awsiot.greengrasscoreipc
-import awsiot.greengrasscoreipc.client as client
-import awsiot.greengrasscoreipc.model as model
-import json
-import paho.mqtt.client as mqtt
-
-print(os.environ)
-
-def on_connect(client, userdata, flags, rc):
-  print("Connected with result code "+str(rc))
-  client.subscribe("application/+/device/+/event/up")
-
-def on_message(client, userdata, msg):
-  # @TODO add DevEUI to topic
-  topic = "{}/up".format(os.environ["AWS_IOT_THING_NAME"])
-  data = json.loads(str(msg.payload.decode("utf-8")))
-  print(data['object'])
-  # print(payload['rxInfo']['gatewayId'])
-  # print(payload['deviceInfo']['devEui'])
-  payload = json.dumps({
-    # "GatewayEui": payload['rxInfo']['gatewayId'],
-    # "DevEui": payload['deviceInfo']['devEui'],
-    "Payload": data['object']
-  }).encode()
-
-  ipc_client = awsiot.greengrasscoreipc.connect()
-
-  publish_operation = ipc_client.new_publish_to_iot_core()
-
-  print(payload)
-  publish_operation.activate(
-    request = model.PublishToIoTCoreRequest(
-      topic_name = topic,
-      qos = model.QOS.AT_MOST_ONCE,
-      payload = payload
-    )
-  )
-  print('pub success')
-
-client = mqtt.Client()
-client.on_connect = on_connect
-client.on_message = on_message
-
-client.connect("mosquitto", 1883, 60)
-
-client.loop_forever()
\ No newline at end of file