From fbb0d3211275713a6144adad23bc82efcc4dd671 Mon Sep 17 00:00:00 2001 From: Steve Kim <86316075+sbSteveK@users.noreply.github.com> Date: Tue, 23 Jan 2024 10:22:57 -0800 Subject: [PATCH] readme fixes (#530) * sample readme fixes * add verbosity.txt asset file check to android sample --- samples/Android/README.md | 1 + .../java/software/amazon/awssdk/iotsamples/MainActivity.java | 3 ++- samples/Pkcs12Connect/README.md | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/samples/Android/README.md b/samples/Android/README.md index aa016567b..e10a0455e 100644 --- a/samples/Android/README.md +++ b/samples/Android/README.md @@ -49,6 +49,7 @@ files linked below. * `rootca.pem` - override the default system trust store * `clientId.txt` - specifies --clientId CLI argument * `port.txt` - specifies --port CLI argument +* `verbosity.txt` - specifies --verbosity CLI argument # Build and install sample app diff --git a/samples/Android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.java b/samples/Android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.java index 15b01911f..ced03dc7f 100644 --- a/samples/Android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.java +++ b/samples/Android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.java @@ -151,6 +151,7 @@ private void loadAssets(){ resourceNames.add("message.txt"); resourceNames.add("thingName.txt"); resourceNames.add("rootca.pem"); + resourceNames.add("verbosity.txt"); // Copy to cache and store file locations for file assets and contents for .txt assets for (String resourceName : resourceNames) { @@ -291,7 +292,7 @@ private void runSample(String sampleName, String sampleClassName){ onSampleComplete(); return; } - new Thread(new SampleRunnable(sampleArgs(sampleClassName), main), "sample_runner").start(); + new Thread(new SampleRunnable(args, main), "sample_runner").start(); } } catch (Exception e) { writeToConsole("Exception encountered: " + e.toString()); diff --git a/samples/Pkcs12Connect/README.md b/samples/Pkcs12Connect/README.md index e6e8c804b..3e3a007f3 100644 --- a/samples/Pkcs12Connect/README.md +++ b/samples/Pkcs12Connect/README.md @@ -40,13 +40,13 @@ Note that in a real application, you may want to avoid the use of wildcards in y To run the PKCS12 connect use the following command: ```sh -mvn compile exec:java -pl samples/Pkcs12Connect -Dexec.mainClass=pkcs12connect.Pkcs12Connect -Dexec.args="--endpoint --pkcs12_file --pkcs12_file " +mvn compile exec:java -pl samples/Pkcs12Connect -Dexec.mainClass=pkcs12connect.Pkcs12Connect -Dexec.args="--endpoint --pkcs12_file --pkcs12_password " ``` You can also pass a Certificate Authority file (CA) if your certificate and key combination requires it: ```sh -mvn compile exec:java -pl samples/Pkcs12Connect -Dexec.mainClass=pkcs12connect.Pkcs12Connect -Dexec.args="--endpoint --pkcs12_file --pkcs12_file --ca_file " +mvn compile exec:java -pl samples/Pkcs12Connect -Dexec.mainClass=pkcs12connect.Pkcs12Connect -Dexec.args="--endpoint --pkcs12_file --pkcs12_password --ca_file " ``` ### How to setup and run