From 74b85ac6677e0f0d652c4b4dc1d7609ad2ac0832 Mon Sep 17 00:00:00 2001
From: Marko Strukelj <marko.strukelj@gmail.com>
Date: Fri, 27 May 2022 16:41:03 +0200
Subject: [PATCH] Remove dependency on hydra binary from hydra-import module

Signed-off-by: Marko Strukelj <marko.strukelj@gmail.com>
---
 testsuite/docker/hydra-import/Dockerfile      |  9 +-------
 .../docker/hydra-import/scripts/start.sh      | 22 ++++---------------
 testsuite/hydra-test/arquillian.xml           |  4 ++--
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/testsuite/docker/hydra-import/Dockerfile b/testsuite/docker/hydra-import/Dockerfile
index 6d6e0f25..dbb96d15 100644
--- a/testsuite/docker/hydra-import/Dockerfile
+++ b/testsuite/docker/hydra-import/Dockerfile
@@ -1,10 +1,3 @@
 FROM alpine
 
-RUN apk add -U --no-cache bash ca-certificates curl \
-    && mkdir /tmp/hydra \
-    && cd /tmp/hydra \
-    && wget -q https://github.com/ory/hydra/releases/download/v1.0.0/hydra_1.0.0_Linux_32-bit.tar.gz \
-    && tar xvzf hydra_1.0.0_Linux_32-bit.tar.gz \
-    && cp hydra /usr/bin/ \
-    && cd \
-    && rm -rf /tmp/hydra
+RUN apk add -U --no-cache bash ca-certificates curl
diff --git a/testsuite/docker/hydra-import/scripts/start.sh b/testsuite/docker/hydra-import/scripts/start.sh
index 45b568a4..cba50c22 100755
--- a/testsuite/docker/hydra-import/scripts/start.sh
+++ b/testsuite/docker/hydra-import/scripts/start.sh
@@ -29,27 +29,13 @@ fi
 wait_for_url $URI "Waiting for Hydra admin REST to start"
 
 echo "Creating kafka-broker"
-hydra clients create \
-      --id kafka-broker \
-      --secret kafka-broker-secret \
-      --grant-types refresh_token,client_credentials \
-      --response-types token,id_token \
-      --scope openid,offline
+curl -s -X POST $URI -H "Content-Type: application/json" -d '{"client_id": "kafka-broker", "client_secret": "kafka-broker-secret", "grant_types": ["refresh_token","client_credentials"], "response_types": ["token", "id_token"], "scope": "openid,offline"}'
 
 echo "Creating kafka-producer-client"
-hydra clients create \
-      --id kafka-producer-client \
-      --secret kafka-producer-client-secret \
-      --grant-types refresh_token,client_credentials \
-      --response-types token,id_token \
-      --scope openid,offline
+curl -s -X POST $URI -H "Content-Type: application/json" -d '{"client_id": "kafka-producer-client", "client_secret": "kafka-producer-client-secret", "grant_types": ["refresh_token","client_credentials"], "response_types": ["token", "id_token"], "scope": "openid,offline"}'
 
 echo "Creating kafka-consumer-client"
-hydra clients create \
-      --id kafka-consumer-client \
-      --secret kafka-consumer-client-secret \
-      --grant-types refresh_token,client_credentials \
-      --response-types token,id_token \
-      --scope openid,offline
+curl -s -X POST $URI -H "Content-Type: application/json" -d '{"client_id": "kafka-consumer-client", "client_secret": "kafka-consumer-client-secret", "grant_types": ["refresh_token","client_credentials"], "response_types": ["token", "id_token"], "scope": "openid,offline"}'
 
+echo "Hydra import complete"
 
diff --git a/testsuite/hydra-test/arquillian.xml b/testsuite/hydra-test/arquillian.xml
index b456d535..6c20377d 100644
--- a/testsuite/hydra-test/arquillian.xml
+++ b/testsuite/hydra-test/arquillian.xml
@@ -14,7 +14,7 @@
             hydra-import:
               await:
                 strategy: log
-                match: 'OAuth 2.0 Client ID: kafka-consumer-client'
+                match: 'Hydra import complete'
                 timeout: 20
             hydra-jwt:
               await:
@@ -23,7 +23,7 @@
             hydra-jwt-import:
               await:
                 strategy: log
-                match: 'OAuth 2.0 Client ID: kafka-consumer-client'
+                match: 'Hydra import complete'
                 timeout: 20
             zookeeper:
               await: