Skip to content

Commit fd89c79

Browse files
authored
Merge pull request #3 from martygubar/main
Renamed md files and cleaned up config
2 parents 91f3e7e + 164175a commit fd89c79

File tree

6 files changed

+10
-62
lines changed

6 files changed

+10
-62
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ Oracle Database@Azure brings Oracle's best databases - Exadata and Autonomous Da
1313
* Deploy a new Oracle Autonomous Database
1414
* [Using the Azure Portal](https://youtu.be/QOCvRr5CfeQ)
1515
* [Using Terraform scripts](https://github.com/oci-landing-zones/terraform-oci-multicloud-azure/tree/main)
16-
* [Using the Azure CLI](azure-cli/create-adb.md)
16+
* [Using the Azure CLI](azure-cli/README.md)
1717
* Connect to your Autonomous Database
1818
* [Learn about connectivity options](https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/adbsb/connect-preparing.html)
1919
* Use these great VS Code extensions that help you develop and debug your database apps
2020
* SQL Developer for VS Code ([Learn More](https://www.oracle.com/database/sqldeveloper/vscode/) | [Marketplace](https://marketplace.visualstudio.com/items?itemName=Oracle.sql-developer))
2121
* Oracle Developer Tools for VS Code ([Learn More](https://docs.oracle.com/en/database/oracle/developer-tools-for-vscode/getting-started/gettingstarted.html) | [Marketplace](https://marketplace.visualstudio.com/items?itemName=Oracle.oracledevtools))
22-
* [Sample SQL code](./sql/sql-scripts.md)
22+
* [Sample SQL code](./sql/README.md)
2323
* Create a database user and add sample data
2424
* Work with data in Azure Storage
2525
* Get started with Select AI
File renamed without changes.

azure-cli/config

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ ADB_NAME="quickstart"
99
## NETWORKING
1010
# database
1111
VNET_NAME="dev-vnet"
12-
#VNET_PREFIX="192.168.0.0/16"
1312
VNET_PREFIX="19x.xxx.0.0/16"
1413
# subnet for the database
1514
SUBNET_NAME="dev-sn-db"
16-
#SUBNET_PREFIX="192.168.1.0/24"
1715
SUBNET_PREFIX="19x.xxx.1.0/24"
1816

1917
# client subnet
2018
SUBNET2_NAME="dev-sn-client"
21-
#SUBNET2_PREFIX="192.168.2.0/24"
2219
SUBNET2_PREFIX="19x.xxx.2.0/24"
2320

2421
#network security group
@@ -37,4 +34,5 @@ STORAGE_CONTAINER_NAME="adb-sample"
3734
## IDENTITIES
3835
# This identity will be used for your VM. The password will also be used for the database ADMIN user
3936
USER_NAME="adb"
40-
USER_PASSWORD="your-complex-password"
37+
# The password must be between 12 and 30 characters long and must include at least one uppercase letter, one lowercase letter, and one numeric character.
38+
USER_PASSWORD=""

azure-cli/deploy-adb.md

Lines changed: 0 additions & 52 deletions
This file was deleted.

sql/sql-scripts.md renamed to sql/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
Numerous SQL scripts are available to help you get started using Autonomous Database on Oracle Database@Azure
33

44
Prerequisites:
5-
* [Create an Autonomous Database](../azure-cli/create-adb.md)
5+
* [Create an Autonomous Database](../azure-cli/README.md)
66
* A VM deployed on the same VCN as Autonomous Database (or on a network that can access your Autonomous Database)
77
* Use these great VS Code extensions that help you develop and debug your database apps:
88
* SQL Developer for VS Code ([Learn More](https://www.oracle.com/database/sqldeveloper/vscode/) | [Marketplace](https://marketplace.visualstudio.com/items?itemName=Oracle.sql-developer))
99
* Oracle Developer Tools for VS Code ([Learn More](https://docs.oracle.com/en/database/oracle/developer-tools-for-vscode/getting-started/gettingstarted.html) | [Marketplace](https://marketplace.visualstudio.com/items?itemName=Oracle.oracledevtools))
1010

1111
## Connect to Autonomous Database
12-
There are [numerous client tools](../azure-cli/create-adb.md#whats-next) that you can use to start working with Autonomous Database. This includes the built-in SQL Worksheet that's part of the Database Tools (and available from the linked OCI Console) or a tool like VS Code and one an Oracle Database extension.
12+
There are [numerous client tools](../azure-cli/README.md#whats-next) that you can use to start working with Autonomous Database. This includes the built-in SQL Worksheet that's part of the Database Tools (and available from the linked OCI Console) or a tool like VS Code and one an Oracle Database extension.
1313

1414
## Sample scripts
1515
Try out these scripts to learn how to get started using Autonomous Database. Simply update the [`config.sql`](#configuration-file) script prior to running the samples:
@@ -37,7 +37,7 @@ chmod 600 config.sql
3737

3838
|Setting|Description|Example|
3939
|----|----|----|
40-
|CONN|JDBC Connection. [Go here](../azure-cli/create-adb.md#jdbc-example) to see how to get the connection details.|jdbc:oracle:thin:@(description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1521)(host=your-host.oraclecloud.com))(connect_data=(service_name=my_quickstart_medium.adb.oraclecloud.com))(security=(ssl_server_dn_match=no)))
40+
|CONN|JDBC Connection. [Go here](../azure-cli/README.md#jdbc-example) to see how to get the connection details.|jdbc:oracle:thin:@(description= (retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1521)(host=your-host.oraclecloud.com))(connect_data=(service_name=my_quickstart_medium.adb.oraclecloud.com))(security=(ssl_server_dn_match=no)))
4141
|USER_NAME|Database user that will contain sample data|'moviestream'|
4242
|USER_PASSWORD|Password for the sample database user|'watchS0meMovies#'
4343
|**Select AI and GenAI**|

sql/config.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
define CONN='your-database-connection-string'
1010
-- the database user that will own the sample schema
1111
define USER_NAME='moviestream'
12-
define USER_PASSWORD='your-strong-password'
12+
-- Password for the database user
13+
-- The password must be between 12 and 30 characters long and must include at least one uppercase letter, one lowercase letter, and one numeric character.
14+
define USER_PASSWORD=''
1315
--
1416
-- GENAI
1517
--

0 commit comments

Comments
 (0)