Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Added
- N/A

## 1.2.48 - 2018-10-04
### Added
- Support for trusted partner images through application listings and subscriptions in the Compute service
- Support for object lifecycle policies in the Object Storage service
- Support for copying objects across regions in the Object Storage service
- Support for network address translation (NAT) gateways in the Networking service

## 1.2.47 - 2018-09-27
### Added
- Support for `paravirtualized` launch mode when importing images in the Compute service
Expand Down
4 changes: 2 additions & 2 deletions bmc-addons/bmc-apache-connector-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-addons</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion bmc-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions bmc-audit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
</dependency>
</dependencies>

Expand Down
30 changes: 15 additions & 15 deletions bmc-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>oci-java-sdk-bom</artifactId>
Expand All @@ -19,86 +19,86 @@
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<!-- Service modules, alpha sorted -->
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-audit</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-containerengine</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-core</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-database</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-dns</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-email</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-filestorage</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-identity</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-loadbalancer</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-objectstorage</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-resourcesearch</artifactId>
<optional>false</optional>
<version>1.2.47</version>
<version>1.2.48</version>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<optional>false</optional>
<artifactId>oci-java-sdk-addons-apache</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
</dependency>
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-keymanagement</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<optional>false</optional>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion bmc-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
7 changes: 4 additions & 3 deletions bmc-common/src/main/java/com/oracle/bmc/ConfigFileReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ public static ConfigFile parse(
}
}
if (!accumulator.foundDefaultProfile) {
throw new IllegalStateException(
"No DEFAULT profile was specified in the configuration");
LOG.info("No DEFAULT profile was specified in the configuration");
}
if (profile != null && !accumulator.configurationsByProfile.containsKey(profile)) {
throw new IllegalArgumentException(
Expand Down Expand Up @@ -198,7 +197,9 @@ public String get(String key) {
&& (accumulator.configurationsByProfile.get(profile).containsKey(key))) {
return accumulator.configurationsByProfile.get(profile).get(key);
}
return accumulator.configurationsByProfile.get(DEFAULT_PROFILE_NAME).get(key);
return accumulator.foundDefaultProfile
? accumulator.configurationsByProfile.get(DEFAULT_PROFILE_NAME).get(key)
: null;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ private BouncyCastleHelper() {
isProviderInstalled =
Security.getProvider("BC") != null || Security.getProvider("BCFIPS") != null;
try {
bouncyCastleProvider = (Provider) getBouncyCastleProviderClass().newInstance();
final Class bouncyCastleProviderClass = getBouncyCastleProviderClass();
bouncyCastleProvider = (Provider) bouncyCastleProviderClass.newInstance();
LOG.info("Instantiated provider: " + bouncyCastleProviderClass.getName());
} catch (InstantiationException | IllegalAccessException ex) {
LOG.error("Failed to instantiate provider", ex);
throw Throwables.propagate(ex);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@ public void noConfigFile() throws IOException {
ConfigFileReader.parse("src/test/resources/does_not_exist");
}

@Test(expected = IllegalStateException.class)
@Test
public void noDefaultProfile() throws IOException {
ConfigFileReader.parse("src/test/resources/unit_test_no_default_config");
final ConfigFile configFile =
ConfigFileReader.parse("src/test/resources/unit_test_no_default_config", "USER");
assertEquals("default_user", configFile.get("user"));
assertEquals("default_tenancy", configFile.get("tenancy"));
assertNull(configFile.get("region"));
}

@Test(expected = IllegalStateException.class)
Expand Down
4 changes: 2 additions & 2 deletions bmc-containerengine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions bmc-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>com.oracle.oci.sdk</groupId>
<artifactId>oci-java-sdk-common</artifactId>
<version>1.2.47</version>
<version>1.2.48</version>
</dependency>
</dependencies>

Expand Down
71 changes: 71 additions & 0 deletions bmc-core/src/main/java/com/oracle/bmc/core/Compute.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,16 @@ public interface Compute extends AutoCloseable {
*/
CaptureConsoleHistoryResponse captureConsoleHistory(CaptureConsoleHistoryRequest request);

/**
* Create a subscription for listing resource version for a compartment. It will take some time to propagate to all regions.
*
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
CreateAppCatalogSubscriptionResponse createAppCatalogSubscription(
CreateAppCatalogSubscriptionRequest request);

/**
* Creates a boot disk image for the specified instance or imports an exported image from the Oracle Cloud Infrastructure Object Storage service.
* <p>
Expand Down Expand Up @@ -135,6 +145,15 @@ public interface Compute extends AutoCloseable {
CreateInstanceConsoleConnectionResponse createInstanceConsoleConnection(
CreateInstanceConsoleConnectionRequest request);

/**
* Delete a subscription for a listing resource version for a compartment.
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
DeleteAppCatalogSubscriptionResponse deleteAppCatalogSubscription(
DeleteAppCatalogSubscriptionRequest request);

/**
* Deletes the specified console history metadata and the console history data.
* @param request The request object containing the details to send
Expand Down Expand Up @@ -220,6 +239,32 @@ DeleteInstanceConsoleConnectionResponse deleteInstanceConsoleConnection(
*/
ExportImageResponse exportImage(ExportImageRequest request);

/**
* Gets the specified listing.
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
GetAppCatalogListingResponse getAppCatalogListing(GetAppCatalogListingRequest request);

/**
* Retrieves the agreements for a particular resource version of a listing.
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
GetAppCatalogListingAgreementsResponse getAppCatalogListingAgreements(
GetAppCatalogListingAgreementsRequest request);

/**
* Gets the specified listing resource version.
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
GetAppCatalogListingResourceVersionResponse getAppCatalogListingResourceVersion(
GetAppCatalogListingResourceVersionRequest request);

/**
* Gets information about the specified boot volume attachment.
* @param request The request object containing the details to send
Expand Down Expand Up @@ -364,6 +409,32 @@ GetWindowsInstanceInitialCredentialsResponse getWindowsInstanceInitialCredential
*/
LaunchInstanceResponse launchInstance(LaunchInstanceRequest request);

/**
* Gets all resource versions for a particular listing.
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
ListAppCatalogListingResourceVersionsResponse listAppCatalogListingResourceVersions(
ListAppCatalogListingResourceVersionsRequest request);

/**
* Lists the published listings.
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
ListAppCatalogListingsResponse listAppCatalogListings(ListAppCatalogListingsRequest request);

/**
* Lists subscriptions for a compartment.
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
* @throws BmcException when an error occurs.
*/
ListAppCatalogSubscriptionsResponse listAppCatalogSubscriptions(
ListAppCatalogSubscriptionsRequest request);

/**
* Lists the boot volume attachments in the specified compartment. You can filter the
* list by specifying an instance OCID, boot volume OCID, or both.
Expand Down
Loading