Skip to content

Commit dab162b

Browse files
sumitkdeysumitkdey
authored
Merge pull request #80 from oracle/release_2018-09-27
Releasing version 1.2.47
2 parents df102eb + 05a155a commit dab162b

File tree

208 files changed

+16037
-256
lines changed

Some content is hidden

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

208 files changed

+16037
-256
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
1313
### Added
1414
- N/A
1515

16+
## 1.2.47 - 2018-09-27
17+
### Added
18+
- Support for `paravirtualized` launch mode when importing images in the Compute service
19+
- Support for Key Management service
20+
- Support for encrypting the contents of an Object Storage bucket using a Key Management service key
21+
- Support for specifying a Key Management service key when launching a compute instance in the Compute service
22+
- Support for specifying a Key Management service key when backing up or restoring a block storage volume in the Block Volume service
23+
1624
## 1.2.46 - 2018-09-06
1725
### Added
1826
- Support for updating metadata fields on an instance in the Compute service

‎bmc-addons/bmc-apache-connector-provider/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk-addons</artifactId>
8-
<version>1.2.46</version>
8+
<version>1.2.47</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.oracle.oci.sdk</groupId>
3939
<artifactId>oci-java-sdk-common</artifactId>
40-
<version>1.2.46</version>
40+
<version>1.2.47</version>
4141
</dependency>
4242
</dependencies>
4343
</project>

‎bmc-addons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.46</version>
8+
<version>1.2.47</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎bmc-audit/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.46</version>
8+
<version>1.2.47</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>com.oracle.oci.sdk</groupId>
2020
<artifactId>oci-java-sdk-common</artifactId>
21-
<version>1.2.46</version>
21+
<version>1.2.47</version>
2222
</dependency>
2323
</dependencies>
2424

