Skip to content

Commit

Permalink
Remove workaround needed for self-signed S3 (#1407)
Browse files Browse the repository at this point in the history 
Since 2.8 we can specify CA bundles in DSCI
  • Loading branch information
@apodhrad
apodhrad authored Apr 26, 2024
2 parents 0964948 + 62c03d5 commit 7915318
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 51 deletions.
28 changes: 1 addition & 27 deletions ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/DataConnections.resource
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ ${DC_WORKBENCH_SELECTOR_XP}= xpath=//ul[@aria-label="Notebook select"]/li
*** Keywords ***
Create S3 Data Connection
[Documentation] Creates a S3 Data Connection from DS Project details page
... If 'aws_s3_ca_bundle' or 'S3.AWS_CA_BUNDLE' is defined then the underlying secret is patched
[Arguments] ${project_title} ${dc_name} ${aws_access_key} ${aws_secret_access}
... ${aws_s3_endpoint}=${S3.AWS_DEFAULT_ENDPOINT} ${aws_region}=${S3.AWS_DEFAULT_REGION}
... ${connected_workbench}=${NONE} ${press_cancel}=${FALSE} ${aws_bucket_name}=${NONE}
... ${aws_s3_ca_bundle}=${NONE}
Open Data Science Project Details Page project_title=${project_title} tab_id=data-connections
Wait Until Element Is Visible ${DC_ADD_BTN_1_XP} timeout=30s
Click Button ${DC_ADD_BTN_1_XP}
Expand All @@ -35,29 +33,6 @@ Create S3 Data Connection
... connected_workbench=${connected_workbench} press_cancel=${press_cancel}
... aws_bucket_name=${aws_bucket_name}
Wait Until Project Is Open project_title=${project_title}
# Check if there is any CA Bundle
# I did not find a better way to check if multi-line string is empty or "NONE"
${length}= Get Length "${aws_s3_ca_bundle}"
IF ${length} <= 6
${aws_s3_ca_bundle}= Get Variable Value ${S3.AWS_CA_BUNDLE} ${NONE}
${length}= Get Length "${aws_s3_ca_bundle}"
END
IF ${length} > 6
Patch S3 Data Connection With CA Bundle
... project_title=${project_title} dc_name=${dc_name} aws_s3_ca_bundle=${aws_s3_ca_bundle}
END

Patch S3 Data Connection With CA Bundle
[Documentation] Patch the underlying secret of S3 Data Connection With CA Bundle
[Arguments] ${project_title} ${dc_name} ${aws_s3_ca_bundle}
${dc_namespace}= Get Openshift Namespace From Data Science Project ${project_title}
${rc} ${cert}= Run And Return Rc And Output
... echo -n "${aws_s3_ca_bundle}" | base64 -w0 # robocop: disable
Should Be Equal As Strings ${rc} 0
${rc} ${out}= Run And Return Rc And Output
... oc patch secret aws-connection-${dc_name} -n ${dc_namespace} -p '[{"op": "replace", "path": "/data/AWS_CA_BUNDLE", "value" : "${cert}"}]' --type json # robocop: disable
Should Be Equal As Strings ${rc} 0
Log To Console "${out}"

Edit S3 Data Connection
[Documentation] Edits a S3 Data Connection from DS Project details page
Expand Down Expand Up @@ -162,7 +137,6 @@ Recreate S3 Data Connection
[Arguments] ${project_title} ${dc_name} ${aws_access_key} ${aws_secret_access}
... ${aws_s3_endpoint}=${S3.AWS_DEFAULT_ENDPOINT} ${aws_region}=${S3.AWS_DEFAULT_REGION}
... ${connected_workbench}=${NONE} ${press_cancel}=${FALSE} ${aws_bucket_name}=${NONE}
... ${aws_s3_ca_bundle}=${NONE}
Open Data Science Project Details Page project_title=${project_title} tab_id=data-connections
${is_exist}= Run Keyword And Return Status
... Wait Until Page Contains Element ${DC_SECTION_XP}//tr[td[@data-label="Name"]/*/div[text()="${dc_name}"]]
Expand All @@ -177,6 +151,6 @@ Recreate S3 Data Connection
Create S3 Data Connection project_title=${project_title} dc_name=${dc_name}
... aws_access_key=${aws_access_key} aws_secret_access=${aws_secret_access}
... aws_bucket_name=${aws_bucket_name} aws_region=${aws_region} press_cancel=${press_cancel}
... aws_s3_endpoint=${aws_s3_endpoint} aws_s3_ca_bundle=${aws_s3_ca_bundle}
... aws_s3_endpoint=${aws_s3_endpoint}
... connected_workbench=${connected_workbench}
END
24 changes: 0 additions & 24 deletions ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Pipelines.resource
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Create Pipeline Server # robocop: off=too-many-calls-in-keyword
... It assumes the Data Connection is aleady created
... and you wants to use defaul DB configurations [TEMPORARY]
[Arguments] ${dc_name} ${project_title}
... ${aws_s3_ca_bundle}=${NONE}
# Every 2 mins the frontend updates its cache and the client polls every 30seconds.
# So the longest you’d have to wait is 2.5 mins. Set 3 min just to make sure
Projects.Move To Tab Pipelines
Expand All @@ -39,29 +38,6 @@ Create Pipeline Server # robocop: off=too-many-calls-in-keyword
Wait Until Generic Modal Disappears
Wait Until Project Is Open project_title=${project_title}
... timeout-pre-spinner=5s timeout-spinner=60s
${is_ca_empty}= Is String Empty ${aws_s3_ca_bundle}
IF ${is_ca_empty}
${aws_s3_ca_bundle}= Get Variable Value ${S3.AWS_CA_BUNDLE} ${NONE}
END
${is_ca_empty}= Is String Empty ${aws_s3_ca_bundle}
IF not ${is_ca_empty}
Patch Pipeline Server With CA Bundle
... project_title=${project_title} aws_s3_ca_bundle=${aws_s3_ca_bundle}
END

Patch Pipeline Server With CA Bundle
[Documentation] Patch the underlying dspa resource with CA Bundle
... The CA Bundle can be obtained from S3.AWS_CA_BUNDLE in test-variables.yml
[Arguments] ${project_title} ${aws_s3_ca_bundle}
${dc_namespace}= Get Openshift Namespace From Data Science Project ${project_title}
${rc} ${out}= Run And Return Rc And Output
... oc create configmap custom-ca-bundle -n ${dc_namespace} --from-literal=ca-bundle.crt='${aws_s3_ca_bundle}' # robocop: disable
Should Be Equal As Integers ${rc} 0
Log "${out}"
${rc} ${out}= Run And Return Rc And Output
... oc patch dspa pipelines-definition -n ${dc_namespace} -p '[{"op":"add","path":"/spec/apiServer/cABundle","value":{"configMapKey":"ca-bundle.crt","configMapName":"custom-ca-bundle"}}]' --type json # robocop: disable
Should Be Equal As Integers ${rc} 0
Log "${out}"

Select Data Connection
[Documentation] Selects an existing data connection from the dropdown
Expand Down

0 comments on commit 7915318

Please sign in to comment.