Skip to content

Commit

Permalink
Formatted python files from the balck formatter
Browse files Browse the repository at this point in the history 
Signed-off-by: hansinikarunarathne <107214435+hansinikarunarathne@users.noreply.github.com>
  • Loading branch information
@hansinikarunarathne
hansinikarunarathne committed Jun 28, 2024
1 parent d4272b9 commit e004a46
Show file tree
Hide file tree
Showing 9 changed files with 1,142 additions and 951 deletions.
413 changes: 209 additions & 204 deletions apps/kfp-tekton/upstream/base/installs/multi-user/pipelines-profile-controller/sync.py
View file

Large diffs are not rendered by default.

209 changes: 122 additions & 87 deletions apps/kfp-tekton/upstream/base/installs/multi-user/pipelines-profile-controller/test_sync.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
DATA_INCORRECT_CHILDREN = {
"parent": {
"metadata": {
"labels": {
"pipelines.kubeflow.org/enabled": "true"
},
"name": "myName"
"labels": {"pipelines.kubeflow.org/enabled": "true"},
"name": "myName",
}
},
"children": {
Expand All @@ -24,16 +22,14 @@
"Service.v1": [],
"DestinationRule.networking.istio.io/v1alpha3": [],
"AuthorizationPolicy.security.istio.io/v1beta1": [],
}
},
}

DATA_CORRECT_CHILDREN = {
"parent": {
"metadata": {
"labels": {
"pipelines.kubeflow.org/enabled": "true"
},
"name": "myName"
"labels": {"pipelines.kubeflow.org/enabled": "true"},
"name": "myName",
}
},
"children": {
Expand All @@ -43,7 +39,7 @@
"Service.v1": [1, 1],
"DestinationRule.networking.istio.io/v1alpha3": [1],
"AuthorizationPolicy.security.istio.io/v1beta1": [1],
}
},
}

DATA_MISSING_PIPELINE_ENABLED = {"parent": {}, "children": {}}
Expand All @@ -70,34 +66,38 @@
"CONTROLLER_PORT": "0", # HTTPServer randomly assigns the port to a free port
}

ENV_KFP_VERSION_ONLY = dict(ENV_VARIABLES_BASE,
**{
"KFP_VERSION": KFP_VERSION,
}
)

ENV_IMAGES_NO_TAGS = dict(ENV_VARIABLES_BASE,
**{
"KFP_VERSION": KFP_VERSION,
"VISUALIZATION_SERVER_IMAGE": VISUALIZATION_SERVER_IMAGE,
"FRONTEND_IMAGE": FRONTEND_IMAGE,
}
)

ENV_IMAGES_WITH_TAGS = dict(ENV_VARIABLES_BASE,
**{
"VISUALIZATION_SERVER_IMAGE": VISUALIZATION_SERVER_IMAGE,
"FRONTEND_IMAGE": FRONTEND_IMAGE,
"VISUALIZATION_SERVER_TAG": VISUALIZATION_SERVER_TAG,
"FRONTEND_TAG": FRONTEND_TAG,
}
)

ENV_IMAGES_WITH_TAGS_AND_ISTIO = dict(ENV_IMAGES_WITH_TAGS,
**{
"DISABLE_ISTIO_SIDECAR": "false",
}
)
ENV_KFP_VERSION_ONLY = dict(
ENV_VARIABLES_BASE,
**{
"KFP_VERSION": KFP_VERSION,
},
)

ENV_IMAGES_NO_TAGS = dict(
ENV_VARIABLES_BASE,
**{
"KFP_VERSION": KFP_VERSION,
"VISUALIZATION_SERVER_IMAGE": VISUALIZATION_SERVER_IMAGE,
"FRONTEND_IMAGE": FRONTEND_IMAGE,
},
)

