blueprints: support custom ports for OCI blueprints (#5727)
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
This commit is contained in:
parent
573517bf0a
commit
554a26442d
|
@ -32,6 +32,29 @@ class TestBlueprintOCI(TransactionTestCase):
|
||||||
"foo",
|
"foo",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_successful_port(self):
|
||||||
|
"""Successful retrieval with custom port"""
|
||||||
|
with Mocker() as mocker:
|
||||||
|
mocker.get(
|
||||||
|
"https://ghcr.io:1234/v2/goauthentik/blueprints/test/manifests/latest",
|
||||||
|
json={
|
||||||
|
"layers": [
|
||||||
|
{
|
||||||
|
"mediaType": OCI_MEDIA_TYPE,
|
||||||
|
"digest": "foo",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
)
|
||||||
|
mocker.get("https://ghcr.io:1234/v2/goauthentik/blueprints/test/blobs/foo", text="foo")
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
BlueprintInstance(
|
||||||
|
path="oci://ghcr.io:1234/goauthentik/blueprints/test:latest"
|
||||||
|
).retrieve(),
|
||||||
|
"foo",
|
||||||
|
)
|
||||||
|
|
||||||
def test_manifests_error(self):
|
def test_manifests_error(self):
|
||||||
"""Test manifests request erroring"""
|
"""Test manifests request erroring"""
|
||||||
with Mocker() as mocker:
|
with Mocker() as mocker:
|
||||||
|
|
|
@ -39,11 +39,16 @@ class BlueprintOCIClient:
|
||||||
self.logger = get_logger().bind(url=self.sanitized_url)
|
self.logger = get_logger().bind(url=self.sanitized_url)
|
||||||
|
|
||||||
self.ref = "latest"
|
self.ref = "latest"
|
||||||
|
# Remove the leading slash of the path to convert it to an image name
|
||||||
path = self.url.path[1:]
|
path = self.url.path[1:]
|
||||||
if ":" in self.url.path:
|
if ":" in path:
|
||||||
|
# if there's a colon in the path, use everything after it as a ref
|
||||||
path, _, self.ref = path.partition(":")
|
path, _, self.ref = path.partition(":")
|
||||||
|
base_url = f"https://{self.url.hostname}"
|
||||||
|
if self.url.port:
|
||||||
|
base_url += f":{self.url.port}"
|
||||||
self.client = NewClient(
|
self.client = NewClient(
|
||||||
f"https://{self.url.hostname}",
|
base_url,
|
||||||
WithUserAgent(authentik_user_agent()),
|
WithUserAgent(authentik_user_agent()),
|
||||||
WithUsernamePassword(self.url.username, self.url.password),
|
WithUsernamePassword(self.url.username, self.url.password),
|
||||||
WithDefaultName(path),
|
WithDefaultName(path),
|
||||||
|
|
Reference in New Issue