From 23a5941867bc096704f468bfb02767be93bc9e47 Mon Sep 17 00:00:00 2001 From: Nitin Yadav Date: Wed, 21 Feb 2024 18:36:08 +1100 Subject: [PATCH] Updated lab 'developing-with-node-js-getting-started' & SSO integration --- .../assignment.md | 17 ++++++++ .../check-rhd-login-3882383 | 41 +++++++++++++++++++ .../assignment.md | 0 .../assignment.md | 6 +-- .../setup-crc | 0 .../track.yml | 3 +- 6 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 instruqt-tracks/developing-with-node-js-getting-started/02-join-red-hat-developer-portal/assignment.md create mode 100644 instruqt-tracks/developing-with-node-js-getting-started/02-join-red-hat-developer-portal/check-rhd-login-3882383 rename instruqt-tracks/developing-with-node-js-getting-started/{02-add-health-checks => 03-add-health-checks}/assignment.md (100%) mode change 100755 => 100644 rename instruqt-tracks/developing-with-node-js-getting-started/{03-deploy-to-openshift => 04-deploy-to-openshift}/assignment.md (98%) mode change 100755 => 100644 rename instruqt-tracks/developing-with-node-js-getting-started/{03-deploy-to-openshift => 04-deploy-to-openshift}/setup-crc (100%) diff --git a/instruqt-tracks/developing-with-node-js-getting-started/02-join-red-hat-developer-portal/assignment.md b/instruqt-tracks/developing-with-node-js-getting-started/02-join-red-hat-developer-portal/assignment.md new file mode 100644 index 00000000..aaefeed0 --- /dev/null +++ b/instruqt-tracks/developing-with-node-js-getting-started/02-join-red-hat-developer-portal/assignment.md @@ -0,0 +1,17 @@ +--- +slug: join-red-hat-developer-portal +id: 8a9yjzz0uyvc +type: challenge +title: Join Red Hat Developer at no cost +teaser: Join Red Hat Developer at no cost +tabs: +- title: Red Hat Login + type: browser + hostname: rhd-login-3882383 +difficulty: "" +--- +Before you proceed with the next challenge, please take a moment to register for Red Hat Developer. If you already have a Red Hat account, you can use the same login credentials. + +This will help us assess user satisfaction and enable us to provide more curated content. + +Click on the `Check` button at the bottom once you have registered or logged in. diff --git a/instruqt-tracks/developing-with-node-js-getting-started/02-join-red-hat-developer-portal/check-rhd-login-3882383 b/instruqt-tracks/developing-with-node-js-getting-started/02-join-red-hat-developer-portal/check-rhd-login-3882383 new file mode 100644 index 00000000..53051468 --- /dev/null +++ b/instruqt-tracks/developing-with-node-js-getting-started/02-join-red-hat-developer-portal/check-rhd-login-3882383 @@ -0,0 +1,41 @@ +#!/bin/bash +set -euxo pipefail +echo 'logincheck' +if [ "${LOGGEDIN-0}" = "1" ]; then + echo 'loggedin' + exit 0 +fi + +rm -f /home/user/checkResult.json +rm -f /home/user/checkAssets.json +rm -f /home/user/checkError.txt + + +echo 'dropdown check' +echo '{"location":{"conditions":[{"url":"redhat.com","condition":"contains"}]},"innerText":[{"selector":"html \u003e body","value":"Please click on Check button in the bottom right of your screen to continue with the Lab."}]}' > /home/user/checkAssets.json +until [ -f /home/user/checkResult.json ]; do + sleep 1 +done +if grep "SUCCESS" /home/user/checkResult.json; then + echo 'account dropdown' + exit 0 +fi + + +rm -f /home/user/checkResult.json +rm -f /home/user/checkAssets.json +rm -f /home/user/checkError.txt + + +echo 'email check' +echo '{"location":{"conditions":[]},"innerText":[{"selector":"html \u003e body","value":"Email address verification"}]}' > /home/user/checkAssets.json +until [ -f /home/user/checkResult.json ]; do + sleep 1 +done +cat /home/user/checkResult.json +if grep "SUCCESS" /home/user/checkResult.json; then + echo 'email validation' + exit 0 +fi +fail-message "Please login and click 'Check' button." +exit 1 \ No newline at end of file diff --git a/instruqt-tracks/developing-with-node-js-getting-started/02-add-health-checks/assignment.md b/instruqt-tracks/developing-with-node-js-getting-started/03-add-health-checks/assignment.md old mode 100755 new mode 100644 similarity index 100% rename from instruqt-tracks/developing-with-node-js-getting-started/02-add-health-checks/assignment.md rename to instruqt-tracks/developing-with-node-js-getting-started/03-add-health-checks/assignment.md diff --git a/instruqt-tracks/developing-with-node-js-getting-started/03-deploy-to-openshift/assignment.md b/instruqt-tracks/developing-with-node-js-getting-started/04-deploy-to-openshift/assignment.md old mode 100755 new mode 100644 similarity index 98% rename from instruqt-tracks/developing-with-node-js-getting-started/03-deploy-to-openshift/assignment.md rename to instruqt-tracks/developing-with-node-js-getting-started/04-deploy-to-openshift/assignment.md index 7accdcf7..74df154a --- a/instruqt-tracks/developing-with-node-js-getting-started/03-deploy-to-openshift/assignment.md +++ b/instruqt-tracks/developing-with-node-js-getting-started/04-deploy-to-openshift/assignment.md @@ -33,12 +33,12 @@ Now that we have the Application built, let's move it onto the cloud. When you go get to the **OpenShift Web Console** you'll be presented with a login page as shown in the figure below. -![Web Console](../assets/web-console-login.png) +![Web Console](..\assets\web-console-login.png) |NOTE:| |----| |You might see the following warning notification due to using an untrusted security certificate. -![Security warning](../assets/security_warning.png) +![Security warning](..\assets\security_warning.png) If you do get the warning, click the **Advanced** button to complete the process necessary to grant permission to the browser to access the OpenShift Web Console.| ---- @@ -165,7 +165,7 @@ The application is now deployed and running in OpenShift. You can now view it in `Step 8b:` Click the **Topology** tab on the left side of the web console as shown in the figure below: -![Show Application in Topology view](../assets/show_app_in_topology_nodejs.png) +![Show Application in Topology view](..\assets\show_app_in_topology_nodejs.png) `Step 8c:` Click the **nodejs** link in the Topology view's Project page as shown in the figure above. A circular graphic will appear. This graphic represents the Getting Started application. diff --git a/instruqt-tracks/developing-with-node-js-getting-started/03-deploy-to-openshift/setup-crc b/instruqt-tracks/developing-with-node-js-getting-started/04-deploy-to-openshift/setup-crc similarity index 100% rename from instruqt-tracks/developing-with-node-js-getting-started/03-deploy-to-openshift/setup-crc rename to instruqt-tracks/developing-with-node-js-getting-started/04-deploy-to-openshift/setup-crc diff --git a/instruqt-tracks/developing-with-node-js-getting-started/track.yml b/instruqt-tracks/developing-with-node-js-getting-started/track.yml index 6faaeeb8..59b94fbc 100755 --- a/instruqt-tracks/developing-with-node-js-getting-started/track.yml +++ b/instruqt-tracks/developing-with-node-js-getting-started/track.yml @@ -38,5 +38,6 @@ lab_config: overlay: false width: 33 position: right + feedback_recap_enabled: true loadingMessages: true -checksum: "4512786651972409672" +checksum: "4667502928136814051"