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.

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

4.x: Adds OciSecretsConfigSourceProvider.java #7391

Merged
merged 15 commits into from
Aug 21, 2023
Merged

4.x: Adds OciSecretsConfigSourceProvider.java #7391

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
45ef4d2
Adds OciSecretsConfigSourceProvider. Addresses issue #4238.
ljnelson Aug 16, 2023
e12586e
Squashable commit; corrects documentation typos, removes spurious files
ljnelson Aug 16, 2023
fa7aefa
Squashable commit; closes Secrets client properly accounting for exce…
ljnelson Aug 16, 2023
01c7488
Squashable commit; breaks particularly annoying fan-out error handlin…
ljnelson Aug 16, 2023
4726f65
Squashable commit; renames invokeAll method to completeAllSecretsTask…
ljnelson Aug 16, 2023
4a0c0e2
Squashable commit; refactors error handling and secret summary acquis…
ljnelson Aug 17, 2023
fad43f5
Squashable commit; cleans up documentation, refactors a few lambdas, …
ljnelson Aug 17, 2023
275b6bb
Squashable commit; addresses some PR feedback
ljnelson Aug 17, 2023
a7d8cb8
Squashable commit; documents some warnings suppressions
ljnelson Aug 17, 2023
7360302
Squashable commit; removes Weighted implementation; replaces with Wei…
ljnelson Aug 17, 2023
c9b1fad
Squashable commit; replicates dependency convergence shenanigans in p…
ljnelson Aug 17, 2023
bd33f8d
Squashable commit; corrects isModified logic
ljnelson Aug 17, 2023
98c3582
Squashable commit; addresses PR feedback
ljnelson Aug 21, 2023
01a1bd5
Squashable commit; refactors task creation; adds some comments
ljnelson Aug 21, 2023
c129041
Squashable commit; removes constructors from unit tests per request
ljnelson Aug 21, 2023
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
5 changes: 5 additions & 0 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,11 @@
<artifactId>helidon-integrations-oci-sdk-cdi</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.oci</groupId>
<artifactId>helidon-integrations-oci-secrets-configsource</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.oci.metrics</groupId>
<artifactId>helidon-integrations-oci-metrics</artifactId>
Expand Down
141 changes: 141 additions & 0 deletions integrations/oci/oci-secrets-config-source/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2023 Oracle and/or its affiliates.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.helidon.integrations.oci</groupId>
<artifactId>helidon-integrations-oci-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>helidon-integrations-oci-secrets-config-source</artifactId>
<name>Helidon Integrations OCI Secrets Config Source</name>

<description>
OCI Secrets Retrieval API ConfigSourceProvider Implementation
</description>

<properties>
<compartment-ocid/>
<java.util.logging.config.file>src/test/java/logging.properties</java.util.logging.config.file>
<vault-ocid/>
</properties>

<dependencies>

<!-- Compile-scoped dependencies. -->

<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.integrations.oci.sdk</groupId>
<artifactId>helidon-integrations-oci-sdk-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-secrets</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-vault</artifactId>
</dependency>

<!-- Runtime-scoped dependencies. -->

<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common-httpclient-jersey3</artifactId>
<scope>runtime</scope>
<exclusions>
<!-- For dependency convergence. Defer to versions from jersey-apache-connector -->
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- For dependency convergence. To make sure we use Jersey version of org.apache.httpcomponents:httpclient and httpcore -->
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<scope>runtime</scope>
</dependency>

<!-- Test-scoped dependencies. -->

<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config-yaml-mp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
<includes>
<include>meta-config.yaml</include>
</includes>
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<compartment-ocid>${compartment-ocid}</compartment-ocid>
<java.util.logging.config.file>${java.util.logging.config.file}</java.util.logging.config.file>
<vault-ocid>${vault-ocid}</vault-ocid>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading