Skip to content

expireFilesMetadata: Fix delay to compare milliseconds and not seconds #422

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

expireFilesMetadata: Fix delay to compare milliseconds and not seconds #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
978163c
Fix delay to compare milliseconds and not seconds
d4nj1 Oct 13, 2022
510807a
Update pattern documentation
d4nj1 Oct 13, 2022
5d6576a
Add execution to fetch the current plugin config
d4nj1 Oct 14, 2022
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
16 changes: 13 additions & 3 deletions metadata/expireFilesMetadata/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Here is JSon File Sample:
"repositories": {
"msys2-remote": {
"delay": 1800,
"patterns": ["**/*.db", "**/*.sig"]
"patterns": ["*.db", "**/*.db", "*.sig", "**/*.sig"]
}
}
}
Expand Down Expand Up @@ -58,7 +58,7 @@ This can fix issues with MSYS2 db metadata files. Thus you need :
"repositories": {
"msys2-remote": {
"delay": 1800,
"patterns": ["**/*.db", "**/*.sig"]
"patterns": ["*.db", "**/*.db", "*.sig", "**/*.sig"]
}
}
}
Expand Down Expand Up @@ -101,9 +101,19 @@ $ curl -u admin:password -X POST -H 'Content-Type: application/json' -d '{
> "repositories": {
> "generic-remote-msys2": {
> "delay": 1800,
> "patterns": ["**/*.db", "**/*.xz*", "**/*.sig"]
> "patterns": ["*.db", "**/*.db", "*.xz*", "**/*.xz*", "*.sig", "**/*.sig"]
> }
> }
> }' 'http://localhost:8088/artifactory/api/plugins/execute/expireFilesMetadataConfig?params=action=reset'
```

getExpireFilesMetadataConfig
-------------------------

`getExpireFilesMetadataConfig` fetches the current Expire Files Metadata JSON configuration.

Example

```
$ curl -u admin:password 'http://localhost:8088/artifactory/api/plugins/execute/getExpireFilesMetadataConfig'
```
9 changes: 8 additions & 1 deletion metadata/expireFilesMetadata/expireFilesMetadata.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.artifactory.repo.RepoPath
import org.artifactory.request.Request
import org.artifactory.resource.ResourceStreamHandle

import groovy.json.JsonBuilder
import groovy.json.JsonSlurper
import groovy.transform.Field

Expand Down Expand Up @@ -58,15 +59,21 @@ executions {

config.repositories << json.repositories
}

getExpireFilesMetadataConfig(httpMethod: 'GET') {
message = new JsonBuilder(config).toPrettyString()
status = 200
}
}

download {
beforeDownloadRequest { Request request, RepoPath repoPath ->
config.repositories.each{ repoName, repoConfig ->
if (repoName == repoPath.repoKey) {
long delayMilliseconds = repoConfig.delay * 1000
repoConfig.patterns.each { pattern ->
PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + pattern);
if (isRemote(repoPath.repoKey) && isGeneric(repoPath.repoKey) && shouldExpire(repoPath, repoConfig.delay)) {
if (isRemote(repoPath.repoKey) && isGeneric(repoPath.repoKey) && shouldExpire(repoPath, delayMilliseconds)) {
if (matcher.matches(Paths.get(repoPath.path))){
log.debug "Expiring " + pattern
expired = true
Expand Down