From 88a2d585bee23f9f7c9d5a449f31daca94e9869a Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <bernhard@intevation.de>
Date: Thu, 21 Jul 2022 16:16:16 +0200
Subject: [PATCH 1/3] Improve integration test scripts

  * Add a simple aggegator web server config.
  * Add a downloader test using a direct url from the aggregator.
---
 docs/scripts/testAggregator.sh | 17 ++++++++++++++++-
 docs/scripts/testDownloader.sh | 24 ++++++++++++++++++++----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/docs/scripts/testAggregator.sh b/docs/scripts/testAggregator.sh
index 189bbc6..13d1df0 100755
--- a/docs/scripts/testAggregator.sh
+++ b/docs/scripts/testAggregator.sh
@@ -15,5 +15,20 @@ sudo mkdir /var/csaf_aggregator
 sudo chgrp www-data /var/csaf_aggregator
 sudo chmod g+ws /var/csaf_aggregator
 
+echo
+echo '=== setup nginx to serve aggregator directory on 9443'
+
+pushd /etc/nginx/sites-enabled
+sudo cp default default2
+sudo sed -i -e 's/8443/9443/' -e 's/\(listen []:[]*443\)/#\1/' \
+    -e 's|root /var/www/html;|root /var/csaf_aggregator/html;|' \
+    default2
+sudo systemctl reload nginx
+popd
+
+echo
+echo '=== run aggregator'
+
 cd ~/csaf_distribution/
-sudo ./bin-linux-amd64/csaf_aggregator -c docs/examples/aggregator.toml
+sudo cp docs/examples/aggregator.toml /etc/csaf
+sudo ./bin-linux-amd64/csaf_aggregator -c /etc/csaf/aggregator.toml
diff --git a/docs/scripts/testDownloader.sh b/docs/scripts/testDownloader.sh
index d2df185..3153f46 100755
--- a/docs/scripts/testDownloader.sh
+++ b/docs/scripts/testDownloader.sh
@@ -10,16 +10,32 @@
 
 set -e  # to exit if a command in the script fails
 
-echo
-echo '==== run downloader'
 cd ~/csaf_distribution
 
+echo
+echo '==== run downloader (1)'
+
 mkdir ~/downloaded1
 
 ./bin-linux-amd64/csaf_downloader --directory ../downloaded1 \
   --rate 4.1 --verbose --insecure localhost
 
 echo
-echo '==== this was downloaded'
-cd ~/downloaded1
+echo '==== this was downloaded (1)'
+pushd ~/downloaded1
 find .
+popd
+
+echo
+echo '==== run downloader (2)'
+
+mkdir ~/downloaded2
+
+./bin-linux-amd64/csaf_downloader --directory ../downloaded2 \
+  --verbose --insecure https://localhost:9443/.well-known/csaf-aggregator/local-dev-provider2/provider-metatdata.json
+
+echo
+echo '==== this was downloaded (2)'
+pushd ~/downloaded2
+find .
+popd

From 35c31e9a760caf4ad16565a38d3128e350b5dbf8 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <bernhard@intevation.de>
Date: Thu, 21 Jul 2022 16:22:02 +0200
Subject: [PATCH 2/3] Improve integration test

 * Add hint that some fails are okay, while we try to setup the
   validation service.
---
 docs/scripts/setupProviderForITest.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/scripts/setupProviderForITest.sh b/docs/scripts/setupProviderForITest.sh
index 1f2a072..e7df3f4 100755
--- a/docs/scripts/setupProviderForITest.sh
+++ b/docs/scripts/setupProviderForITest.sh
@@ -113,6 +113,8 @@ popd
 set +e
 
 # Wait for the service to be started
+echo
+echo === Try to reach the validator service ten times, up to nine fails are ok
 for ((i = 1; i <= 10; i++)); do
  if [ $(curl -IL http://localhost:3000/api/v1/tests | grep -c HTTP ) != "0" ]; then
  break

From 94fe738b8c6b44c227c5e9b9ef61ea6cf3ccacd6 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <bernhard@intevation.de>
Date: Thu, 21 Jul 2022 16:25:12 +0200
Subject: [PATCH 3/3] Fix testDownloader url

---
 docs/scripts/testDownloader.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/scripts/testDownloader.sh b/docs/scripts/testDownloader.sh
index 3153f46..2fde1f2 100755
--- a/docs/scripts/testDownloader.sh
+++ b/docs/scripts/testDownloader.sh
@@ -32,7 +32,7 @@ echo '==== run downloader (2)'
 mkdir ~/downloaded2
 
 ./bin-linux-amd64/csaf_downloader --directory ../downloaded2 \
-  --verbose --insecure https://localhost:9443/.well-known/csaf-aggregator/local-dev-provider2/provider-metatdata.json
+  --verbose --insecure https://localhost:9443/.well-known/csaf-aggregator/local-dev-provider2/provider-metadata.json
 
 echo
 echo '==== this was downloaded (2)'