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.

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

Initial File Provider Service update #2608

Open
wants to merge 3 commits into
base: integration
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,6 @@
[submodule "microservices/services/map"]
path = microservices/services/map
url = git@github.com:NationalSecurityAgency/datawave-map-service.git
[submodule "microservices/services/file-provider"]
path = microservices/services/file-provider
url = git@github.com:NationalSecurityAgency/datawave-file-provider-service.git
15 changes: 15 additions & 0 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,17 @@ Enabled via the 'dictionary', or 'full' profile.

You will need to build the docker image for this service on your local machine following the instructions in the dictionary service README.

### File Provider

Enabled via the 'file-provider', or 'full' profile.

This microservice is in development, and can be found in this repo.

[Datawave File Provider Service](https://github.com/NationalSecurityAgency/datawave-file-provider-service/tree/main) provides file management and access to Datawave and it's services.

You will need to build the docker image for this service on your local machine following the instructions in the file provider service README.


## Usage

Please read through these instructions in their entirety before attempting to build or deploy Datawave.
Expand Down Expand Up @@ -328,6 +339,10 @@ Start the default services, the kafka services, and the dictionary service:

```docker compose --profile quickstart --profile dictionary --profile kafka up -d```

Start the default services, and the file provider service:

```docker compose --profile file-provider up -d```
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would the quickstart profile need to be started beforehand in the case? Or since the file-provider might be independent of it maybe we don't need it?


Start all services:

```docker compose --profile quickstart --profile full up -d```
Expand Down
22 changes: 22 additions & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,28 @@ services:
authorization:
condition: service_healthy

file-provider:
profiles:
- file-provider
- full
image: datawave/file-provider-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,compose,remoteauth
- --spring.cloud.consul.host=consul
- --spring.cloud.consul.discovery.instance-id=$${spring.application.name}:$${random.value}
ports:
- "8280:8080"
- "8643:8443"
volumes:
- ${PKI_DIR:-./pki}:/etc/pki:ro
- ./logs:/logs
networks:
- demo
depends_on:
authorization:
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't actually depend on the authorization service. Remove.

condition: service_healthy

# If you want to test cached results, enable the cachedresults profile
mysql:
profiles:
Expand Down
1 change: 1 addition & 0 deletions microservices/services/file-provider
Submodule file-provider added at 5efa1c
11 changes: 11 additions & 0 deletions microservices/services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,17 @@
<module>dictionary</module>
</modules>
</profile>
<profile>
<id>submodule-service-file-provider</id>
<activation>
<file>
<exists>file-provider/pom.xml</exists>
</file>
</activation>
<modules>
<module>file-provider</module>
</modules>
</profile>
<profile>
<id>submodule-service-hazelcast</id>
<activation>
Expand Down
Loading