Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dependency on hydra binary from hydra-import module #1

Open
wants to merge 1 commit into
base: s390x-hydra-travis
Choose a base branch
from
Open

Remove dependency on hydra binary from hydra-import module #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions testsuite/docker/hydra-import/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
22 changes: 4 additions & 18 deletions testsuite/docker/hydra-import/scripts/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

4 changes: 2 additions & 2 deletions testsuite/hydra-test/arquillian.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down