Skip to content

OKE Workload Identity Authentication #40

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jun 14, 2024
Merged

OKE Workload Identity Authentication #40

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eefa779
OKE Workload Identity Authentication
anders-swanson Jun 12, 2024
abeab58
Document workload identity
anders-swanson Jun 12, 2024
8d6a422
Workload Identity Documentation
anders-swanson Jun 12, 2024
de259e3
Version 1.1.0
anders-swanson Jun 14, 2024
c95c18f
Version 1.1.0
anders-swanson Jun 14, 2024
555f724
Version 1.1.0
anders-swanson Jun 14, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
**/*.rpm
**/*.jar
**/*.bin
pom.xml.versionsBackup

### STS ###
.apt_generated
Expand Down
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ For a deep dive into the project, refer to the Spring Cloud OCI documentation:
| Version | Reference Docs | API Docs |
|------------------------|---------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
| Spring Cloud OCI 1.0.0 | [Reference Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/reference/html/index.html) | [API Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/javadocs/index.html) |
| Spring Cloud OCI 1.0.1 | [Reference Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/reference/html/index.html) | [API Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/javadocs/index.html)
| Spring Cloud OCI 1.0.1 | [Reference Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/reference/html/index.html) | [API Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/javadocs/index.html) |
| Spring Cloud OCI 1.1.0 | [Reference Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/reference/html/index.html) | [API Docs](https://oracle.github.io/spring-cloud-oci/1.0.0/javadocs/index.html) |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well we can add some more stuff, like adb, before we release 1.1.0, right, we revved to 1.1.0-SNAPSHOT, so i'd leave this line out until we do a release

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated!



## Compatibility with Spring Project Versions

Expand All @@ -25,6 +27,7 @@ This project has dependency and transitive dependencies on Spring Projects. The
|------------------|--------------|--------------|--------------|
| 1.0.0 | 2022.0.x | 3.1.x, 3.0.x | 3.24.0 |
| 1.0.1 | 2023.0.x | 3.2.x | 3.41.1 |
| 1.1.0 | 2023.0.x | 3.2.x | 3.41.1 |

## Try out samples

Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<name>spring-cloud-oci-docs</name>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci-docs</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
<license>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/_configprops.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

|spring.cloud.oci.config.profile | `DEFAULT` | Name of the profile in OCI Auth config file
|spring.cloud.oci.config.file | NA | Location of the OCI Auth config file
|spring.cloud.oci.config.type | FILE | Config/Auth type to be used. Allowed values are FILE, SIMPLE, INSTANCE_PRINCIPAL, RESOURCE_PRINCIPAL and SESSION_TOKEN
|spring.cloud.oci.config.type | FILE | Config/Auth type to be used. Allowed values are FILE, SIMPLE, INSTANCE_PRINCIPAL, RESOURCE_PRINCIPAL, SESSION_TOKEN, and WORKLOAD_IDENTITY
|spring.cloud.oci.config.userId | NA | OCID of the user used for creating the API key. This is needed only if spring.cloud.oci.config.type is `SIMPLE`
|spring.cloud.oci.config.tenantId | NA | Tenancy OCID where the API key is created. This is needed only if spring.cloud.oci.config.type is `SIMPLE`
|spring.cloud.oci.config.fingerprint | NA | Fingerprint for the public key that was added to the user mentioned in `spring.cloud.oci.config.userId`. This is needed only if spring.cloud.oci.config.type is `SIMPLE`
Expand Down
10 changes: 10 additions & 0 deletions docs/src/main/asciidoc/core.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ Set the config.type to `SESSION_TOKEN` as shown here.
spring.cloud.oci.config.type = SESSION_TOKEN
----

==== Workload Identity Configuration

Set the config.type to `WORKLOAD_IDENTITY` as shown here.

----
spring.cloud.oci.config.type = WORKLOAD_IDENTITY
----

For further details, refer to https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contenggrantingworkloadaccesstoresources.htm[OKE Workload Identity Authentication]

For further details, refer to https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_authentication_methods.htm#ariaid-title12

=== Region Configuration
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
</parent>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Cloud OCI</name>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<artifactId>spring-cloud-oci</artifactId>
<groupId>com.oracle.cloud.spring</groupId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>spring-cloud-oci-autoconfigure</artifactId>
Expand Down
1 change: 1 addition & 0 deletions ...igure/src/main/java/com/oracle/cloud/spring/autoconfigure/core/CredentialsProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public enum ConfigType {
FILE,
INSTANCE_PRINCIPAL,
RESOURCE_PRINCIPAL,
WORKLOAD_IDENTITY,
SIMPLE,
SESSION_TOKEN
}
Expand Down
4 changes: 4 additions & 0 deletions ...nfigure/src/main/java/com/oracle/cloud/spring/autoconfigure/core/CredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.oracle.bmc.auth.SessionTokenAuthenticationDetailsProvider;
import com.oracle.bmc.auth.SimpleAuthenticationDetailsProvider;
import com.oracle.bmc.auth.SimplePrivateKeySupplier;
import com.oracle.bmc.auth.okeworkloadidentity.OkeWorkloadIdentityAuthenticationDetailsProvider;

import java.io.IOException;

Expand Down Expand Up @@ -41,6 +42,9 @@ private static BasicAuthenticationDetailsProvider createCredentialsProvider(Cred
BasicAuthenticationDetailsProvider authenticationDetailsProvider;

switch (properties.getType()) {
case WORKLOAD_IDENTITY:
authenticationDetailsProvider = OkeWorkloadIdentityAuthenticationDetailsProvider.builder().build();
break;
case RESOURCE_PRINCIPAL:
authenticationDetailsProvider = ResourcePrincipalAuthenticationDetailsProvider.builder().build();
break;
Expand Down
14 changes: 14 additions & 0 deletions ...com/oracle/cloud/spring/autoconfigure/core/CredentialsProviderAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import com.oracle.bmc.Region;
import com.oracle.bmc.auth.*;
import com.oracle.bmc.auth.okeworkloadidentity.OkeWorkloadIdentityAuthenticationDetailsProvider;
import org.junit.jupiter.api.Test;
import org.mockito.MockedConstruction;
import org.mockito.MockedStatic;
Expand Down Expand Up @@ -71,6 +72,19 @@ void testConfigurationValueConfiguredAreAsExpected() {
});
}

@Test
void testWorkloadIdentityProvider() throws Exception {
CredentialsProperties properties = new CredentialsProperties();
properties.setType(CredentialsProperties.ConfigType.WORKLOAD_IDENTITY);
CredentialsProviderAutoConfiguration configuration = new CredentialsProviderAutoConfiguration(properties);
try (MockedStatic mocked = mockStatic(OkeWorkloadIdentityAuthenticationDetailsProvider.class)) {
OkeWorkloadIdentityAuthenticationDetailsProvider.OkeWorkloadIdentityAuthenticationDetailsProviderBuilder builder =
mock(OkeWorkloadIdentityAuthenticationDetailsProvider.OkeWorkloadIdentityAuthenticationDetailsProviderBuilder.class);
when(OkeWorkloadIdentityAuthenticationDetailsProvider.builder()).thenReturn(builder);
BasicAuthenticationDetailsProvider provider = configuration.credentialsProvider().getAuthenticationDetailsProvider();
}
}

@Test
void testResourcePrincipalProvider() throws Exception {
CredentialsProperties properties = new CredentialsProperties();
Expand Down
6 changes: 5 additions & 1 deletion spring-cloud-oci-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<artifactId>spring-cloud-oci</artifactId>
<groupId>com.oracle.cloud.spring</groupId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>spring-cloud-oci-core</artifactId>
Expand Down Expand Up @@ -67,6 +67,10 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-identity</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-addons-oke-workload-identity</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common-httpclient-jersey</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci-dependencies</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Cloud OCI Dependencies</name>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-function/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<artifactId>spring-cloud-oci</artifactId>
<groupId>com.oracle.cloud.spring</groupId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>spring-cloud-oci-function</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-logging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<artifactId>spring-cloud-oci</artifactId>
<groupId>com.oracle.cloud.spring</groupId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>spring-cloud-oci-logging</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-notification/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<artifactId>spring-cloud-oci</artifactId>
<groupId>com.oracle.cloud.spring</groupId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>spring-cloud-oci-notification</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-queue/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<artifactId>spring-cloud-oci</artifactId>
<groupId>com.oracle.cloud.spring</groupId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>

<artifactId>spring-cloud-oci-queue</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<artifactId>spring-cloud-oci</artifactId>
<groupId>com.oracle.cloud.spring</groupId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-common-samples-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci-samples</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>com.oracle.cloud.spring.sample.common</groupId>
<artifactId>spring-cloud-oci-common-samples-utils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-function-sample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This application has the following classes:
Configuration items that are needed to run the Application can be configured in `application.properties`.

* `spring.cloud.oci.region.static` - OCI Region name(Ex: us-phoenix-1) where the OCI resources need to be created.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SIMPLE, SESSION_TOKEN and FILE. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SIMPLE, SESSION_TOKEN, FILE, and WORKLOAD_IDENTITY. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.file` - The file path set to this property will be used as the configuration file for FILE type authentication which uses the OCI configuration file. If nothing is specified, the OCI configuration file from the user's home directory will be used.
* `spring.cloud.oci.config.profile` - Profile to be used in the OCI config file for Authentication. If a profile is not specified, a DEFAULT profile will be used.

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-function-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci-samples</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.cloud.spring.sample.function</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-logging-sample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This application has the following classes:
Configuration items that are needed to run the Application can be configured in `application.properties`. These include the following:

* `spring.cloud.oci.region.static` - OCI Region name(Ex: us-phoenix-1) where the OCI resources need to be created.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SESSION_TOKEN, SIMPLE and FILE. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SESSION_TOKEN, SIMPLE, FILE, and WORKLOAD_IDENTITY. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.file` - The file path set to this property will be used as a configuration file for FILE type authentication which uses the OCI configuration file. If nothing is specified, the OCI configuration file from the user's home directory will be used.
* `spring.cloud.oci.config.profile` - Profile to be used in the OCI configuration file for Authentication. If a profile is not specified, a DEFAULT profile will be used.
* `spring.cloud.oci.logging.logId` - OCID of the OCI Log where the logs need to be ingested.
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-logging-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci-samples</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.cloud.spring.sample.logging</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-notification-sample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This application has the following classes:
Configuration items that are needed to run the Application can be configured in `application.properties`.

* `spring.cloud.oci.region.static` - OCI Region name(Ex: us-phoenix-1) where the OCI resources need to be created.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SESSION_TOKEN, SIMPLE and FILE. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SESSION_TOKEN, SIMPLE, FILE, and WORKLOAD_IDENTITY. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.file` - The file path set to this property will be used as the configuration file for FILE type authentication which uses the OCI configuration file. If nothing is specified, the OCI configuration file from the user's home directory will be used.
* `spring.cloud.oci.config.profile` - Profile to be used in the OCI config file for Authentication. If a profile is not specified, a DEFAULT profile will be used.

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-notification-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci-samples</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.cloud.spring.sample.notification</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-queue-sample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This application has the following classes:
Configuration items that are needed to run the Application can be configured in `application.properties`.

* `spring.cloud.oci.region.static` - OCI Region name(Ex: us-phoenix-1) where the OCI resources need to be created.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SESSION_TOKEN, SIMPLE and FILE. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCEPRINCIPAL, INSTANCE_PRINCIPAL, SESSION_TOKEN, SIMPLE, FILE, and WORKLOAD_IDENTITY. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.file` - The file path set to this property will be used as the configuration file for FILE type authentication which uses the OCI configuration file. If nothing is specified, the OCI configuration file from the user's home directory will be used.
* `spring.cloud.oci.config.profile` - Profile to be used in the OCI config file for Authentication. If a profile is not specified, a DEFAULT profile will be used.

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-queue-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci-samples</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.cloud.spring.sample.queue</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-storage-sample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ OCI provides customers with high-performance computing and low-cost cloud storag
Configuration items that are needed to run the Application can be configured in `application.properties`.

* `spring.cloud.oci.region.static` - OCI Region name(Ex: us-phoenix-1) where the OCI resources need to be created.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SESSION_TOKEN, SIMPLE and FILE. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SESSION_TOKEN, SIMPLE, FILE, and WORKLOAD_IDENTITY. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.file` - The file path set to this property will be used as the configuration file for FILE type authentication which uses the OCI configuration file. If nothing is specified, the OCI configuration file from the user's home directory will be used.
* `spring.cloud.oci.config.profile` - Profile to be used in the OCI config file for Authentication. If a profile is not specified, a DEFAULT profile will be used.

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-storage-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<groupId>com.oracle.cloud.spring</groupId>
<artifactId>spring-cloud-oci-samples</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>com.oracle.cloud.spring.sample.storage</groupId>
<artifactId>spring-cloud-oci-storage-sample</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-oci-samples/spring-cloud-oci-streaming-sample/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This application has the following classes:
Configuration items that are needed to run the Application can be configured in `application.properties`. These include the following:

* `spring.cloud.oci.region.static` - OCI Region name(Ex: us-phoenix-1) where the OCI resources need to be created.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SIMPLE and FILE. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.type` - Authentication type to be used for OCI. It could be one of the following: RESOURCE_PRINCIPAL, INSTANCE_PRINCIPAL, SIMPLE, FILE, and WORKLOAD_IDENTITY. If nothing is specified, FILE type is used by default.
* `spring.cloud.oci.config.file` - The file path set to this property will be used as a configuration file for FILE type authentication which uses the OCI configuration file. If nothing is specified, the OCI configuration file from the user's home directory will be used.
* `spring.cloud.oci.config.profile` - Profile to be used in the OCI configuration file for Authentication. If a profile is not specified, a DEFAULT profile will be used.

Expand Down
Loading
Loading