Skip to content

Commit

Permalink
Remove localstack related files in operator e2e folder
Browse files Browse the repository at this point in the history
  • Loading branch information
cYKatherine committed Dec 12, 2023
1 parent 71232c2 commit 74c4ee4
Show file tree
Hide file tree
Showing 38 changed files with 22 additions and 796 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,19 @@ jobs:
token: ${{ secrets.GHCR_PAT }}
path: optout

- name: Checkout uid2-admin repo
uses: actions/checkout@v3
with:
repository: IABTechLab/uid2-admin
token: ${{ secrets.GHCR_PAT }}
path: admin

- name: Bring up docker compose
id: docker-compose
env:
CORE_ROOT: '../core'
OPTOUT_ROOT: '../optout'
ADMIN_ROOT: '../admin'
NGINX_ROOT: '../conf'
CORE_VERSION: ${{ inputs.core_image_version }}
OPTOUT_VERSION: ${{ inputs.optout_image_version }}
Expand Down
9 changes: 9 additions & 0 deletions e2e/docker-build-public.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ set -ex
ROOT="."
CORE_CONFIG_FILE_DIR="$ROOT/docker/uid2-core/conf"
OPTOUT_CONFIG_FILE_DIR="$ROOT/docker/uid2-optout/conf"
CORE_RESOURCE_FILE_DIR="$ROOT/docker/uid2-core/src"
OPTOUT_RESOURCE_FILE_DIR="$ROOT/docker/uid2-optout/src"
NIGINX_CONFIG_FILE_DIR="$ROOT/docker/conf"

if [ -z "$CORE_ROOT" ]; then
Expand All @@ -17,6 +19,11 @@ if [ -z "$OPTOUT_ROOT" ]; then
exit 1
fi

if [ -z "$ADMIN_ROOT" ]; then
echo "$ADMIN_ROOT can not be empty"
exit 1
fi

if [ -z "$NGINX_ROOT" ]; then
echo "$NGINX_ROOT can not be empty"
exit 1
Expand All @@ -27,10 +34,12 @@ cp "$NGINX_ROOT/nginx.conf" "$NIGINX_CONFIG_FILE_DIR"
mkdir -p "$CORE_CONFIG_FILE_DIR"
cp "$CORE_ROOT/conf/default-config.json" "$CORE_CONFIG_FILE_DIR"
cp "$CORE_ROOT/conf/local-e2e-docker-config.json" "$CORE_CONFIG_FILE_DIR"
cp "$ADMIN_ROOT/src/main/resources/localstack" "$CORE_RESOURCE_FILE_DIR"
mkdir -p "$OPTOUT_CONFIG_FILE_DIR"
cp "$OPTOUT_ROOT/conf/default-config.json" "$OPTOUT_CONFIG_FILE_DIR"
cp "$OPTOUT_ROOT/conf/local-e2e-docker-config.json" "$OPTOUT_CONFIG_FILE_DIR"
cp "$OPTOUT_ROOT/run_tool_local_e2e.sh" "$OPTOUT_CONFIG_FILE_DIR"
cp "$OPTOUT_ROOT/src/main/resources/localstack/" "$OPTOUT_RESOURCE_FILE_DIR"


CORE_CONFIG_FILE="$ROOT/docker/uid2-core/conf/local-e2e-docker-config.json"
Expand Down
9 changes: 5 additions & 4 deletions e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ services:
ports:
- "127.0.0.1:5001:5001"
volumes:
- "./docker/localstack/init-aws-optout.sh:/etc/localstack/init/ready.d/init-aws-optout.sh:ro"
- "./docker/localstack/init-aws-core.sh:/etc/localstack/init/ready.d/init-aws-core.sh:ro"
- "./docker/localstack/s3:/s3"
- "./docker/localstack/kms/seed.yaml:/init/seed.yaml"
- "./docker/uid2-core/src/init-aws.sh:/etc/localstack/init/ready.d/init-aws-core.sh:ro"
- "./docker/uid2-core/src/s3/core:/s3/core"
- "./docker/uid2-core/src/kms/seed.yaml:/init/seed.yaml"
- "./docker/uid2-optout/src/init-aws.sh:/etc/localstack/init/ready.d/init-aws-optout.sh:ro"
- "./docker/uid2-optout/src/s3/optout:/s3/optout"
environment:
- EDGE_PORT=5001
- KMS_PROVIDER=local-kms
Expand Down
7 changes: 0 additions & 7 deletions e2e/docker/localstack/init-aws-core.sh

This file was deleted.

9 changes: 0 additions & 9 deletions e2e/docker/localstack/init-aws-optout.sh

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions e2e/docker/localstack/s3/core/admin_keysets/metadata.json

This file was deleted.

49 changes: 0 additions & 49 deletions e2e/docker/localstack/s3/core/admins/admins.json

This file was deleted.

7 changes: 0 additions & 7 deletions e2e/docker/localstack/s3/core/admins/metadata.json

This file was deleted.

This file was deleted.

This file was deleted.

137 changes: 0 additions & 137 deletions e2e/docker/localstack/s3/core/clients/clients.json

This file was deleted.

7 changes: 0 additions & 7 deletions e2e/docker/localstack/s3/core/clients/metadata.json

This file was deleted.

14 changes: 0 additions & 14 deletions e2e/docker/localstack/s3/core/enclaves/enclaves.json

This file was deleted.

7 changes: 0 additions & 7 deletions e2e/docker/localstack/s3/core/enclaves/metadata.json

This file was deleted.

Loading

0 comments on commit 74c4ee4

Please sign in to comment.