Skip to content

Commit e71daa6

Browse files
mrickenmricken
authored
Merge pull request #23 from oracle/release_20170911
Releasing version 1.2.15
2 parents e058ef3 + 1895fb6 commit e71daa6

File tree

184 files changed

+5176
-339
lines changed

Some content is hidden

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

184 files changed

+5176
-339
lines changed

‎CHANGELOG.md‎

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

16+
## 1.2.15 - 2017-09-11
17+
18+
### Changed
19+
- Maven packages renamed from "oracle-bmc-*" to "oci-*"" (group id renamed from "com.oracle.bmc.sdk" to "com.oracle.oci.sdk")
20+
- Default configuration file location changed from "~/.oraclebmc/config" to "~/.oci/config"; old location deprecated (see "Deprecated" below)
21+
22+
### Added
23+
- Support for instance console connections
24+
- Support for Load Balancer health status API
25+
- Support for compartment renaming
26+
- Support for CustomerSecretKeys management
27+
28+
### Deprecated
29+
- The previous default configuration file location, "~/.oraclebmc/config", has been deprecated: please use "~/.oci/config" instead. The old location still works, if file at new location does not exist.
30+
1631
## 1.2.13 - 2017-08-10
1732
### Fixed
1833
- Duplicable stream support (https://github.com/oracle/bmcs-java-sdk/issues/11)

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Contributing to the Oracle Bare Metal Cloud Services Java SDK
1+
# Contributing to the Oracle Cloud Infrastructure Java SDK
22

3-
*Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.*
3+
*Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.*
44

55
Pull requests can be made under
66
[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html)

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Oracle Bare Metal Cloud Services Java SDK
1+
# Oracle Cloud Infrastructure Java SDK
22
[![Build Status](https://travis-ci.org/oracle/bmcs-java-sdk.svg?branch=master)](https://travis-ci.org/oracle/bmcs-java-sdk)
33

44
## About
55

6-
bmcs-java-sdk provides a Java SDK for managing your Oracle Bare Metal Cloud Services resources.
6+
oci-java-sdk provides a Java SDK for managing your Oracle Cloud Infrastructure resources.
77

88
The project is open source and maintained by Oracle Corp. The home page for the project is [here](https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm).
99

@@ -31,9 +31,9 @@ See [CHANGELOG](/CHANGELOG.md).
3131

3232
## Contributing
3333

34-
bmcs-java-sdk is an open source project. See [CONTRIBUTING](/CONTRIBUTING.md) for details.
34+
oci-java-sdk is an open source project. See [CONTRIBUTING](/CONTRIBUTING.md) for details.
3535

36-
Oracle gratefully acknowledges the contributions to bmcs-java-sdk that have been made by the community.
36+
Oracle gratefully acknowledges the contributions to oci-java-sdk that have been made by the community.
3737

3838
## Known Issues
3939

‎bmc-audit/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<groupId>com.oracle.bmc.sdk</groupId>
7-
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.13</version>
6+
<groupId>com.oracle.oci.sdk</groupId>
7+
<artifactId>oci-java-sdk</artifactId>
8+
<version>1.2.15</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

12-
<artifactId>oracle-bmc-java-sdk-audit</artifactId>
13-
<name>Oracle Bare Metal Cloud Services SDK - Audit</name>
14-
<description>This project contains the SDK used for Oracle Bare Metal Cloud Audit Service</description>
12+
<artifactId>oci-java-sdk-audit</artifactId>
13+
<name>Oracle Cloud Infrastructure SDK - Audit</name>
14+
<description>This project contains the SDK used for Oracle Cloud Infrastructure Audit Service</description>
1515
<url>https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm</url>
1616

1717
<dependencies>
1818
<dependency>
19-
<groupId>com.oracle.bmc.sdk</groupId>
20-
<artifactId>oracle-bmc-java-sdk-common</artifactId>
21-
<version>1.2.13</version>
19+
<groupId>com.oracle.oci.sdk</groupId>
20+
<artifactId>oci-java-sdk-common</artifactId>
21+
<version>1.2.15</version>
2222
</dependency>
2323
</dependencies>
2424

‎bmc-bom/pom.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,59 +5,59 @@
55
<!-- http://howtodoinjava.com/maven/maven-bom-bill-of-materials-dependency/ -->
66

77
<parent>
8-
<groupId>com.oracle.bmc.sdk</groupId>
9-
<artifactId>oracle-bmc-java-sdk</artifactId>
10-
<version>1.2.13</version>
8+
<groupId>com.oracle.oci.sdk</groupId>
9+
<artifactId>oci-java-sdk</artifactId>
10+
<version>1.2.15</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>oracle-bmc-java-sdk-bom</artifactId>
14+
<artifactId>oci-java-sdk-bom</artifactId>
1515
<packaging>pom</packaging>
16-
<name>Oracle Bare Metal Cloud Services SDK - BOM</name>
17-
<description>This project contains the BOM defining the SDK used for Oracle Bare Metal Cloud Services</description>
16+
<name>Oracle Cloud Infrastructure SDK - BOM</name>
17+
<description>This project contains the BOM defining the SDK used for Oracle Cloud Infrastructure</description>
1818
<url>https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm</url>
1919

2020
<dependencyManagement>
2121
<dependencies>
2222
<!-- Common packages -->
2323

2424
<dependency>
25-
<groupId>com.oracle.bmc.sdk</groupId>
26-
<artifactId>oracle-bmc-java-sdk-common</artifactId>
27-
<version>1.2.13</version>
25+
<groupId>com.oracle.oci.sdk</groupId>
26+
<artifactId>oci-java-sdk-common</artifactId>
27+
<version>1.2.15</version>
2828
<optional>false</optional>
2929
</dependency>
3030

3131
<!-- Service modules, alpha sorted -->
3232

3333
<dependency>
34-
<groupId>com.oracle.bmc.sdk</groupId>
35-
<artifactId>oracle-bmc-java-sdk-audit</artifactId>
36-
<version>1.2.13</version>
34+
<groupId>com.oracle.oci.sdk</groupId>
35+
<artifactId>oci-java-sdk-audit</artifactId>
36+
<version>1.2.15</version>
3737
<optional>false</optional>
3838
</dependency>
3939
<dependency>
40-
<groupId>com.oracle.bmc.sdk</groupId>
41-
<artifactId>oracle-bmc-java-sdk-core</artifactId>
42-
<version>1.2.13</version>
40+
<groupId>com.oracle.oci.sdk</groupId>
41+
<artifactId>oci-java-sdk-core</artifactId>
42+
<version>1.2.15</version>
4343
<optional>false</optional>
4444
</dependency>
4545
<dependency>
46-
<groupId>com.oracle.bmc.sdk</groupId>
47-
<artifactId>oracle-bmc-java-sdk-identity</artifactId>
48-
<version>1.2.13</version>
46+
<groupId>com.oracle.oci.sdk</groupId>
47+
<artifactId>oci-java-sdk-identity</artifactId>
48+
<version>1.2.15</version>
4949
<optional>false</optional>
5050
</dependency>
5151
<dependency>
52-
<groupId>com.oracle.bmc.sdk</groupId>
53-
<artifactId>oracle-bmc-java-sdk-loadbalancer</artifactId>
54-
<version>1.2.13</version>
52+
<groupId>com.oracle.oci.sdk</groupId>
53+
<artifactId>oci-java-sdk-loadbalancer</artifactId>
54+
<version>1.2.15</version>
5555
<optional>false</optional>
5656
</dependency>
5757
<dependency>
58-
<groupId>com.oracle.bmc.sdk</groupId>
59-
<artifactId>oracle-bmc-java-sdk-objectstorage</artifactId>
60-
<version>1.2.13</version>
58+
<groupId>com.oracle.oci.sdk</groupId>
59+
<artifactId>oci-java-sdk-objectstorage</artifactId>
60+
<version>1.2.15</version>
6161
<optional>false</optional>
6262
</dependency>
6363
</dependencies>

‎bmc-common/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<groupId>com.oracle.bmc.sdk</groupId>
7-
<artifactId>oracle-bmc-java-sdk</artifactId>
8-
<version>1.2.13</version>
6+
<groupId>com.oracle.oci.sdk</groupId>
7+
<artifactId>oci-java-sdk</artifactId>
8+
<version>1.2.15</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

12-
<artifactId>oracle-bmc-java-sdk-common</artifactId>
13-
<name>Oracle Bare Metal Cloud Services SDK - Common</name>
14-
<description>This project contains the common runtime components of the SDK used for Oracle Bare Metal Cloud Services</description>
12+
<artifactId>oci-java-sdk-common</artifactId>
13+
<name>Oracle Cloud Infrastructure SDK - Common</name>
14+
<description>This project contains the common runtime components of the SDK used for Oracle Cloud Infrastructure</description>
1515
<url>https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/javasdk.htm</url>
1616

1717
<properties>

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

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,24 @@
2323
import lombok.RequiredArgsConstructor;
2424

2525
/**
26-
* Simple implementation to read BMC configuration files.
26+
* Simple implementation to read OCI configuration files.
2727
* <p>
2828
* Note, config files <b>MUST</b> contain a "DEFAULT" profile, else validation
2929
* will fail. Additional profiles are optional.
3030
*/
31+
@lombok.extern.slf4j.Slf4j
3132
public final class ConfigFileReader {
3233
/**
3334
* Default location of the config file.
3435
*/
35-
public static final String DEFAULT_FILE_PATH = "~/.oraclebmc/config";
36+
public static final String DEFAULT_FILE_PATH = "~/.oci/config";
37+
38+
/**
39+
* The fallback default location of the config file. If and only if the {@link #DEFAULT_FILE_PATH} does not exist,
40+
* this fallback default location will be used.
41+
*/
42+
public static final String FALLBACK_DEFAULT_FILE_PATH = "~/.oraclebmc/config";
43+
3644
private static final String DEFAULT_PROFILE_NAME = "DEFAULT";
3745

3846
/**
@@ -56,7 +64,27 @@ public static ConfigFile parseDefault() throws IOException {
5664
* if the file could not be read.
5765
*/
5866
public static ConfigFile parseDefault(@Nullable String profile) throws IOException {
59-
return parse(DEFAULT_FILE_PATH, profile);
67+
File effectiveFile = null;
68+
69+
File defaultFile = new File(expandUserHome(DEFAULT_FILE_PATH));
70+
File fallbackDefaultFile = new File(expandUserHome(FALLBACK_DEFAULT_FILE_PATH));
71+
72+
if (defaultFile.exists() && defaultFile.isFile()) {
73+
effectiveFile = defaultFile;
74+
} else if (fallbackDefaultFile.exists() && fallbackDefaultFile.isFile()) {
75+
effectiveFile = fallbackDefaultFile;
76+
}
77+
78+
if (effectiveFile != null) {
79+
LOG.debug("Loading config file from: {}", effectiveFile);
80+
return parse(effectiveFile.getAbsolutePath(), profile);
81+
} else {
82+
throw new IOException(
83+
String.format(
84+
"Can't load the default config from '%s' or '%s' because it does not exist or it is not a file.",
85+
defaultFile.getAbsolutePath(),
86+
fallbackDefaultFile.getAbsolutePath()));
87+
}
6088
}
6189

6290
/**
@@ -149,7 +177,7 @@ public static ConfigFile parse(
149177
private ConfigFileReader() {}
150178

151179
/**
152-
* ConfigFile represents a simple lookup mechanism for a BMC config file.
180+
* ConfigFile represents a simple lookup mechanism for a OCI config file.
153181
*/
154182
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
155183
public static final class ConfigFile {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.regex.Pattern;
77

88
/**
9-
* Oracle Bare Metal Cloud Services unique ID.
9+
* Oracle Cloud Infrastructure unique ID.
1010
* <p>
1111
* See <a href="https://docs.us-phoenix-1.oraclecloud.com/Content/GSG/Concepts/concepts.htm#ocid">documentation</a>.
1212
*/

‎bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.io.InputStream;
77

88
/**
9-
* Base interface used provide required information to sign requests to Oracle Bare Metal Services.
9+
* Base interface used provide required information to sign requests to Oracle Cloud Infrastructure.
1010
* <p>
1111
* Implementations may choose to provide hints about the cacheability of the keyId and privateKey using
1212
* {@link AuthCachingPolicy} (optional).

‎bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
/**
1717
* Implementation of {@link AuthenticationDetailsProvider} that uses a standard
18-
* BMC configuration file as an input.
18+
* OCI configuration file as an input.
1919
*/
2020
@ToString
2121
public class ConfigFileAuthenticationDetailsProvider implements AuthenticationDetailsProvider {
@@ -39,7 +39,7 @@ public ConfigFileAuthenticationDetailsProvider(String profile) throws IOExceptio
3939
* Creates a new instance.
4040
*
4141
* @param configurationFilePath
42-
* path to the BMC configuration file
42+
* path to the OCI configuration file
4343
* @param profile
4444
* profile to load, optional
4545
* @throws IOException

0 commit comments

Comments
 (0)