Skip to content

Commit

Permalink
Revert "Integrate ekss (#7)"
Browse files Browse the repository at this point in the history
This reverts commit 17d1b71.
  • Loading branch information
TheByronHimes authored Jun 5, 2024
1 parent 17d1b71 commit e35fe0c
Show file tree
Hide file tree
Showing 68 changed files with 611 additions and 3,644 deletions.
1 change: 0 additions & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ services:
IRS_CONFIG_YAML: /workspace/services/irs/dev_config.yaml
PCS_CONFIG_YAML: /workspace/services/pcs/dev_config.yaml
UCS_CONFIG_YAML: /workspace/services/ucs/dev_config.yaml
EKSS_CONFIG_YAML: /workspace/services/ekss/dev_config.yaml
1 change: 0 additions & 1 deletion .github/workflows/check_config_docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
IRS_CONFIG_YAML: ./services/irs/dev_config.yaml
PCS_CONFIG_YAML: ./services/pcs/dev_config.yaml
UCS_CONFIG_YAML: ./services/ucs/dev_config.yaml
EKSS_CONFIG_YAML: ./services/ekss/dev_config.yaml

steps:
- name: Checkout repository
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/check_openapi_specs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
IRS_CONFIG_YAML: ./services/irs/dev_config.yaml
PCS_CONFIG_YAML: ./services/pcs/dev_config.yaml
UCS_CONFIG_YAML: ./services/ucs/dev_config.yaml
EKSS_CONFIG_YAML: ./services/ekss/dev_config.yaml

steps:
- name: Checkout repository
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/check_readmes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
IRS_CONFIG_YAML: ./services/irs/dev_config.yaml
PCS_CONFIG_YAML: ./services/pcs/dev_config.yaml
UCS_CONFIG_YAML: ./services/ucs/dev_config.yaml
EKSS_CONFIG_YAML: ./services/ekss/dev_config.yaml

steps:
- name: Checkout repository
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci_docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ env:
IRS_CONFIG_YAML: ./services/irs/dev_config.yaml
PCS_CONFIG_YAML: ./services/pcs/dev_config.yaml
UCS_CONFIG_YAML: ./services/ucs/dev_config.yaml
EKSS_CONFIG_YAML: ./services/ekss/dev_config.yaml

jobs:
get-changed-services:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/run_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ env:
IRS_CONFIG_YAML: ./services/irs/dev_config.yaml
PCS_CONFIG_YAML: ./services/pcs/dev_config.yaml
UCS_CONFIG_YAML: ./services/ucs/dev_config.yaml
EKSS_CONFIG_YAML: ./services/ekss/dev_config.yaml

jobs:
get-changed-services:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ repos:
- id: no-commit-to-branch
args: [--branch, dev, --branch, int, --branch, main]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.7
rev: v0.4.4
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
1 change: 0 additions & 1 deletion .pyproject_generation/pyproject_custom.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies = [
"ghga-event-schemas >= 3.1",
"hexkit[akafka,s3,mongodb] >= 3.0",
"crypt4gh>=1.6",
"hvac>=2",
]

[project.urls]
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ This is a monorepo containing all GHGA file backend microservices.

## Services:

[Encryption Key Store Sevice](services/ekss/README.md)
[Internal File Registry Service](services/ifrs/README.md)
[Interrogation Room Service](services/irs/README.md)
[Purge Controller Service](services/pcs/README.md)
[Upload Controller Service](services/ucs/README.md)
[Purge Controller Service](services/pcs/README.md)

## Development:

Expand Down
575 changes: 287 additions & 288 deletions lock/requirements-dev.txt

Large diffs are not rendered by default.

477 changes: 184 additions & 293 deletions lock/requirements.txt

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions monorepo.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,5 @@
"name": "Upload Controller",
"path": "services/ucs"
},
{
"name": "Encryption Key Store",
"path": "services/ekss"
},
]
}
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies = [
"ghga-event-schemas >= 3.1",
"hexkit[akafka,s3,mongodb] >= 3.0",
"crypt4gh>=1.6",
"hvac>=2",
]
readme = "README.md"
authors = [
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_readme_services.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def get_package_details(self) -> PackageDetails:
if "-" in service_name:
service_name, summary = service_name.split("-")
header.summary = summary.strip()
service_name = spinalcase(service_name.strip().replace(" ", ""))
service_name = spinalcase(service_name.strip())
title = titlecase(service_name)
name = PackageName(name=service_name, title=title)

Expand Down
47 changes: 0 additions & 47 deletions services/ekss/.readme_generation/README.md

This file was deleted.

53 changes: 0 additions & 53 deletions services/ekss/.readme_generation/description.md

This file was deleted.

3 changes: 0 additions & 3 deletions services/ekss/.readme_generation/design.md

This file was deleted.

Loading

0 comments on commit e35fe0c

Please sign in to comment.