Skip to content

Commit ea176ec

Browse files
committed
Merge branch 'main' into observability-provider + new version of driver
2 parents 0d6a4d7 + 0cb8559 commit ea176ec

File tree

218 files changed

+43289
-492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+43289
-492
lines changed

.github/workflows/run-tests.yaml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ jobs:
1616
steps:
1717
- name: Checkout the repository
1818
uses: actions/checkout@v4
19-
- name: Set up JDK 11
20-
uses: actions/setup-java@v1
19+
- name: Set up JDK 17
20+
uses: actions/setup-java@v5
2121
with:
22-
java-version: 11
22+
distribution: 'oracle'
23+
java-version: '17'
2324
- name: Cache Maven packages
2425
uses: actions/cache@v4
2526
with:
@@ -29,11 +30,16 @@ jobs:
2930

3031
- name: Install dependencies
3132
run: mvn install -DskipTests
33+
34+
- name: Set GCP environment variables
35+
run : |
36+
echo "GOOGLE_APPLICATION_CREDENTIALS=$HOME/.gcp/config.json" >> $GITHUB_ENV
3237
3338
- name: Prepare certificate and properties files
3439
run: |
3540
mkdir -p $HOME/.azure
3641
mkdir -p $HOME/.oci
42+
mkdir -p $HOME/.gcp
3743
3844
# Prepare certificate
3945
echo "${{ secrets.TEST_AZURE_CERTIFICATE }}" > $HOME/.azure/ojdbc-plugin-test-app.pem
@@ -58,6 +64,8 @@ jobs:
5864
AZURE_TOKEN_SCOPE=${{ secrets.TEST_AZURE_TOKEN_SCOPE }}\n
5965
AZURE_APP_CONFIG_NAME=${{ secrets.TEST_AZURE_APP_CONFIG_NAME }}\n
6066
AZURE_APP_CONFIG_KEY=${{ secrets.TEST_AZURE_APP_CONFIG_KEY }}\n
67+
AZURE_APP_CONFIG_KEY_INVALID_PROPERTIES=${{ vars.TEST_AZURE_APP_CONFIG_KEY_INVALID_PROPERTIES }}\n
68+
AZURE_APP_CONFIG_KEY_NON_WHITELISTED_PROPERTIES=${{ vars.TEST_AZURE_APP_CONFIG_KEY_NON_WHITELISTED_PROPERTIES }}\n
6169
AZURE_APP_CONFIG_LABEL=${{ secrets.TEST_AZURE_APP_CONFIG_LABEL }}\n
6270
AZURE_KEY_VAULT_URL=${{ secrets.TEST_AZURE_KEY_VAULT_URL }}\n
6371
AZURE_KEY_VAULT_SECRET_NAME=${{ secrets.TEST_AZURE_KEY_VAULT_SECRET_NAME }}\n
@@ -133,6 +141,11 @@ jobs:
133141
AWS_SECRETS_MANAGER_URL=${{ secrets.TEST_AWS_SECRETS_MANAGER_URL }}\n
134142
" >> ojdbc-provider-aws/test.properties
135143
144+
# Generate GCP config
145+
echo "${{ secrets.TEST_GCP_CONFIG }}" > $HOME/.gcp/config.json
146+
echo "${{ secrets.GCP_TEST_PROPERTIES }}" > ojdbc-provider-gcp/test.properties
147+
148+
136149
- name: Run tests with Maven
137150
run: mvn -B test --file pom.xml
138151

@@ -146,8 +159,11 @@ jobs:
146159
rm ojdbc-provider-azure/ojdbc-provider-test-app.pfx
147160
rm ojdbc-provider-azure/test.properties
148161
162+
rm $HOME/.gcp/config.json
163+
rm ojdbc-provider-gcp/test.properties
164+
149165
rm ojdbc-provider-jackson-oson/test.properties
150166
151167
rm ojdbc-provider-observability/test.properties
152168
153-
rm ojdbc-provider-aws/test.properties
169+
rm ojdbc-provider-aws/test.properties

README.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ APIs. These SPI implementations are referred as "providers" for short.
66

77
Each module of this project contains a set of providers.
88

9-
<u>Two of these modules contain providers for a particular cloud platform:</u>
9+
<u>The following modules contain providers for a particular cloud platform:</u>
1010

1111
<dl>
1212
<dt><a href="ojdbc-provider-oci/README.md">Oracle JDBC OCI Providers</a></dt>
1313
<dd>Providers for integration with Oracle Cloud Infrastructure (OCI).</dd>
1414
<dt><a href="ojdbc-provider-azure/README.md">Oracle JDBC Azure Providers</a></dt>
1515
<dd>Providers for integration with Microsoft Azure</dd>
16+
<dt><a href="ojdbc-provider-gcp/README.md">Oracle JDBC GCP Providers</a></dt>
17+
<dd>Providers for integration with Google Cloud Platform</dd>
18+
<dt><a href="ojdbc-provider-hashicorp/README.md">Oracle JDBC HashiCorp Providers</a></dt>
19+
<dd>Providers for integration with Hashicorp</dd>
20+
<dt><a href="ojdbc-provider-aws/README.md">Oracle JDBC AWS Providers</a></dt>
21+
<dd>Providers for integration with AWS</dd>
1622
</dl>
1723
<u>The next one contains a provider for Open Telemetry:</u>
1824
<dl>
@@ -24,6 +30,8 @@ Each module of this project contains a set of providers.
2430
<dt><a href="ojdbc-provider-jackson-oson/README.md">Oracle JDBC Jackson OSON</a></dt>
2531
<dd>Provider for <a href="https://docs.oracle.com/en/database/oracle/oracle-database/23/adjsn/json-in-oracle-database.html#GUID-A8A58B49-13A5-4F42-8EA0-508951DAE0BB">OSON</a> through the JACKSON APIs.
2632
This provider can be used for seamless integration of applications that use the JACKSON APIs with the Oracle JSON type.</dd>
33+
<dt><a href="ojdbc-provider-pkl/README.md">Oracle JDBC Pkl Parser</a></dt>
34+
<dd>Parser for integration with Pkl that can be used by providers</dd>
2735
</dl>
2836
Visit any of the links above to learn about providers which are available for
2937
a particular platform.
@@ -128,10 +136,18 @@ this project:
128136

129137
[ojdbc-provider-azure](ojdbc-provider-azure/README.md#installation)
130138

139+
[ojdbc-provider-hashicorp](ojdbc-provider-hashicorp/README.md#installation)
140+
141+
[ojdbc-provider-aws](ojdbc-provider-aws/README.md#installation)
142+
143+
[ojdbc-provider-gcp](ojdbc-provider-gcp/README.md#installation)
144+
131145
[ojdbc-provider-opentelemetry](ojdbc-provider-opentelemetry/README.md#installation)
132146

133147
[ojdbc-provider-jackson-oson](ojdbc-provider-jackson-oson/README.md#installation)
134148

149+
[ojdbc-provider-pkl](ojdbc-provider-pkl/README.md#installation)
150+
135151

136152
Each module listed above is distributed on the Maven Central Repository as a
137153
separate jar file. Coordinates can be found by visiting the links above.

0 commit comments

Comments
 (0)