vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-20 19:38:39 +00:00
Code Issues Projects Releases Wiki Activity

add endpoint for listing repos while serving in api mode and add more metrics

Browse Source
This commit is contained in:
Markus Muellner
2023-03-20 17:14:45 +01:00
committed by Benj Fassbind
parent 0fdba29d51
commit 9c6f896666
7 changed files with 189 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
system/t12_api/metrics.py
View File

@@ -7,6 +7,35 @@ class MetricsEnabledAPITest(APITest):
"""
def check(self):
d = "libboost-program-options-dev_1.62.0.1"
r = "foo"
f = "libboost-program-options-dev_1.62.0.1_i386.deb"
self.check_equal(self.upload("/api/files/" + d, f).status_code, 200)
self.check_equal(self.post("/api/repos", json={
"Name": r,
"Comment": "test repo",
"DefaultDistribution": r,
"DefaultComponent": "main"
}).status_code, 201)
self.check_equal(self.post(f"/api/repos/{r}/file/{d}").status_code, 200)
self.check_equal(self.post("/api/publish/filesystem:apiandserve:", json={
"SourceKind": "local",
"Sources": [
{
"Component": "main",
"Name": r
}
],
"Distribution": r,
"Signing": {
"Skip": True
}
}).status_code, 201)
resp = self.get("/api/metrics")
self.check_equal(resp.status_code, 200)
@@ -27,3 +56,15 @@ class MetricsEnabledAPITest(APITest):
apiBuildInfoGauge = "# TYPE aptly_build_info gauge"
self.check_in(apiBuildInfoGauge, resp.text)
apiFilesUploadedCounter = "# TYPE aptly_api_files_uploaded_total counter"
self.check_in(apiFilesUploadedCounter, resp.text)
apiFilesUploadedCounterValue = "aptly_api_files_uploaded_total{directory=\"libboost-program-options-dev_1.62.0.1\"} 1"
self.check_in(apiFilesUploadedCounterValue, resp.text)
apiReposPackageCountGauge = "# TYPE aptly_repos_package_count gauge"
self.check_in(apiReposPackageCountGauge, resp.text)
apiReposPackageCountGaugeValue = "aptly_repos_package_count{component=\"main\",distribution=\"foo\",source=\"[foo:main]\"} 1"
self.check_in(apiReposPackageCountGaugeValue, resp.text)

47
system/t12_api/publish.py
View File

@@ -619,6 +619,51 @@ class PublishSwitchAPISkipCleanupTestRepo(APITest):
self.check_exists("public/" + prefix + "/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc")
class ServePublishedListTestRepo(APITest):
"""
GET /repos
"""
def check(self):
d = "libboost-program-options-dev_1.62.0.1"
r = "bar"
f = "libboost-program-options-dev_1.62.0.1_i386.deb"
self.check_equal(self.upload("/api/files/" + d, f).status_code, 200)
self.check_equal(self.post("/api/repos", json={
"Name": r,
"Comment": "test repo",
"DefaultDistribution": r,
"DefaultComponent": "main"
}).status_code, 201)
self.check_equal(self.post(f"/api/repos/{r}/file/{d}").status_code, 200)
self.check_equal(self.post("/api/publish/filesystem:apiandserve:", json={
"SourceKind": "local",
"Sources": [
{
"Component": "main",
"Name": r
}
],
"Distribution": r,
"Signing": {
"Skip": True
}
}).status_code, 201)
get = self.get("/repos")
expected_content_type = "text/html; charset=utf-8"
if get.headers['content-type'] != expected_content_type:
raise Exception(f"Received content-type {get.headers['content-type']} was not: {expected_content_type}")
excepted_content = b'<pre>\n<a href="apiandserve/">apiandserve</a>\n</pre>'
if excepted_content != get.content:
raise Exception(f"Expected content {excepted_content} was not: {get.content}")
class ServePublishedTestRepo(APITest):
"""
GET /repos/:storage/*pkgPath
@@ -664,7 +709,7 @@ class ServePublishedTestRepo(APITest):
raise Exception(f"Received content-type {get.headers['content-type']} not one of expected: {deb_content_types}")
if len(get.content) != 3428:
raise Exception(f"Expected file size 3428 bytes != {get.status_code} bytes")
raise Exception(f"Expected file size 3428 bytes != {len(get.content)} bytes")
class ServePublishedNotFoundTestRepo(APITest):