ENV_IMAGES_WITH_TAGS = dict(
ENV_VARIABLES_BASE,
**{
"VISUALIZATION_SERVER_IMAGE": VISUALIZATION_SERVER_IMAGE,
"FRONTEND_IMAGE": FRONTEND_IMAGE,
"VISUALIZATION_SERVER_TAG": VISUALIZATION_SERVER_TAG,
"FRONTEND_TAG": FRONTEND_TAG,
},
)

ENV_IMAGES_WITH_TAGS_AND_ISTIO = dict(
ENV_IMAGES_WITH_TAGS,
**{
"DISABLE_ISTIO_SIDECAR": "false",
},
)


def generate_image_name(imagename, tag):
Expand Down Expand Up @@ -154,40 +154,57 @@ def sync_server_from_arguments(request):
"sync_server, data, expected_status, expected_visualization_server_image, expected_frontend_server_image",
[
(
ENV_KFP_VERSION_ONLY,
DATA_INCORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "False"},
generate_image_name(DEFAULT_VISUALIZATION_IMAGE, KFP_VERSION),
generate_image_name(DEFAULT_FRONTEND_IMAGE, KFP_VERSION),
ENV_KFP_VERSION_ONLY,
DATA_INCORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "False"},
generate_image_name(DEFAULT_VISUALIZATION_IMAGE, KFP_VERSION),
generate_image_name(DEFAULT_FRONTEND_IMAGE, KFP_VERSION),
),
(
ENV_IMAGES_NO_TAGS,
DATA_INCORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "False"},
generate_image_name(ENV_IMAGES_NO_TAGS["VISUALIZATION_SERVER_IMAGE"], KFP_VERSION),
generate_image_name(ENV_IMAGES_NO_TAGS["FRONTEND_IMAGE"], KFP_VERSION),
ENV_IMAGES_NO_TAGS,
DATA_INCORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "False"},
generate_image_name(
ENV_IMAGES_NO_TAGS["VISUALIZATION_SERVER_IMAGE"], KFP_VERSION
),
generate_image_name(ENV_IMAGES_NO_TAGS["FRONTEND_IMAGE"], KFP_VERSION),
),
(
ENV_IMAGES_WITH_TAGS,
DATA_INCORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "False"},
generate_image_name(ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_IMAGE"],
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_TAG"]),
generate_image_name(ENV_IMAGES_WITH_TAGS["FRONTEND_IMAGE"], ENV_IMAGES_WITH_TAGS["FRONTEND_TAG"]),
ENV_IMAGES_WITH_TAGS,
DATA_INCORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "False"},
generate_image_name(
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_IMAGE"],
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_TAG"],
),
generate_image_name(
ENV_IMAGES_WITH_TAGS["FRONTEND_IMAGE"],
ENV_IMAGES_WITH_TAGS["FRONTEND_TAG"],
),
),
(
ENV_IMAGES_WITH_TAGS,
DATA_CORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "True"},
generate_image_name(ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_IMAGE"],
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_TAG"]),
generate_image_name(ENV_IMAGES_WITH_TAGS["FRONTEND_IMAGE"], ENV_IMAGES_WITH_TAGS["FRONTEND_TAG"]),
ENV_IMAGES_WITH_TAGS,
DATA_CORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "True"},
generate_image_name(
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_IMAGE"],
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_TAG"],
),
generate_image_name(
ENV_IMAGES_WITH_TAGS["FRONTEND_IMAGE"],
ENV_IMAGES_WITH_TAGS["FRONTEND_TAG"],
),
),
],
indirect=["sync_server"]
indirect=["sync_server"],
)
def test_sync_server_with_pipeline_enabled(sync_server, data, expected_status,
expected_visualization_server_image, expected_frontend_server_image):
def test_sync_server_with_pipeline_enabled(
sync_server,
data,
expected_status,
expected_visualization_server_image,
expected_frontend_server_image,
):
"""
Nearly end-to-end test of how Controller serves .sync as a POST
Expand All @@ -207,33 +224,46 @@ def test_sync_server_with_pipeline_enabled(sync_server, data, expected_status,
results = json.loads(x.text)

# Test overall status of whether children are ok
assert results['status'] == expected_status
assert results["status"] == expected_status

# Poke a few children to test things that can vary by environment variable
assert results['children'][1]["spec"]["template"]["spec"]["containers"][0][
"image"] == expected_visualization_server_image
assert results['children'][5]["spec"]["template"]["spec"]["containers"][0][
"image"] == expected_frontend_server_image
assert (
results["children"][1]["spec"]["template"]["spec"]["containers"][0]["image"]
== expected_visualization_server_image
)
assert (
results["children"][5]["spec"]["template"]["spec"]["containers"][0]["image"]
== expected_frontend_server_image
)


@pytest.mark.parametrize(
"sync_server_from_arguments, data, expected_status, expected_visualization_server_image, "
"expected_frontend_server_image",
[
(
ENV_IMAGES_WITH_TAGS_AND_ISTIO,
DATA_CORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "True"},
generate_image_name(ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_IMAGE"],
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_TAG"]),
generate_image_name(ENV_IMAGES_WITH_TAGS["FRONTEND_IMAGE"], ENV_IMAGES_WITH_TAGS["FRONTEND_TAG"]),
ENV_IMAGES_WITH_TAGS_AND_ISTIO,
DATA_CORRECT_CHILDREN,
{"kubeflow-pipelines-ready": "True"},
generate_image_name(
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_IMAGE"],
ENV_IMAGES_WITH_TAGS["VISUALIZATION_SERVER_TAG"],
),
generate_image_name(
ENV_IMAGES_WITH_TAGS["FRONTEND_IMAGE"],
ENV_IMAGES_WITH_TAGS["FRONTEND_TAG"],
),
),
],
indirect=["sync_server_from_arguments"]
indirect=["sync_server_from_arguments"],
)
def test_sync_server_with_direct_passing_of_settings(
sync_server_from_arguments, data, expected_status, expected_visualization_server_image,
expected_frontend_server_image):
sync_server_from_arguments,
data,
expected_status,
expected_visualization_server_image,
expected_frontend_server_image,
):
"""
Nearly end-to-end test of how Controller serves .sync as a POST, taking variables as arguments
Expand All @@ -250,24 +280,29 @@ def test_sync_server_with_direct_passing_of_settings(
results = json.loads(x.text)

# Test overall status of whether children are ok
assert results['status'] == expected_status
assert results["status"] == expected_status

# Poke a few children to test things that can vary by environment variable
assert results['children'][1]["spec"]["template"]["spec"]["containers"][0][
"image"] == expected_visualization_server_image
assert results['children'][5]["spec"]["template"]["spec"]["containers"][0][
"image"] == expected_frontend_server_image
assert (
results["children"][1]["spec"]["template"]["spec"]["containers"][0]["image"]
== expected_visualization_server_image
)
assert (
results["children"][5]["spec"]["template"]["spec"]["containers"][0]["image"]
== expected_frontend_server_image
)


@pytest.mark.parametrize(
"sync_server, data, expected_status, expected_children",
[
(ENV_IMAGES_WITH_TAGS, DATA_MISSING_PIPELINE_ENABLED, {}, []),
],
indirect=["sync_server"]
indirect=["sync_server"],
)
def test_sync_server_without_pipeline_enabled(sync_server, data, expected_status,
expected_children):
def test_sync_server_without_pipeline_enabled(
sync_server, data, expected_status, expected_children
):
"""
Nearly end-to-end test of how Controller serves .sync as a POST
Expand All @@ -282,5 +317,5 @@ def test_sync_server_without_pipeline_enabled(sync_server, data, expected_status
results = json.loads(x.text)

# Test overall status of whether children are ok
assert results['status'] == expected_status
assert results['children'] == expected_children
assert results["status"] == expected_status
assert results["children"] == expected_children
Loading

0 comments on commit e004a46

Please sign in to comment.