Skip to content

Commit bb3ddb3

Browse files
committed
Fix merge conflict in template
1 parent 9e3b738 commit bb3ddb3

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

template/v2/dirs/etc/sagemaker-ui/workflows/workflow_client.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
TIMESTAMP_FORMAT = "%Y-%m-%d %H:%M:%S.%f%z"
1111

1212

13-
1413
def _validate_response(function_name: str, response: requests.Response):
1514
if response.status_code == 200:
1615
return response
@@ -49,7 +48,6 @@ def stop_local_runner(session: requests.Session, **kwargs):
4948
return _validate_response("StopLocalRunner", response)
5049

5150

52-
<<<<<<< HEAD
5351
def check_blueprint(region: str, domain_id: str, endpoint: str, **kwargs):
5452
DZ_CLIENT = boto3.client("datazone")
5553
# add correct endpoint for gamma env
@@ -64,14 +62,6 @@ def check_blueprint(region: str, domain_id: str, endpoint: str, **kwargs):
6462
)
6563
enabled_regions = blueprint_config["enabledRegions"]
6664
print(str(region in enabled_regions))
67-
=======
68-
def check_blueprint(domain_id: str, **kwargs):
69-
try:
70-
workflow_blueprint = DZ_CLIENT.list_environment_blueprints(domainIdentifier=domain_id, name="Workflows")[
71-
"items"
72-
]
73-
print(str(bool(workflow_blueprint)))
74-
>>>>>>> main
7565
except:
7666
print("False")
7767

0 commit comments

Comments
 (0)