‎bmc-audit/src/main/java/com/oracle/bmc/audit/AuditAsyncClient.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ public class AuditAsyncClient implements AuditAsync {
1515
* Service instance for Audit.
1616
*/
1717
public static final com.oracle.bmc.Service SERVICE =
18-
com.oracle.bmc.Services.create("AUDIT", "audit");
18+
com.oracle.bmc.Services.serviceBuilder()
19+
.serviceName("AUDIT")
20+
.serviceEndpointPrefix("audit")
21+
.build();
1922

2023
@lombok.Getter(value = lombok.AccessLevel.PACKAGE)
2124
private final com.oracle.bmc.http.internal.RestClient client;

‎bmc-audit/src/main/java/com/oracle/bmc/audit/AuditClient.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ public class AuditClient implements Audit {
1515
* Service instance for Audit.
1616
*/
1717
public static final com.oracle.bmc.Service SERVICE =
18-
com.oracle.bmc.Services.create("AUDIT", "audit");
18+
com.oracle.bmc.Services.serviceBuilder()
19+
.serviceName("AUDIT")
20+
.serviceEndpointPrefix("audit")
21+
.build();
1922
// attempt twice if it's instance principals, immediately failures will try to refresh the token
2023
private static final int MAX_IMMEDIATE_RETRIES_IF_USING_INSTANCE_PRINCIPALS = 2;
2124

‎bmc-bom/pom.xml‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.46</version>
8+
<version>1.2.47</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111
<artifactId>oci-java-sdk-bom</artifactId>
@@ -19,83 +19,88 @@
1919
<dependency>
2020
<groupId>com.oracle.oci.sdk</groupId>
2121
<artifactId>oci-java-sdk-common</artifactId>
22-
<version>1.2.46</version>
22+
<version>1.2.47</version>
2323
<optional>false</optional>
2424
</dependency>
2525
<!-- Service modules, alpha sorted -->
2626
<dependency>
2727
<groupId>com.oracle.oci.sdk</groupId>
2828
<artifactId>oci-java-sdk-audit</artifactId>
29-
<version>1.2.46</version>
29+
<version>1.2.47</version>
3030
<optional>false</optional>
3131
</dependency>
3232
<dependency>
3333
<groupId>com.oracle.oci.sdk</groupId>
3434
<artifactId>oci-java-sdk-containerengine</artifactId>
35-
<version>1.2.46</version>
35+
<version>1.2.47</version>
3636
<optional>false</optional>
3737
</dependency>
3838
<dependency>
3939
<groupId>com.oracle.oci.sdk</groupId>
4040
<artifactId>oci-java-sdk-core</artifactId>
41-
<version>1.2.46</version>
41+
<version>1.2.47</version>
4242
<optional>false</optional>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.oracle.oci.sdk</groupId>
4646
<artifactId>oci-java-sdk-database</artifactId>
47-
<version>1.2.46</version>
47+
<version>1.2.47</version>
4848
<optional>false</optional>
4949
</dependency>
5050
<dependency>
5151
<groupId>com.oracle.oci.sdk</groupId>
5252
<artifactId>oci-java-sdk-dns</artifactId>
53-
<version>1.2.46</version>
53+
<version>1.2.47</version>
5454
<optional>false</optional>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.oracle.oci.sdk</groupId>
5858
<artifactId>oci-java-sdk-email</artifactId>
59-
<version>1.2.46</version>
59+
<version>1.2.47</version>
6060
<optional>false</optional>
6161
</dependency>
6262
<dependency>
6363
<groupId>com.oracle.oci.sdk</groupId>
6464
<artifactId>oci-java-sdk-filestorage</artifactId>
65-
<version>1.2.46</version>
65+
<version>1.2.47</version>
6666
<optional>false</optional>
6767
</dependency>
6868
<dependency>
6969
<groupId>com.oracle.oci.sdk</groupId>
7070
<artifactId>oci-java-sdk-identity</artifactId>
71-
<version>1.2.46</version>
71+
<version>1.2.47</version>
7272
<optional>false</optional>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.oracle.oci.sdk</groupId>
7676
<artifactId>oci-java-sdk-loadbalancer</artifactId>
77-
<version>1.2.46</version>
77+
<version>1.2.47</version>
7878
<optional>false</optional>
7979
</dependency>
8080
<dependency>
8181
<groupId>com.oracle.oci.sdk</groupId>
8282
<artifactId>oci-java-sdk-objectstorage</artifactId>
83-
<version>1.2.46</version>
83+
<version>1.2.47</version>
8484
<optional>false</optional>
85-
<type>pom</type>
8685
</dependency>
8786
<dependency>
8887
<groupId>com.oracle.oci.sdk</groupId>
8988
<artifactId>oci-java-sdk-resourcesearch</artifactId>
9089
<optional>false</optional>
91-
<version>1.2.46</version>
90+
<version>1.2.47</version>
9291
</dependency>
9392
<dependency>
9493
<groupId>com.oracle.oci.sdk</groupId>
9594
<optional>false</optional>
9695
<artifactId>oci-java-sdk-addons-apache</artifactId>
97-
<version>1.2.46</version>
96+
<version>1.2.47</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.oracle.oci.sdk</groupId>
100+
<artifactId>oci-java-sdk-keymanagement</artifactId>
101+
<version>1.2.47</version>
102+
<optional>false</optional>
98103
</dependency>
99104
</dependencies>
100105
</dependencyManagement>
101-
</project>
106+
</project>

‎bmc-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.oracle.oci.sdk</groupId>
77
<artifactId>oci-java-sdk</artifactId>
8-
<version>1.2.46</version>
8+
<version>1.2.47</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

‎bmc-common/src/main/java/com/oracle/bmc/Region.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import lombok.Getter;
1414
import lombok.RequiredArgsConstructor;
1515
import lombok.extern.slf4j.Slf4j;
16+
import org.apache.commons.lang3.StringUtils;
1617

1718
/**
1819
* Enumeration of all of the known Regions that can be contacted.
@@ -98,6 +99,9 @@ public synchronized Optional<String> getEndpoint(Service service) {
9899
* @return The endpoint.
99100
*/
100101
public static String formatDefaultRegionEndpoint(Service service, String regionId) {
102+
if (StringUtils.isNotBlank(service.getServiceEndpointTemplate())) {
103+
return service.getServiceEndpointTemplate().replace("{region}", regionId);
104+
}
101105
return String.format(DEFAULT_ENDPOINT_FORMAT, service.getServiceEndpointPrefix(), regionId);
102106
}
103107

‎bmc-common/src/main/java/com/oracle/bmc/Service.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,10 @@ public interface Service {
2121
* "https://iaas.us-phoenix-1.oraclecloud.com".
2222
*/
2323
String getServiceEndpointPrefix();
24+
25+
/**
26+
* The service endpoint template that will be used, ex
27+
* "{region}.service.oci.oraclecloud.com"
28+
*/
29+
String getServiceEndpointTemplate();
2430
}

0 commit comments

Comments
 (0)