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

s3 and http identification #1217

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

s3 and http identification #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3485c9c
Add S3 and HTTP identification
MancunianSam Mar 5, 2025
98a9f4f
Update depdencies
MancunianSam Mar 5, 2025
5d100f5
Merge branch 'main' into s3-and-http-identification
MancunianSam Mar 5, 2025
81e1ac3
Fix checkstyle complaints
MancunianSam Mar 5, 2025
0b1738f
Merge branch 'main' into s3-and-http-identification
MancunianSam Mar 6, 2025
252d627
Add documentation for S3
MancunianSam Mar 6, 2025
f4e69fc
Refactor location parsing.
MancunianSam Mar 6, 2025
d5e1dc5
Add region for tests
MancunianSam Mar 6, 2025
78cbe73
Add test access key
MancunianSam Mar 6, 2025
12ff39e
More windows path wrangling
MancunianSam Mar 7, 2025
e3a5128
More windows path wrangling
MancunianSam Mar 7, 2025
90a8b91
Merge branch 'main' into s3-and-http-identification
MancunianSam Mar 7, 2025
c1421d3
Try using 127.0.0.1
MancunianSam Mar 7, 2025
40aa670
Merge branch 's3-and-http-identification' of https://github.com/digit…
MancunianSam Mar 7, 2025
12a1388
More windows problems
MancunianSam Mar 7, 2025
2c2d227
Fix spacing issue:
MancunianSam Mar 7, 2025
f864edf
Get the file size differently
MancunianSam Mar 10, 2025
a5cf8d6
Further attempts to get this working on Windows
MancunianSam Mar 10, 2025
6e5a42d
Add dependencies for SSO
MancunianSam Mar 10, 2025
c814842
More dependency fiddling
MancunianSam Mar 10, 2025
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ jobs:
run: mvn -V -B -DskipTests=true install -DnvdApiKey=${{ secrets.NVD_API_KEY }}
- name: Maven Test
run: mvn -B verify -DnvdApiKey=${{ secrets.NVD_API_KEY }}
env:
AWS_REGION: eu-west-2
AWS_ACCESS_KEY_ID: test
AWS_SECRET_ACCESS_KEY: test
71 changes: 63 additions & 8 deletions droid-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<ignoredUnusedDeclaredDependency>org.glassfish.jaxb:jaxb-runtime</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>javax.xml.bind:jaxb-api:jar</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
<ignoredNonTestScopedDependencies>
<nonTestScopedDependency>software.amazon.awssdk:sdk-core:jar</nonTestScopedDependency>
</ignoredNonTestScopedDependencies>
<ignoredUsedUndeclaredDependencies>
<ignoredUsedUndeclaredDependency>commons-lang:commons-lang:jar</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies>
Expand All @@ -100,7 +103,15 @@
</execution>
</executions>
</plugin>
</plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
</plugins>

<testResources>
<testResource>
Expand Down Expand Up @@ -130,10 +141,59 @@
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<version>${aws.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>regions</artifactId>
<version>${aws.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>aws-core</artifactId>
<version>${aws.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sdk-core</artifactId>
<version>${aws.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.16</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.17.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
Expand All @@ -150,10 +210,5 @@
<version>5.2.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
10 changes: 9 additions & 1 deletion droid-api/src/main/java/uk/gov/nationalarchives/droid/internal/api/ApiResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,23 @@

import uk.gov.nationalarchives.droid.core.interfaces.IdentificationMethod;

import java.net.URI;

public class ApiResult {
private final String extension;
private final IdentificationMethod method;
private final String puid;
private final String name;
private final boolean fileExtensionMismatch;
private final URI uri;

public ApiResult(String extension, IdentificationMethod method, String puid, String name, boolean fileExtensionMismatch) {
public ApiResult(String extension, IdentificationMethod method, String puid, String name, boolean fileExtensionMismatch, URI uri) {
this.extension = extension;
this.method = method;
this.puid = puid;
this.name = name;
this.fileExtensionMismatch = fileExtensionMismatch;
this.uri = uri;
}

public String getName() {
Expand All @@ -67,4 +71,8 @@ public String getExtension() {
public boolean isFileExtensionMismatch() {
return fileExtensionMismatch;
}

public URI getUri() {
return uri;
}
}
Loading
Loading