Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing double slashes after "config-ocivault:" #84

Merged
merged 6 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ types of providers.
A Centralized Config Provider is identified and configured by a JDBC URL of the
following form:
<pre>
jdbc:oracle:thin:@config-{provider-name}:[path][?parameters]
jdbc:oracle:thin:@config-{provider-name}://[path][?parameters]
</pre>
For example, the URL below identifies and configures the Centralized Config Provider for Azure:
<pre>
Expand Down
4 changes: 2 additions & 2 deletions ojdbc-provider-azure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ The sample code below executes as expected with the previous configuration (and
```
## Azure Vault Config Provider
Similar to [OCI Vault Config Provider](../ojdbc-provider-oci/README.md#oci-vault-config-provider), JSON Payload can also be stored in the content of Azure Key Vault Secret.
The Oracle DataSource uses a new prefix `jdbc:oracle:thin:@config-azurevault:`. Users only need to indicate the Vault Secret’s secret identifier, with the following syntax:
The Oracle DataSource uses a new prefix `jdbc:oracle:thin:@config-azurevault://`. Users only need to indicate the Vault Secret’s secret identifier, with the following syntax:

<pre>
jdbc:oracle:thin:@config-azurevault:{secret-identifier}
jdbc:oracle:thin:@config-azurevault://{secret-identifier}
</pre>

To view an example format of JSON Payload, please refer to [JSON Payload format](../ojdbc-provider-oci/README.md#json-payload-format).
Expand Down
6 changes: 3 additions & 3 deletions ojdbc-provider-oci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ Provider can now support Database Tools Connections with Proxy Authentication,
only if username is provided in Proxy Authentication Info, without the password and roles.

## OCI Object Storage Config Provider
The Oracle DataSource uses a new prefix `jdbc:oracle:thin:@config-ociobject:` to be able to identify that the configuration parameters should be loaded using OCI Object Storage. Users only need to indicate the URL Path of the Object containing the JSON payload, with the following syntax:
The Oracle DataSource uses a new prefix `jdbc:oracle:thin:@config-ociobject://` to be able to identify that the configuration parameters should be loaded using OCI Object Storage. Users only need to indicate the URL Path of the Object containing the JSON payload, with the following syntax:

<pre>
jdbc:oracle:thin:@config-ociobject:{url_path}[?option1=value1&option2=value2...]
jdbc:oracle:thin:@config-ociobject://{url_path}[?option1=value1&option2=value2...]
</pre>

The insturctions of obtaining a URL Path can be found in [Get the URI or Pre-Authenticated Request URL to Access the Object Store](https://docs.oracle.com/en/cloud/paas/autonomous-database/csgru/get-uri-access-object-store.html).
Expand Down Expand Up @@ -151,7 +151,7 @@ For the JSON type of provider (OCI Object Storage, HTTP/HTTPS, File) the passwor
Apart from OCI Object Storage, users can also store JSON Payload in the content of OCI Vault Secret. Users need to indicate the OCID of the Secret with the following syntax:

<pre>
jdbc:oracle:thin:@config-ocivault:{secret-ocid}
jdbc:oracle:thin:@config-ocivault://{secret-ocid}
</pre>

The JSON Payload retrieved by OCI Vault Config Provider follows the same format in [OCI Object Storage Config Provider](#json-payload-format).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public class AzureAppConfigExample {
*/
public static void main(String[] args) throws SQLException {
// Construct a jdbc: URL
String url = "jdbc:oracle:thin:@config-azure:" + APPCONFIG_NAME;
String url = "jdbc:oracle:thin:@config-azure://" + APPCONFIG_NAME;

String optionalString = constructOptionalString();
if (optionalString.length() != 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
* <li>AZURE_CLIENT_SECRET A client secret that was generated for the App
* Registration.</li>
* </ul>
* <p>The Oracle DataSource uses a new prefix jdbc:oracle:thin:@config-azure:
* <p>The Oracle DataSource uses a new prefix jdbc:oracle:thin:@config-azure://
* to be able to identify that the configuration parameters should be loaded
* using Azure App Configuration. Users only need to indicate the App Config's
* name, a prefix for the key-names and the Label (both optionally) with the
* following syntax:
* </p>
* <pre>
* jdbc:oracle:thin:@config-azure:{appconfig-name}[?key=prefix&amp;label=value
* jdbc:oracle:thin:@config-azure://{appconfig-name}[?key=prefix&amp;label=value
* &amp;option1=value1&amp;option2=value2...]
* </pre>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@
* {@link oracle.jdbc.spi.OracleConfigurationProvider}.
* </p>
* <p>The Oracle DataSource uses a new prefix
* jdbc:oracle:thin:@config-azurevault:
* jdbc:oracle:thin:@config-azurevault://
* to be able to identify that the configuration parameters should be loaded
* using Azure Vault Secret. Users only need to indicate the Vault Secret's
* secret identifier, with the
* following syntax:
* </p>
* <pre>
* jdbc:oracle:thin:@config-azurevault:{secret-identifier}
* jdbc:oracle:thin:@config-azurevault://{secret-identifier}
* </pre>
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public class ObjectStorageExample {
* @throws SQLException if an error occurs during the database calls
*/
public static void main(String[] args) throws SQLException {
String url = "jdbc:oracle:thin:@config-ociobject:" + OBJECT_URI;
String url = "jdbc:oracle:thin:@config-ociobject://" + OBJECT_URI;

if (OCI_AUTHENTICATION == null)
System.out.println("oci_authentication property is empty. Default " +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class SimpleVaultJsonExample {
* </p>
* Users need to indicate the OCID of the Secret with the following syntax:
* <pre>
* jdbc:oracle:thin:@config-ocivault:{secret-ocid}
* jdbc:oracle:thin:@config-ocivault://{secret-ocid}
* </pre>
* @param args the command line arguments
* @throws SQLException if an error occurs during the database calls
Expand Down
Loading