diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/consume-share/consume-share.md b/shared/adw-data-lake/use-data-sharing-data-studio/consume-share/consume-share.md
index 28320bd1..1c06984f 100644
--- a/shared/adw-data-lake/use-data-sharing-data-studio/consume-share/consume-share.md
+++ b/shared/adw-data-lake/use-data-sharing-data-studio/consume-share/consume-share.md
@@ -23,19 +23,24 @@ In this lab, you will:
## Task 1: Download the .json Configuration File
-As the **`training_recipient`**, you can use the activation link URL that was sent to you by by the **`share_provider`** via email to download the **`delta_share_profile.json`** configuration file. This file (delta profile) contains the required credentials that you need in order to connect to the data share and access the **`CUSTOMER_CONTACT_SHARE`** table in the share.
+As the **`training_recipient`**, you can use the activation link URL that was sent to you by the **`share_provider`** via email to download the **`delta_share_profile.json`** configuration file. This file (delta profile) contains the required credentials that you need in order to connect to the data share and access the **`CUSTOMER_CONTACT_SHARE`** table in the share. **Note:** In our example, you will use the second activation link that you got using the second method in the previous lab.
->**Note:** To download the `.json` file as the recipient, it doesn't matter what user you are logged in as. All you need is a web browser.
+>**Note:** _To download the `.json` file as the recipient, it doesn't matter what user you are logged in as. All you need is a web browser._
+
+
+
+
-2. Copy the activation link URL, and then paste it in your web browser's address bar. Alternatively, you can simply click the URL in the email message.
+1. Copy the activation link URL that you obtained using the second method, and then paste it in your web browser's address bar.
-3. Press **[Enter]**. The **Autonomous Database Data Sharing** page is displayed. To download the config file, click **Get Profile Information**.
+2. Press **[Enter]**. The **Autonomous Database Data Sharing** page is displayed. To download the config file, click **Get Profile Information**.
@@ -45,17 +50,17 @@ As the **`training_recipient`**, you can use the activation link URL that was se
-4. The **`delta_share_profile`.json** file is downloaded to your browser's **Downloads** directory.
+3. The **`delta_share_profile`.json** file is downloaded to your browser's **Downloads** directory.
-5. Open the downloaded file to display its content. You will need this file to connect and use the data share.
+4. Open the downloaded file to display its content. You will need this file to connect and use the data share.
## Task 2: Log in as the share_consumer User
-1. Log in as the **`share_consumer`** user. On the **Sign-in** page, enter **`share_consumer`** as the username and **`TrainingADW`** as the password, and then click **Sign in**.
+1. Log in as the **`share_consumer`** user. On the **Sign-in** page, enter **`share_consumer`** as the username and **`DataShare4ADW`** as the password, and then click **Sign in**.
2. On the **Database Actions Launchpad** page, click the **Data Studio** tab, and then click the **Data Share** tab.
@@ -192,7 +197,7 @@ You may now proceed to the next lab.
* **Author:** Lauran K. Serhal, Consulting User Assistance Developer
* **Contributor:** Alexey Filanovskiy, Senior Principal Product Manager
-* **Last Updated By/Date:** Lauran K. Serhal, April 2024
+* **Last Updated By/Date:** Lauran K. Serhal, December 2024
Data about movies in this workshop were sourced from Wikipedia.
@@ -202,4 +207,4 @@ Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled [GNU Free Documentation License](files/gnu-free-documentation-license.txt)
\ No newline at end of file
+A copy of the license is included in the section entitled [GNU Free Documentation License](https://oracle-livelabs.github.io/adb/shared/adb-15-minutes/introduction/files/gnu-free-documentation-license.txt)
\ No newline at end of file
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/consume-share/images/provider-consumer-page.png b/shared/adw-data-lake/use-data-sharing-data-studio/consume-share/images/provider-consumer-page.png
index dbcbdf15..f8dbc4fe 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/consume-share/images/provider-consumer-page.png and b/shared/adw-data-lake/use-data-sharing-data-studio/consume-share/images/provider-consumer-page.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-share/create-share.md b/shared/adw-data-lake/use-data-sharing-data-studio/create-share/create-share.md
index 38c3f37f..9aaf8918 100644
--- a/shared/adw-data-lake/use-data-sharing-data-studio/create-share/create-share.md
+++ b/shared/adw-data-lake/use-data-sharing-data-studio/create-share/create-share.md
@@ -56,7 +56,7 @@ END;
As the **`share_provider`** user, create a new data share named **`training_share`**.
-1. To create a new data share, click the **PROVIDE SHARE** tool on the Home page. Alternatively,in the Navigation pane on the left, drill-down on the **Data Share** node, and then click **Provide Share**.
+1. To create a new data share, click the **PROVIDE SHARE** tool on the Home page. Alternatively, in the Navigation pane on the left, drill-down on the **Data Share** node, and then click **Provide Share**.
@@ -70,7 +70,7 @@ As the **`share_provider`** user, create a new data share named **`training_shar
* **Name:** Enter **`training_share`**.
* **Email:** Enter the email address for the provider such as **`training_share@outlook.com`**.
- * **Description:** Enter a meaningful description of the provider (required).
+ * **Description:** Enter a meaningful description of the provider (_required_).
@@ -114,13 +114,15 @@ As the **`share_provider`** user, create a new data share named **`training_shar
-13. Click the **Email recipient profile download link** icon to email the activation link to the recipient.
+_Next, you will learn how to get the activation link that the recipient will need using two methods. In this lab, you'll use the activation link that is generated using the **second method**._
+
+13. **Method 1:** Click the **Email recipient profile download link** icon to email the activation link to the recipient.
>**Note:** You can also click the **Copy Profile activation link to clipboard** icon as a backup in case the user didn't get the email.
-14. An email message that will be sent to the recipient is automatically generated and displayed. This email message contains the _personal authorization profile_ (activation link) URL that the recipient will use to download the **`delta_share_profile.json`** configuration file. This file is required to access the data share in the next lab. In our example, we are using Microsoft Outlook as the email client. Click **Send** to send the email to the recipient.
+14. An email message that will be sent to the recipient is automatically generated and displayed. This email message contains the _personal authorization profile_ (activation link) URL that the recipient will use to download the **`delta_share_profile.json`** configuration file. This file is required to access the data share in the next lab. In our example, we are using Microsoft Outlook as the email client. Next, you would cClick **Send** to send the email to the recipient. _**Don't click the Send button. You will use the activation link generated using the second method next.**_
@@ -144,7 +146,11 @@ As the **`share_provider`** user, create a new data share named **`training_shar
-18. Log out of the **`SHARE_PROVIDER`** user. On the **Oracle Database Actions | Data Share** banner, click the drop-down list next to the `SHARE_PROVIDER` user, and then select **Sign Out** from the drop-down menu. If you are prompted to leave, click **Leave**.
+18. **Method 2:** In the **TRAINING_RECIPIENT** tile, click the **Actions** (ellipsis) icon and then select **Copy Profile Activation Link to Profile**. This is the activation link that the recipient will use. Save this activation link to a text editor of your choice as you will need it in the next lab.
+
+ 
+
+19. Log out of the **`SHARE_PROVIDER`** user. On the **Oracle Database Actions | Data Share** banner, click the drop-down list next to the `SHARE_PROVIDER` user, and then select **Sign Out** from the drop-down menu. If you are prompted to leave, click **Leave**.
You may now proceed to the next lab.
@@ -158,7 +164,7 @@ You may now proceed to the next lab.
* **Author:** Lauran K. Serhal, Consulting User Assistance Developer
* **Contributor:** Alexey Filanovskiy, Senior Principal Product Manager
-* **Last Updated By/Date:** Lauran K. Serhal, April 2024
+* **Last Updated By/Date:** Lauran K. Serhal, December 2024
Data about movies in this workshop were sourced from Wikipedia.
@@ -168,4 +174,4 @@ Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled [GNU Free Documentation License](files/gnu-free-documentation-license.txt)
+A copy of the license is included in the section entitled [GNU Free Documentation License](https://oracle-livelabs.github.io/adb/shared/adb-15-minutes/introduction/files/gnu-free-documentation-license.txt)
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/click-recipients-tile.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/click-recipients-tile.png
index 344878c7..ab2d44bf 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/click-recipients-tile.png and b/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/click-recipients-tile.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/data-share-home-page.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/data-share-home-page.png
index 0fe2ad39..febd1ecf 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/data-share-home-page.png and b/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/data-share-home-page.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/method2-activation-link.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/method2-activation-link.png
new file mode 100644
index 00000000..c33bce57
Binary files /dev/null and b/shared/adw-data-lake/use-data-sharing-data-studio/create-share/images/method2-activation-link.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/create-user-storage-credentials.md b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/create-user-storage-credentials.md
index d9bc91c3..37a606d3 100644
--- a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/create-user-storage-credentials.md
+++ b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/create-user-storage-credentials.md
@@ -25,7 +25,11 @@ In this lab, you will:
## Task 1: Navigate to the SQL Worksheet
-After you provisioned an ADB instance in the **Set up the Workshop Environment** lab, the **Autonomous Database details** page was displayed. If the page is active, start with **step 4** below. If the page had timed out, start with **step 1** below.
+
+Your green button reservation includes an ADB instance. You can find the required credentials in the **Reservation Information** dialog box for your reservation. To log in to the Console, click the **Launch OCI** button in the **Reservation Information** dialog box, and then follow the prompts to reset your assigned password. If you get a **_Forbidden_** error, make sure you select your assigned compartment from the **Compartment** drop-down list in the **List Scope** section. Your assigned compartment is listed in the **Reservation Information** dialog box.
+
+ 
+
1. Log in to the **Oracle Cloud Console**, if you are not already logged in.
@@ -34,8 +38,6 @@ After you provisioned an ADB instance in the **Set up the Workshop Environment**
3. On the **Autonomous Databases** page, click your **ADW-Data-Lake** ADB instance.
- >**Note:** If you get a _Forbidden_ message on the **Autonomous Databases** page, that indicates that you are in the wrong compartment. Refer to the **Reservation Information** panel for your reservation and make a note of your assigned compartment. Next, on the same page, click the **Compartment** drop-down list in the **Scope** section, and selected your assigned compartment.
-
4. On the **Autonomous Database details** page, click the **Database actions** drop-down list, and then click **SQL**.
@@ -187,7 +189,23 @@ You should store the data share data in Object Storage. You will then create a l
6. The new bucket is displayed on the **Buckets** page.
+
+
+
+
+
+
+ 
+
+
+7. Next, you need to get the name of the namespace (tenancy) where this new bucket was created. You will need this namespace name in this workshop. In the row for the bucket, click the **Actions** icon (ellipsis), and then select **View Object Details** from the context menu.
+
+ 
+
+ The **Bucket Details** page is displayed. The **Namespace** field displays the name of the namespace. The name is blurred for security reasons. Copy this name to your choice of text editor such as Notepad in Windows as you will need it in later steps.
+
+ 
## Task 5: (Optional) Generate an RSA Key Pair and Get the Key's Fingerprint
[](include:adb-generate-rsa-key-pair.md)
@@ -220,8 +238,9 @@ You will set up a connection to Oracle Object Storage by defining a cloud locati
+ Accept the **Select Credential** option. To access data in the Object Store, you need to enable your database user to authenticate itself with the Object Store using your OCI object store account and a credential. You do this by creating a private CREDENTIAL object for your user that stores this information encrypted in your Autonomous Data Warehouse. This information is only usable for your user schema.
+ Click **Create Credential**.
+ In the **Create Credential** dialog box, specify the following:
- + **Credential Type:** Select the **Oracle Cloud Infrastructure Signing Keys** option.
+ **Credential Name:** Enter **DELTA\_SHARE\_CREDENTIAL**. **Note:** The credential name must conform to Oracle object naming conventions, which do not allow spaces or hyphens.
+ + **Cloud Service:** Accept the **`Oracle`** default selection.
+ + **Credential Type:** Select the **Oracle Cloud Infrastructure Signing Keys** option.
+ **Fingerprint:** Enter the fingerprint for your RSA key pair that you generated and copied to a text file in the previous task.
+ **Private Key:** Paste your unencrypted private key value.
Open the private key file in a text editor, and then copy the entire content from the and _including_ **-----BEGIN PRIVATE KEY-----** line to and _including_ the **-----END PRIVATE KEY-----** line.
@@ -236,11 +255,11 @@ You will set up a connection to Oracle Object Storage by defining a cloud locati
The **Add Cloud Store Location** panel is re-displayed. The newly created credential is displayed. If you already have a bucket, select it from the **Select Bucket** drop-down list. This populates the **Bucket URI** text box; otherwise, select the **Bucket URI** option, and then enter your bucket's URI in the **Bucket URI** text box. You identified your bucket's URI in **Task 4**. Remember to use this general structure, swapping in your own values. _Remember, don't include the trailing slash after the **`/o`**; otherwise, you will get an error_.
- >**Note:** Substitute the URI value in the following code with your own bucket's URI. In our example, we replaced the actual tenancy name in the URI value with the **`namespace name`** place holder for security.
+ >**Note:** Substitute the URI value in the following code with your own bucket's URI . In our example, we replaced the actual tenancy name in the URI value with the **`namespace name`** place holder for security. Make sure you use the tenancy name for your bucket that you saved in **Task 4 > Step 7** and not the one found in the **Reservation Information** dialog box.
- `https://objectstorage.region name.oraclecloud.com/n/namespace name/b/data-share-bucket/o`
+ `https://objectstorage.region name.oraclecloud.com/n/bucket namespace name/b/data-share-bucket/o`
- In our example, we selected our **data-share-bucket** from the **Select Bucket** drop-down list.
+ In our example, we selected our **data-share-bucket** from the **Select Bucket** drop-down list. The URI is displayed in the **Bucket URI** field.
@@ -264,7 +283,7 @@ You may now proceed to the next lab.
* **Author:** Lauran K. Serhal, Consulting User Assistance Developer
* **Contributor:** Alexey Filanovskiy, Senior Principal Product Manager
-* **Last Updated By/Date:** Lauran K. Serhal, June 2024
+* **Last Updated By/Date:** Lauran K. Serhal, December 2024
Data about movies in this workshop were sourced from Wikipedia.
@@ -274,4 +293,4 @@ Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled [GNU Free Documentation License](files/gnu-free-documentation-license.txt)
+A copy of the license is included in the section entitled [GNU Free Documentation License](https://oracle-livelabs.github.io/adb/shared/adb-15-minutes/introduction/files/gnu-free-documentation-license.txt)
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/click-create-credential.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/click-create-credential.png
index cb892a4f..e761c018 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/click-create-credential.png and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/click-create-credential.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/click-new-cloud-store-location.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/click-new-cloud-store-location.png
index d60db023..90754b80 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/click-new-cloud-store-location.png and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/click-new-cloud-store-location.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/cloud-connection-created.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/cloud-connection-created.png
index d67f0b04..abfbf359 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/cloud-connection-created.png and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/cloud-connection-created.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/complete-add-cloud-store-location.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/complete-add-cloud-store-location.png
index 0cd67bf5..8617b320 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/complete-add-cloud-store-location.png and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/complete-add-cloud-store-location.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/data-load-home-page.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/data-load-home-page.png
index bb8c51cb..b069454c 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/data-load-home-page.png and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/data-load-home-page.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-bucket-created.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-bucket-created.png
new file mode 100644
index 00000000..5a98d8cf
Binary files /dev/null and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-bucket-created.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-copy-bucket-namespace.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-copy-bucket-namespace.png
new file mode 100644
index 00000000..0b96b4b8
Binary files /dev/null and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-copy-bucket-namespace.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-get-bucket-namespace.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-get-bucket-namespace.png
new file mode 100644
index 00000000..15c011dc
Binary files /dev/null and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-get-bucket-namespace.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-reservation-information.png b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-reservation-information.png
new file mode 100644
index 00000000..898c7dc2
Binary files /dev/null and b/shared/adw-data-lake/use-data-sharing-data-studio/create-user-storage-credentials/images/ll-reservation-information.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/introduction/introduction.md b/shared/adw-data-lake/use-data-sharing-data-studio/introduction/introduction.md
index eb131fe9..d54b1073 100644
--- a/shared/adw-data-lake/use-data-sharing-data-studio/introduction/introduction.md
+++ b/shared/adw-data-lake/use-data-sharing-data-studio/introduction/introduction.md
@@ -93,7 +93,7 @@ You may now proceed to the next lab.
* **Author:** Lauran K. Serhal, Consulting User Assistance Developer
* **Contributor:** Alexey Filanovskiy, Senior Product Manager
-* **Last Updated By/Date:** Lauran K. Serhal, April 2024
+* **Last Updated By/Date:** Lauran K. Serhal, December 2024
Data about movies in this workshop were sourced from Wikipedia.
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/click-breadcrumbs-link.png b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/click-breadcrumbs-link.png
index f19177db..5ddd13f8 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/click-breadcrumbs-link.png and b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/click-breadcrumbs-link.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/click-data-load-card.png b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/click-data-load-card.png
index e65b62c0..a0f66ff2 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/click-data-load-card.png and b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/click-data-load-card.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/customer-contact-load-completed.png b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/customer-contact-load-completed.png
index 13d02c0c..c39091c4 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/customer-contact-load-completed.png and b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/customer-contact-load-completed.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/customer_contact-target-table.png b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/customer_contact-target-table.png
index cab31ec4..40e09d70 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/customer_contact-target-table.png and b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/customer_contact-target-table.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/data-load-page.png b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/data-load-page.png
index 6c77830c..0cfd84b0 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/data-load-page.png and b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/images/data-load-page.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/load-os-data-public.md b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/load-os-data-public.md
index cdd18e4b..0629f702 100644
--- a/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/load-os-data-public.md
+++ b/shared/adw-data-lake/use-data-sharing-data-studio/load-os-data-public/load-os-data-public.md
@@ -65,11 +65,7 @@ In this task, you will load the **customer\_contact** data into your Autonomous
-7. Click the **Settings** icon (pencil) for the **customer\_contact** load task to view its settings.
-
- 
-
- The **Load Data from Cloud Store Location customer_contact** settings panel is displayed.
+7. Click the **Settings** icon (pencil) for the **customer\_contact** load task to view its settings. The **Load Data from Cloud Store Location customer_contact** settings panel is displayed.
8. The **Database Actions** load job will create a **`CUSTOMER_CONTACT`** table with the listed columns and data types that are based on the selected **`.csv`** file. Review the information and the loading options. In the **Mapping** section, notice that you can change the target column names, data types, and length/precision. Click **Close** to close the settings viewer panel.
@@ -117,7 +113,7 @@ You may now proceed to the next lab.
* **Author:** Lauran Serhal, Consulting User Assistance Developer
* **Contributors:** Alexey Filanovskiy, Senior Principal Product Manager
-* **Last Updated By/Date:** Lauran Serhal, April 2024
+* **Last Updated By/Date:** Lauran Serhal, December 2024
Data about movies in this workshop were sourced from Wikipedia.
@@ -127,4 +123,4 @@ Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled [GNU Free Documentation License](files/gnu-free-documentation-license.txt)
+A copy of the license is included in the section entitled [GNU Free Documentation License](https://oracle-livelabs.github.io/adb/shared/adb-15-minutes/introduction/files/gnu-free-documentation-license.txt)
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-create-screen-configure-db-new.png b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-create-screen-configure-db-new.png
new file mode 100644
index 00000000..b920c985
Binary files /dev/null and b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-create-screen-configure-db-new.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-create-screen-contact-email.png b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-create-screen-contact-email.png
new file mode 100644
index 00000000..9b3b600d
Binary files /dev/null and b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-create-screen-contact-email.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-provisioned.png b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-provisioned.png
index a762adcf..de503e4e 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-provisioned.png and b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-provisioned.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-provisioning.png b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-provisioning.png
deleted file mode 100644
index 028c40bd..00000000
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adb-provisioning.png and /dev/null differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adw-provisioning.png b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adw-provisioning.png
index 9863986c..7f511843 100644
Binary files a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adw-provisioning.png and b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/images/adw-provisioning.png differ
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/setup-workshop-environment.md b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/setup-workshop-environment.md
index a9ed7380..2e3dc388 100644
--- a/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/setup-workshop-environment.md
+++ b/shared/adw-data-lake/use-data-sharing-data-studio/setup-workshop-environment/setup-workshop-environment.md
@@ -5,11 +5,10 @@
## Introduction
-Since you are using the LiveLabs environment, you **don't** have administrative privileges to create any OCI resources; therefore, all of the OCI resources that you need in this workshop are already created for you with your LiveLabs reservation.
+Since you are using the LiveLabs environment, all of the OCI resources that you need in this workshop are already created for you with your LiveLabs reservation including an Oracle Autonomous Database instance.
If you want to review the detailed steps on how to set up the workshop environment when you are using either the **freetier** version or your own paid tenancy, see **Lab 1: Set Up the Workshop Environment** in the freetier version of the workshop on LiveLabs titled **Implement Data Sharing with ADB Data Studio**.
-> **Note:** This lab is directed at administrator users because they are granted the required access permissions. In real life scenarios, you would create a new ADW administrator user and a ADW administrator group, and then add the new administrator user to the new group. Next, you create the Oracle Cloud Infrastructure Identity and Access Management (IAM) policies that are required to create and manage an ADW and Data Catalog instances.
Estimated Time: 5 minutes
@@ -75,7 +74,7 @@ See [Signing In to the Console](https://docs.cloud.oracle.com/en-us/iaas/Content
* **Display Name:** **`ADW-Data-Lake`**.
* **Database Name:** **`TrainingADW`**.
- 
+ 
5. In the **Choose a workload type** section, accept the **Data Warehouse** default selection.
@@ -85,18 +84,21 @@ See [Signing In to the Console](https://docs.cloud.oracle.com/en-us/iaas/Content
-
-
7. In the **Configure the database** section, accept the default selections as follows:
- * **Always Free:** An Always Free database is especially useful for development and trying new features. You can deploy an Always Free instance in an Always Free account or a paid account. The only option you can specify in an Always Free database is the database version. For this lab, we recommend that you leave the **Always Free** option disabled unless you are in an Always Free account.
- * **Choose database version:** Accept the default selection.
- * **ECPU count:** **`2`**.
- * **Compute auto scaling:** Leave the checkbox checked (default).
- * **Storage (TB):** **`1`** (TB).
- * **Storage auto scaling:** Leave the checkbox unchecked (default).
+ - **Always Free**: An Always Free databases are especially useful for development and trying new features. You can deploy an Always Free instance in an Always Free account or paid account. However, it must be deployed in the home region of your tenancy. The only option you specify in an Always Free database is the database version. For this lab, we recommend you leave **Always Free** unchecked unless you are in an Always Free account.
+ - **Developer**: Developer databases provide a great low cost option for developing apps with Autonomous Database. You have similar features to Always Free - but are not limited in terms of region deployments or the number of databases in your tenancy. You can upgrade your Developer Database to a full paid version later and benefit from greater control over resources, backups and more.
+ - **Choose database version**: Select your database version from this drop-down list.
+ - **ECPU count**: Choose the number of ECPUs for your service. For this lab, specify **[](var:db_ocpu)**. If you choose an Always Free database, you do not need to specify this option.
+ - **Storage (TB)**: Select your storage capacity in terabytes. For this lab, specify **[](var:db_storage)** of storage. Or, if you choose an Always Free database, it comes with 20 GB of storage.
+ - **Compute auto scaling**: Accept the default which is enabled. This enables the system to automatically use up to three times more compute and IO resources to meet workload demand.
+ - **Storage auto scaling**: For this lab, there is no need to enable storage auto scaling, which would allow the system to expand up to three times the reserved storage.
+
+ > **Note:** You cannot scale up/down an Always Free autonomous database.
+
+ 
- 
+ >**Note:** You can click the **Show advanced options** link to use your organization's on-premise licenses with **bring your own license** or to take advantage of database consolidation savings with **elastic pools**.
8. In the **Backup retention** section, you can either accept the default value or specify your own preferred backup retention days value. Accept the default **60** days default value.
@@ -110,15 +112,15 @@ See [Signing In to the Console](https://docs.cloud.oracle.com/en-us/iaas/Content
**Important:** Make a note of this _password_ as you will need it to perform later tasks.
* **Confirm password:** Confirm your password.
- 
+ 
10. In the **Choose network access** section, select the **Secure access from everywhere** option as the access type.
-11. In the **Choose a license and Oracle Database edition** section, accept the default selection, **This Database is provisioned with License included license type**.
+11. In the **Provide contacts for operational notifications and announcements** section, do not provide a contact email address. The **Contact email** field allows you to list contacts to receive operational notices and announcements as well as unplanned maintenance notifications.
- 
+ 
12. Click __Create Autonomous Database__.
@@ -132,9 +134,9 @@ See [Signing In to the Console](https://docs.cloud.oracle.com/en-us/iaas/Content
In a few minutes, the instance status changes to **AVAILABLE**. At this point, your Autonomous Data Warehouse database instance is ready to use! Review your instance's details including its name, database version, ECPU count, and storage size.
- 
+ 
-14. Click the **Autonomous Database** link in the breadcrumbs. The **Autonomous Database** page is displayed. The new Autonomous Database instance is displayed.
+13. Click the **Autonomous Database** link in the breadcrumbs. The **Autonomous Database** page is displayed. The new Autonomous Database instance is displayed.
@@ -150,7 +152,7 @@ You may now proceed to the next lab.
## Acknowledgements
* **Author:** Lauran K. Serhal, Consulting User Assistance Developer
-* **Last Updated By/Date:** Lauran Serhal, July 2024
+* **Last Updated By/Date:** Lauran Serhal, December 2024
Data about movies in this workshop were sourced from Wikipedia.
diff --git a/shared/adw-data-lake/use-data-sharing-data-studio/workshops/livelabs/manifest.json b/shared/adw-data-lake/use-data-sharing-data-studio/workshops/livelabs/manifest.json
index 3846c5ce..b2283d08 100644
--- a/shared/adw-data-lake/use-data-sharing-data-studio/workshops/livelabs/manifest.json
+++ b/shared/adw-data-lake/use-data-sharing-data-studio/workshops/livelabs/manifest.json
@@ -10,7 +10,7 @@
"tutorials": [
{
"title": "Introduction",
- "type":"freetier",
+ "type":"livelabs",
"description": "Introduction to Oracle Cloud Infrastructure Data Catalog.",
"filename": "./../../introduction/introduction.md"
},
@@ -49,12 +49,6 @@
"description": "This lab walks you through how to load local data into your ADW instance.",
"filename": "./../../consume-share/consume-share.md"
},
- {
- "title": "Lab 6: Clean up Resources Used in this Workshop (Optional)",
- "description": "Delete the ADB instance and compartment if not needed.",
- "type": "livelabs",
- "filename": "/common/building-blocks/blocks/adb/cleanup/cleanup.md"
- },
{
"title": "Need Help?",
"description": "Solutions to Common Problems and Directions for Receiving Live Help",
diff --git a/shared/adw-data-lake/use-data-sharing-plsql/setup-workshop-environment/setup-workshop-environment.md b/shared/adw-data-lake/use-data-sharing-plsql/setup-workshop-environment/setup-workshop-environment.md
index 358598e1..9124e921 100644
--- a/shared/adw-data-lake/use-data-sharing-plsql/setup-workshop-environment/setup-workshop-environment.md
+++ b/shared/adw-data-lake/use-data-sharing-plsql/setup-workshop-environment/setup-workshop-environment.md
@@ -158,8 +158,6 @@ A Cloud Administrator can optionally create a compartment in your tenancy to hel
You may now proceed to the next lab.
-You may now proceed to the next lab.
-
## Learn More
- [Oracle Cloud Infrastructure Documentation](https://docs.cloud.oracle.com/en-us/iaas/Content/GSG/Concepts/baremetalintro.htm)
diff --git a/shared/click-provide-share.png b/shared/click-provide-share.png
deleted file mode 100644
index 1d396f8f..00000000
Binary files a/shared/click-provide-share.png and /dev/null differ