diff --git a/README.md b/README.md index dca67dd..b4748b4 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ Oracle Database@Azure brings Oracle's best databases - Exadata and Autonomous Da * Deploy a new Oracle Autonomous Database * [Using the Azure Portal](https://youtu.be/QOCvRr5CfeQ) * [Using Terraform scripts](https://github.com/oci-landing-zones/terraform-oci-multicloud-azure/tree/main) - * [Using the Azure CLI](azure-cli/create-adb.md) + * [Using the Azure CLI](azure-cli/README.md) * Connect to your Autonomous Database * [Learn about connectivity options](https://docs.oracle.com/en/cloud/paas/autonomous-database/serverless/adbsb/connect-preparing.html) * Use these great VS Code extensions that help you develop and debug your database apps * SQL Developer for VS Code ([Learn More](https://www.oracle.com/database/sqldeveloper/vscode/) | [Marketplace](https://marketplace.visualstudio.com/items?itemName=Oracle.sql-developer)) * 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)) -* [Sample SQL code](./sql/sql-scripts.md) +* [Sample SQL code](./sql/README.md) * Create a database user and add sample data * Work with data in Azure Storage * Get started with Select AI diff --git a/azure-cli/create-adb.md b/azure-cli/README.md similarity index 100% rename from azure-cli/create-adb.md rename to azure-cli/README.md diff --git a/azure-cli/config b/azure-cli/config index 5ae5540..0008bd3 100644 --- a/azure-cli/config +++ b/azure-cli/config @@ -9,16 +9,13 @@ ADB_NAME="quickstart" ## NETWORKING # database VNET_NAME="dev-vnet" -#VNET_PREFIX="192.168.0.0/16" VNET_PREFIX="19x.xxx.0.0/16" # subnet for the database SUBNET_NAME="dev-sn-db" -#SUBNET_PREFIX="192.168.1.0/24" SUBNET_PREFIX="19x.xxx.1.0/24" # client subnet SUBNET2_NAME="dev-sn-client" -#SUBNET2_PREFIX="192.168.2.0/24" SUBNET2_PREFIX="19x.xxx.2.0/24" #network security group @@ -37,4 +34,5 @@ STORAGE_CONTAINER_NAME="adb-sample" ## IDENTITIES # This identity will be used for your VM. The password will also be used for the database ADMIN user USER_NAME="adb" -USER_PASSWORD="your-complex-password" \ No newline at end of file +# 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. +USER_PASSWORD="" \ No newline at end of file diff --git a/azure-cli/deploy-adb.md b/azure-cli/deploy-adb.md deleted file mode 100644 index 4dd1c1b..0000000 --- a/azure-cli/deploy-adb.md +++ /dev/null @@ -1,52 +0,0 @@ -# Oracle Database@Azure: Create an Autonomous Database -The steps below show how to create an Autonomous Database using the Azure CLI. You will need to [install the Azure CLI](https://learn.microsoft.com/en-us/cli/azure/) prior to running thru this example. - -Run the examples below at a command prompt. - -> [!NOTE] -> See the [details for onboarding Autonomous Database](https://learn.microsoft.com/en-us/azure/oracle/oracle-db/onboard-oracle-database) - -## Deploy your Autonomous Database -Start by logging into Azure: -```bash -az login -``` - -Edit the [config file](./config) based on your deployment. These variables will be used by the Azure CLI. -```bash -LOCATION="eastus" -RESOURCE_GROUP="resource-group-name-goes-here" -VNET_ID="vnet-resource-name-goes-here" -SUBNET_ID="subnet-resource-name-goes-here" -ADB_NAME="adb-name-goes-here" -``` -The VNET and SUBNET IDs must be fully qualified IDs. For example: -* **VNET_ID=**`"/subscriptions/99d4fb0e-ac2.../resourceGroups/your-resource-group/providers/Microsoft.Network/virtualNetworks/your-vnet"` -* **SUBNET_ID=**`"/subscriptions/99d4fb0e-ac2.../resourceGroups/your-resource-group/providers/Microsoft.Network/virtualNetworks/your-vnet/subnets/your-subnet"` - -After updating the config file, create a new Autonomous Database by running [`./deploy-adb.sh`](./deploy-adb.sh) from the command line. You can also modify other database properties by editing the deployment script. - -The script will prompte you for the Autonomous Database **ADMIN** user password. Enter a complex password. - -After a few minutes, review your newly created database: -```bash -az oracle-database autonomous-database show \ ---autonomousdatabasename $ADB_NAME \ ---resource-group $RESOURCE_GROUP -``` - -## Delete an Autonomous Database -You can run the following command to an Autonomous Database: - -```bash -az oracle-database autonomous-database delete \ ---autonomousdatabasename $ADB_NAME \ ---resource-group $RESOURCE_GROUP \ ---no-wait false -``` - - - -
-Copyright (c) 2024 Oracle and/or its affiliates.
-Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ diff --git a/sql/sql-scripts.md b/sql/README.md similarity index 86% rename from sql/sql-scripts.md rename to sql/README.md index 777e6de..11f8b3d 100644 --- a/sql/sql-scripts.md +++ b/sql/README.md @@ -2,14 +2,14 @@ Numerous SQL scripts are available to help you get started using Autonomous Database on Oracle Database@Azure Prerequisites: -* [Create an Autonomous Database](../azure-cli/create-adb.md) +* [Create an Autonomous Database](../azure-cli/README.md) * A VM deployed on the same VCN as Autonomous Database (or on a network that can access your Autonomous Database) * Use these great VS Code extensions that help you develop and debug your database apps: * SQL Developer for VS Code ([Learn More](https://www.oracle.com/database/sqldeveloper/vscode/) | [Marketplace](https://marketplace.visualstudio.com/items?itemName=Oracle.sql-developer)) * 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)) ## Connect to Autonomous Database -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. +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. ## Sample scripts 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 |Setting|Description|Example| |----|----|----| -|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))) +|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))) |USER_NAME|Database user that will contain sample data|'moviestream'| |USER_PASSWORD|Password for the sample database user|'watchS0meMovies#' |**Select AI and GenAI**| diff --git a/sql/config.sql b/sql/config.sql index c9ceaca..e6649ea 100644 --- a/sql/config.sql +++ b/sql/config.sql @@ -9,7 +9,9 @@ define CONN='your-database-connection-string' -- the database user that will own the sample schema define USER_NAME='moviestream' -define USER_PASSWORD='your-strong-password' +-- Password for the database user +-- 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. +define USER_PASSWORD='' -- -- GENAI --