Skip to content

Rename image src to path and have src as the original value from the … #629

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

Merged
merged 4 commits into from
Sep 14, 2020
Merged

Rename image src to path and have src as the original value from the … #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
837bead
Rename image src to path and have src as the original value from the …
ruflin Aug 27, 2020
46fc58c
update changelog
ruflin Aug 27, 2020
b063322
add property and remove my name
ruflin Sep 3, 2020
a3099c6
fix changelog
ruflin Sep 14, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Rename version to service.version in index handler. [#633](https://github.com/elastic/package-registry/pull/633)
* Remove config `public_dir` which is replaced by `package_paths`. [#632](https://github.com/elastic/package-registry/pull/632)
* Ship packages as zip instead of tar.gz [#628](https://github.com/elastic/package-registry/pull/628)
* Rename image src to path and have src as the original value from the manifest. [#629](https://github.com/elastic/package-registry/pull/629)

### Bugfixes

Expand Down
5 changes: 2 additions & 3 deletions openapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ info:
name: Elastic-License
url: 'https://github.com/elastic/package-registry/blob/master/LICENSE.txt'
description: Elastic Package Registry
contact:
name: Nicolas Ruflin
email: spam@ruflin.com
servers:
- url: 'https://epr.elastic.co'
description: public
Expand Down Expand Up @@ -146,6 +143,8 @@ components:
title: Image
type: object
properties:
path:
type: string
src:
type: string
title:
Expand Down
6 changes: 4 additions & 2 deletions testdata/generated/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
},
"screenshots": [
{
"src": "/package/example/1.0.0/img/kibana-iptables.png",
"src": "/img/kibana-iptables.png",
"path": "/package/example/1.0.0/img/kibana-iptables.png",
"title": "IP Tables Overview dashboard",
"size": "1492x1382"
},
{
"src": "/package/example/1.0.0/img/kibana-iptables-ubiquity.png",
"src": "/img/kibana-iptables-ubiquity.png",
"path": "/package/example/1.0.0/img/kibana-iptables-ubiquity.png",
"title": "IP Tables Ubiquity Dashboard",
"size": "1492x1464",
"type": "image/png"
Expand Down
6 changes: 4 additions & 2 deletions testdata/generated/package/example/1.0.0/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
},
"screenshots": [
{
"src": "/package/example/1.0.0/img/kibana-iptables.png",
"src": "/img/kibana-iptables.png",
"path": "/package/example/1.0.0/img/kibana-iptables.png",
"title": "IP Tables Overview dashboard",
"size": "1492x1382"
},
{
"src": "/package/example/1.0.0/img/kibana-iptables-ubiquity.png",
"src": "/img/kibana-iptables-ubiquity.png",
"path": "/package/example/1.0.0/img/kibana-iptables-ubiquity.png",
"title": "IP Tables Ubiquity Dashboard",
"size": "1492x1464",
"type": "image/png"
Expand Down
3 changes: 2 additions & 1 deletion testdata/generated/package/longdocs/1.0.4/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"path": "/package/longdocs/1.0.4",
"icons": [
{
"src": "/package/longdocs/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/longdocs/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
],
Expand Down
3 changes: 2 additions & 1 deletion testdata/generated/package/metricsonly/2.0.1/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"path": "/package/metricsonly/2.0.1",
"icons": [
{
"src": "/package/metricsonly/2.0.1/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/metricsonly/2.0.1/img/icon.svg",
"type": "image/svg+xml"
}
],
Expand Down
3 changes: 2 additions & 1 deletion testdata/generated/package/multiversion/1.0.3/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"path": "/package/multiversion/1.0.3",
"icons": [
{
"src": "/package/multiversion/1.0.3/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.0.3/img/icon.svg",
"type": "image/svg+xml"
}
],
Expand Down
3 changes: 2 additions & 1 deletion testdata/generated/package/multiversion/1.0.4/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"path": "/package/multiversion/1.0.4",
"icons": [
{
"src": "/package/multiversion/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
],
Expand Down
3 changes: 2 additions & 1 deletion testdata/generated/package/multiversion/1.1.0/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"path": "/package/multiversion/1.1.0",
"icons": [
{
"src": "/package/multiversion/1.1.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.1.0/img/icon.svg",
"type": "image/svg+xml"
}
],
Expand Down
3 changes: 2 additions & 1 deletion testdata/generated/package/reference/1.0.0/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"path": "/package/reference/1.0.0",
"icons": [
{
"src": "/package/reference/1.0.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/reference/1.0.0/img/icon.svg",
"size": "32x32",
"type": "image/svg+xml"
}
Expand Down
18 changes: 12 additions & 6 deletions testdata/generated/search-all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
"path": "/package/longdocs/1.0.4",
"icons": [
{
"src": "/package/longdocs/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/longdocs/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -86,7 +87,8 @@
"path": "/package/metricsonly/2.0.1",
"icons": [
{
"src": "/package/metricsonly/2.0.1/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/metricsonly/2.0.1/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -112,7 +114,8 @@
"path": "/package/multiversion/1.0.3",
"icons": [
{
"src": "/package/multiversion/1.0.3/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.0.3/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -128,7 +131,8 @@
"path": "/package/multiversion/1.0.4",
"icons": [
{
"src": "/package/multiversion/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -144,7 +148,8 @@
"path": "/package/multiversion/1.1.0",
"icons": [
{
"src": "/package/multiversion/1.1.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.1.0/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -170,7 +175,8 @@
"path": "/package/reference/1.0.0",
"icons": [
{
"src": "/package/reference/1.0.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/reference/1.0.0/img/icon.svg",
"size": "32x32",
"type": "image/svg+xml"
}
Expand Down
12 changes: 8 additions & 4 deletions testdata/generated/search-category-custom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"path": "/package/longdocs/1.0.4",
"icons": [
{
"src": "/package/longdocs/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/longdocs/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -46,7 +47,8 @@
"path": "/package/metricsonly/2.0.1",
"icons": [
{
"src": "/package/metricsonly/2.0.1/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/metricsonly/2.0.1/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -72,7 +74,8 @@
"path": "/package/multiversion/1.1.0",
"icons": [
{
"src": "/package/multiversion/1.1.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.1.0/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -98,7 +101,8 @@
"path": "/package/reference/1.0.0",
"icons": [
{
"src": "/package/reference/1.0.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/reference/1.0.0/img/icon.svg",
"size": "32x32",
"type": "image/svg+xml"
}
Expand Down
9 changes: 6 additions & 3 deletions testdata/generated/search-category-web.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"path": "/package/longdocs/1.0.4",
"icons": [
{
"src": "/package/longdocs/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/longdocs/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -36,7 +37,8 @@
"path": "/package/multiversion/1.1.0",
"icons": [
{
"src": "/package/multiversion/1.1.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.1.0/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -52,7 +54,8 @@
"path": "/package/reference/1.0.0",
"icons": [
{
"src": "/package/reference/1.0.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/reference/1.0.0/img/icon.svg",
"size": "32x32",
"type": "image/svg+xml"
}
Expand Down
3 changes: 2 additions & 1 deletion testdata/generated/search-kibana652.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
"path": "/package/metricsonly/2.0.1",
"icons": [
{
"src": "/package/metricsonly/2.0.1/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/metricsonly/2.0.1/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand Down
12 changes: 8 additions & 4 deletions testdata/generated/search-kibana721.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
"path": "/package/longdocs/1.0.4",
"icons": [
{
"src": "/package/longdocs/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/longdocs/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -76,7 +77,8 @@
"path": "/package/metricsonly/2.0.1",
"icons": [
{
"src": "/package/metricsonly/2.0.1/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/metricsonly/2.0.1/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -102,7 +104,8 @@
"path": "/package/multiversion/1.1.0",
"icons": [
{
"src": "/package/multiversion/1.1.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.1.0/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -128,7 +131,8 @@
"path": "/package/reference/1.0.0",
"icons": [
{
"src": "/package/reference/1.0.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/reference/1.0.0/img/icon.svg",
"size": "32x32",
"type": "image/svg+xml"
}
Expand Down
12 changes: 8 additions & 4 deletions testdata/generated/search-package-experimental.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
"path": "/package/longdocs/1.0.4",
"icons": [
{
"src": "/package/longdocs/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/longdocs/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -86,7 +87,8 @@
"path": "/package/metricsonly/2.0.1",
"icons": [
{
"src": "/package/metricsonly/2.0.1/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/metricsonly/2.0.1/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -112,7 +114,8 @@
"path": "/package/multiversion/1.1.0",
"icons": [
{
"src": "/package/multiversion/1.1.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.1.0/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -138,7 +141,8 @@
"path": "/package/reference/1.0.0",
"icons": [
{
"src": "/package/reference/1.0.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/reference/1.0.0/img/icon.svg",
"size": "32x32",
"type": "image/svg+xml"
}
Expand Down
12 changes: 8 additions & 4 deletions testdata/generated/search-package-internal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
"path": "/package/longdocs/1.0.4",
"icons": [
{
"src": "/package/longdocs/1.0.4/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/longdocs/1.0.4/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -87,7 +88,8 @@
"path": "/package/metricsonly/2.0.1",
"icons": [
{
"src": "/package/metricsonly/2.0.1/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/metricsonly/2.0.1/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -113,7 +115,8 @@
"path": "/package/multiversion/1.1.0",
"icons": [
{
"src": "/package/multiversion/1.1.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/multiversion/1.1.0/img/icon.svg",
"type": "image/svg+xml"
}
]
Expand All @@ -139,7 +142,8 @@
"path": "/package/reference/1.0.0",
"icons": [
{
"src": "/package/reference/1.0.0/img/icon.svg",
"src": "/img/icon.svg",
"path": "/package/reference/1.0.0/img/icon.svg",
"size": "32x32",
"type": "image/svg+xml"
}
Expand Down
Loading