From fa154669e002fea4905e63eedc8419084b95bac3 Mon Sep 17 00:00:00 2001
From: Igor Abdrakhimov <igorabd@amazon.com>
Date: Tue, 28 May 2024 11:40:29 -0700
Subject: [PATCH] Use the right thing

---
 .../basic_discovery/ci_run_discovery_cfg.json    | 10 +++-------
 samples/greengrass/basic_discovery/recipe.yaml   | 16 ++++------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/samples/greengrass/basic_discovery/ci_run_discovery_cfg.json b/samples/greengrass/basic_discovery/ci_run_discovery_cfg.json
index ed7a0f702..257924ffe 100644
--- a/samples/greengrass/basic_discovery/ci_run_discovery_cfg.json
+++ b/samples/greengrass/basic_discovery/ci_run_discovery_cfg.json
@@ -6,12 +6,12 @@
     "arguments": [
         {
             "name": "--cert",
-            "secret": "ci/Greengrass_Discovery/cert",
+            "secret": "ci/GreengrassDiscovery/cert",
             "filename": "tmp_certificate.pem"
         },
         {
             "name": "--key",
-            "secret": "ci/Greengrass_Discovery/key",
+            "secret": "ci/GreengrassDiscovery/key",
             "filename": "tmp_key.pem"
         },
         {
@@ -28,15 +28,11 @@
         },
         {
             "name": "--topic",
-            "data": "clients/CI_Greengrass_Discovery_Thing/hello/world"
+            "data": "clients/CI_Greengrass_Discovery_Thing/hello/world/$INPUT_UUID"
         },
         {
             "name": "--mode",
             "data": "publish"
-        },
-        {
-            "name": "--is_ci",
-            "data": "true"
         }
     ]
 }
diff --git a/samples/greengrass/basic_discovery/recipe.yaml b/samples/greengrass/basic_discovery/recipe.yaml
index c2e4f4e69..96495a6cd 100644
--- a/samples/greengrass/basic_discovery/recipe.yaml
+++ b/samples/greengrass/basic_discovery/recipe.yaml
@@ -15,14 +15,6 @@ ComponentConfiguration:
             - aws.greengrass#PublishToTopic
           resources:
             - "*"
-      aws.greengrass.ipc.mqttproxy:
-        software.amazon.awssdk.sdk-gg-test-discovery:mqttproxy:1:
-          policyDescription: "Allows access to publish and subscribe to a Greengrass IPC test topic"
-          operations:
-            - aws.greengrass#PublishToIoTCore
-            - aws.greengrass#SubscribeToIoTCore
-          resources:
-            - "*"
 Manifests:
   - Platform:
       os: all
@@ -37,7 +29,7 @@ Manifests:
     Lifecycle:
       Install: |
         echo "GG core:" {iot:thingName}
-        aws greengrassv2 batch-associate-client-device-with-core-device --core-device-thing-name {iot:thingName} --entries thingName=CI_GreenGrass_Thing
+        aws greengrassv2 batch-associate-client-device-with-core-device --core-device-thing-name {iot:thingName} --entries thingName=CI_Greengrass_Discovery_Thing
         aws greengrassv2 list-client-devices-associated-with-core-device --core-device-thing-name {iot:thingName}
       Run: |
         UUID=$(python3  -c "import uuid; print (uuid.uuid4())")
@@ -46,10 +38,10 @@ Manifests:
         echo "continuing ..."
         sleep 10
         echo "starting discovery"
-        python3 {artifacts:path}/run_in_ci.py --runnable_dir {artifacts:path} --input_uuid ${UUID} --file {artifacts:path}/ci_run_discovery_cfg.local.json
+        python3 {artifacts:path}/run_in_ci.py --runnable_dir {artifacts:path} --input_uuid ${UUID} --file {artifacts:path}/ci_run_discovery_cfg.json
       Shutdown: |
         echo "Shutdown step"
-        aws greengrassv2 batch-disassociate-client-device-from-core-device --core-device-thing-name {iot:thingName} --entries thingName=CI_GreenGrass_Thing
+        aws greengrassv2 batch-disassociate-client-device-from-core-device --core-device-thing-name {iot:thingName} --entries thingName=CI_Greengrass_Discovery_Thing
       Recover: |
         echo "Recover step"
-        aws greengrassv2 batch-disassociate-client-device-from-core-device --core-device-thing-name {iot:thingName} --entries thingName=CI_GreenGrass_Thing
+        aws greengrassv2 batch-disassociate-client-device-from-core-device --core-device-thing-name {iot:thingName} --entries thingName=CI_Greengrass_Discovery_Thing