New Release v1.3.0 for OCI Service Broker

jayasheelankumar · web-flow · commit 46ff7c93aa42 · 2019-09-12T15:07:26.000+05:30
- Adding support for Mumbai (BOM), Zurich (ZRH), Sao Paulo (GRU), Sydney (SYD) regions
- Adding support to update license type in ATP and ADW Service
- Adding support for autoscaling in ATP and ADW Service

Co-authored-by: Ashokkumar Kannan ashokkumar.kannan@oracle.com
Co-authored-by: Jayasheelan Kumar jayasheelan.kumar@oracle.com
Co-authored-by: Naman Mehta naman.mehta@oracle.com
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+[1.3.0]
+
+- Adding support for Mumbai (BOM), Zurich (ZRH), Sao Paulo (GRU), Sydney (SYD) regions
+- Adding support to update license type in ATP and ADW Service
+- Adding support for autoscaling in ATP and ADW Service
+
 [1.2.1]
 
 - Minor Update to use unified API for ATP/ADW service. Internal change with no customer impact
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ See the [Documentation](charts/oci-service-broker/README.md#oci-service-broker)
 The OCI Service Broker is packaged as Helm chart for making it easy to install in Kubernetes Clusters. The chart can be downloaded from below URL.
 
 ```
-https://github.com/oracle/oci-service-broker/releases/download/v1.2.1/oci-service-broker-1.2.1.tgz
+https://github.com/oracle/oci-service-broker/releases/download/v1.3.0/oci-service-broker-1.3.0.tgz
 ```
 
 ## Samples
diff --git a/charts/oci-service-broker/Chart.yaml b/charts/oci-service-broker/Chart.yaml
@@ -5,4 +5,4 @@
 apiVersion: v1
 description: A Helm chart for installing OCI Service Broker into a Kubernetes cluster
 name: oci-service-broker
-version: 1.2.1
+version: 1.3.0
diff --git a/charts/oci-service-broker/docs/adw.md b/charts/oci-service-broker/docs/adw.md
@@ -60,6 +60,7 @@ To provision, an ADW service user needs to provide the following details:
 | `storageSizeTBs` | Size of the DB Storage in Terrabytes.                               | int    | yes       |
 | `password`       | ADW Service will pre-provision a DB Admin user when it provisions an ADW instance. The user needs to provide a password to be set for this Admin user.<br>The OCI ADW service requires the password to satisfy the below rules.<br><ul><li>The length should be 12 to 18 characters.</li><li>A password must include an upper case, lower case, and special character.</li></ul> | string | yes       |
 | `licenseType`    | Use your existing database software licenses(BYOL) or Subscribe to new database software licenses and the Database Cloud Service.<br>Valid values are:<ul><li>BYOL</li><li>NEW</li></ul>.                         | string | yes       |
+| `autoScaling`    | The flag to enable auto-scaling in ADW Instance. Allows system to use up to three times the provisioned number of cores as the workload increases. By default, this flag is set to false.                   | boolean| no        |
 | `freeFormTags`   | free form tags that are to be used for tagging the ADW instance.    | object | no        |
 | `definedTags`    | The defined tags that are to be used for tagging the ADW instance.  | object | no        |
 
diff --git a/charts/oci-service-broker/docs/atp.md b/charts/oci-service-broker/docs/atp.md
@@ -60,6 +60,7 @@ To provision, an ATP service user needs to provide the following details:
 | `storageSizeTBs` | Size of the DB Storage in Terrabytes.                               | int    | yes       |
 | `password`       | ATP Service will pre-provision a DB Admin user when it provisions an ATP instance. The user needs to provide a password to be set for this Admin user.<br>The OCI ATP service requires the password to satisfy the below rules.<br><ul><li>The length should be 12 to 18 characters.</li><li>A password must include an upper case, lower case, and special character.</li></ul> | string | yes       |
 | `licenseType`    | Use your existing database software licenses(BYOL) or Subscribe to new database software licenses and the Database Cloud Service.<br>Valid values are:<ul><li>BYOL</li><li>NEW</li></ul>.                         | string | yes       |
+| `autoScaling`    | The flag to enable auto-scaling in ATP Instance. Allows system to use up to three times the provisioned number of cores as the workload increases. By default, this flag is set to false.                    | boolean| no        |
 | `freeFormTags`   | free form tags that are to be used for tagging the ATP instance.    | object | no        |
 | `definedTags`    | The defined tags that are to be used for tagging the ATP instance.  | object | no        |
 
diff --git a/charts/oci-service-broker/docs/installation.md b/charts/oci-service-broker/docs/installation.md
@@ -69,7 +69,7 @@ brew update && brew install kubernetes-service-catalog-client
 The OCI Service Broker is packaged as Helm chart for making it easy to install in Kubernetes. The chart is available at [charts/oci-service-broker](../) directory.
 
 ```plain
-https://github.com/oracle/oci-service-broker/releases/download/v1.2.1/oci-service-broker-1.2.1.tgz
+https://github.com/oracle/oci-service-broker/releases/download/v1.3.0/oci-service-broker-1.3.0.tgz
 ```
 
 ### OCI credentials
@@ -107,7 +107,7 @@ The value for `ociCredentials.secretName` should contain the name of the Kuberne
 For quickly testing out OCI Service Broker, TLS can be disabled and an embedded etcd container can be used. This can be used for quickly setting up the Broker but not recommended in PRODUCTION environments. Please refer to [Recommended Setup](#recommended-setup) for PRODUCTION environments
 
 ```bash
- helm install https://github.com/oracle/oci-service-broker/releases/download/v1.2.1/oci-service-broker-1.2.1.tgz  --name oci-service-broker \
+ helm install https://github.com/oracle/oci-service-broker/releases/download/v1.3.0/oci-service-broker-1.3.0.tgz  --name oci-service-broker \
   --set ociCredentials.secretName=ocicredentials \
   --set storage.etcd.useEmbedded=true \
   --set tls.enabled=false
@@ -200,7 +200,7 @@ Please note that the names in keys i.e. keyStore.password and keyStore must not
 
 Replace the values of --set arguments with your appropriate values to install the OCI Service Broker. User needs to point docker images either from OCIR or from their repository.
 ```bash
- helm install https://github.com/oracle/oci-service-broker/releases/download/v1.2.1/oci-service-broker-1.2.1.tgz  --name oci-service-broker \
+ helm install https://github.com/oracle/oci-service-broker/releases/download/v1.3.0/oci-service-broker-1.3.0.tgz  --name oci-service-broker \
   --set ociCredentials.secretName=ocicredentials \
   --set tls.secretName=certsecret \
   --set storage.etcd.servers=<comma separated list of etcd servers>
@@ -245,7 +245,7 @@ Refer [Restrict access to Service Catalog resources using RBAC](security.md#rest
 Sample files for various services are available under [`oci-service-broker/samples`](../samples) directory inside the charts. The below command extracts chart that contains the sample files.
 
 ```bash
-curl https://github.com/oracle/oci-service-broker/releases/download/v1.2.1/oci-service-broker-1.2.1.tgz | tar xz
+curl https://github.com/oracle/oci-service-broker/releases/download/v1.3.0/oci-service-broker-1.3.0.tgz | tar xz
 ```
 
 Create a `ClusterServiceBroker` resource with OCI Service Broker URL to register the broker. Use the below register yaml file after updating the namespace of the OCI Service Broker.
diff --git a/charts/oci-service-broker/samples/adw/adw-instance-plain.yaml b/charts/oci-service-broker/samples/adw/adw-instance-plain.yaml
@@ -17,6 +17,7 @@ spec:
     storageSizeTBs: 1
     password: s123456789S@
     licenseType: NEW
+    autoScaling: false
     freeFormTags:
       testtag: demo
 #   definedTags:
diff --git a/charts/oci-service-broker/samples/adw/adw-instance.yaml b/charts/oci-service-broker/samples/adw/adw-instance.yaml
@@ -16,6 +16,7 @@ spec:
     cpuCount: 1
     storageSizeTBs: 1
     licenseType: new
+    autoScaling: false
     freeFormTags:
       testtag: demo
 #   definedTags:
diff --git a/charts/oci-service-broker/samples/atp/atp-instance-plain.yaml b/charts/oci-service-broker/samples/atp/atp-instance-plain.yaml
@@ -17,6 +17,7 @@ spec:
     storageSizeTBs: 1
     password: s123456789S@
     licenseType: NEW
+    autoScaling: false
     freeFormTags:
       testtag: demo
 #   definedTags:
diff --git a/charts/oci-service-broker/samples/atp/atp-instance.yaml b/charts/oci-service-broker/samples/atp/atp-instance.yaml
@@ -16,6 +16,7 @@ spec:
     cpuCount: 1
     storageSizeTBs: 1
     licenseType: NEW
+    autoScaling: false
     freeFormTags:
       testtag: demo
 #   definedTags:
diff --git a/charts/oci-service-broker/values.yaml b/charts/oci-service-broker/values.yaml
@@ -14,7 +14,7 @@ image:
   repository: iad.ocir.io/oracle/oci-service-broker
 
   # Tag of the image
-  tag:  1.2.1
+  tag:  1.3.0
 
   # The image pull policy
   pullPolicy: Always
diff --git a/oci-service-broker/build.gradle b/oci-service-broker/build.gradle
@@ -30,23 +30,23 @@ apply plugin: 'maven-publish'
 archivesBaseName = 'oci-service-broker'
 
 // Sometimes, the version has to be overridden from command line
-version = project.hasProperty('version_num') ? project.getProperty('version_num') : '1.2.1'
+version = project.hasProperty('version_num') ? project.getProperty('version_num') : '1.3.0'
 ext.dockerGroup = 'iad.ocir.io/oci-cnp-dev'
 mainClassName = 'com.oracle.oci.osb.Broker'
 
 sourceCompatibility = 10
 
 ext {
-    ociSdkVersion = "1.5.6"
+    ociSdkVersion = "1.6.3"
     jerseyVersion = "2.27"
     hk2Version = "2.5.0-b42"
     hamcrestVersion = "1.3"
-    jacksonVersion = "2.9.8";
-    jacksonDatabindVersion = "2.9.8";
+    jacksonVersion = "2.9.9";
+    jacksonDatabindVersion = "2.9.9";
     javaxwsrsVersion = "2.1.1"
     bedrockVersion = "5.0.7"
     jetcdVersion = "0.3.0"
-    guvaVersion = "27.0.1-android"
+    guvaVersion = "27.1-jre"
     srcBuildRepo = project.hasProperty('src_build_repo') ? project.getProperty('src_build_repo') : "${projectDir}/src-build-repo/"
     unbundleOciSdk = project.hasProperty('unbundle_oci_java_sdk') ? project.getProperty('unbundle_oci_java_sdk').toBoolean() : false
     depLibJarPath = "build/lib"
diff --git a/oci-service-broker/download_SDK_libs.sh b/oci-service-broker/download_SDK_libs.sh
@@ -9,15 +9,15 @@
 #sdk jars and their dependency jars. The jars are written to libs directory.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SDK_VERSION="1.5.6"
+SDK_VERSION="1.6.3"
 TEMP_DIR="/tmp/oci-java-sdk"
 rm -rf ${TEMP_DIR}
 mkdir -p ${TEMP_DIR} 
 mkdir -p ${SCRIPT_DIR}/libs
 echo "Downloading oci-java-sdk version v${SDK_VERSION} and the dependent libraries..."
 curl -sSL https://github.com/oracle/oci-java-sdk/releases/download/v${SDK_VERSION}/oci-java-sdk.zip -o ${TEMP_DIR}/oci-java-sdk.zip
 unzip -qq ${TEMP_DIR}/oci-java-sdk.zip -d ${TEMP_DIR}
-cp ${TEMP_DIR}/lib/oci-java-sdk-full-1.5.6.jar ${SCRIPT_DIR}/libs/
+cp ${TEMP_DIR}/lib/oci-java-sdk-full-1.6.3.jar ${SCRIPT_DIR}/libs/
 cp ${TEMP_DIR}/third-party/lib/*.jar  ${SCRIPT_DIR}/libs/
 rm -rf ${TEMP_DIR}
 echo "oci-java-sdk and the dependent libraries are downloaded to ${SCRIPT_DIR}/libs directory"
diff --git a/oci-service-broker/src/main/java/com/oracle/oci/osb/adapters/adb/AutonomousDatabaseAdapter.java b/oci-service-broker/src/main/java/com/oracle/oci/osb/adapters/adb/AutonomousDatabaseAdapter.java
@@ -229,6 +229,8 @@ public ServiceInstanceProvision provisionServiceInstance(String instanceId, Serv
             Integer storageSize = RequestUtil.getIntegerParameter(reqParams, REQ_PARAM_STORAGE_SIZE_TB, true);
             String password = RequestUtil.getNonEmptyStringParameter(reqParams, REQ_PARAM_PASSWORD);
             String licenseModelStr = RequestUtil.getNonEmptyStringParameter(reqParams, REQ_PARAM_LICENSE_MODEL);
+            boolean autoScalingEnabled = RequestUtil.getBooleanParameterDefaultValueFalse(reqParams,
+                    Constants.AUTOSCALING_ENABLED, false);
             Map<String, Map<String, Object>> definedTags = RequestUtil.getMapMapObjectParameter(reqParams, Constants
                     .DEFINED_TAGS, false);
             if (!(LicenseModel.NEW.toString().equalsIgnoreCase(licenseModelStr) || LicenseModel.BYOL.toString()
@@ -248,7 +250,8 @@ public ServiceInstanceProvision provisionServiceInstance(String instanceId, Serv
             adbSvcData.putMetadata(Constants.DB_WORKLOAD_TYPE, getInstanceTypeString().toUpperCase());
 
             AutonomousDatabaseInstance autonomousDatabaseInstance = adbServiceClient.create(name, dbName,
-                    getDBWorkload(getInstanceTypeString()), cpuCount, storageSize, freeFormTags, definedTags, password, isLicenseIncluded);
+                    getDBWorkload(getInstanceTypeString()), cpuCount, storageSize, freeFormTags, definedTags, password,
+                    isLicenseIncluded, autoScalingEnabled);
 
             adbSvcData.setOcid(autonomousDatabaseInstance.getId());
             response.setStatusCode(HTTP_ACCEPTED);
@@ -297,6 +300,15 @@ public ServiceInstanceAsyncOperation updateServiceInstance(String instanceId, Se
         Integer cpuCount = RequestUtil.getIntegerParameter(params, REQ_PARAM_CPU_COUNT, false);
         Integer storageSize = RequestUtil.getIntegerParameter(params, REQ_PARAM_STORAGE_SIZE_TB, false);
         Map<String, String> tags = RequestUtil.getMapStringParameter(params, REQ_PARAM_TAGS, false);
+        String licenseModelStr = RequestUtil.getNonEmptyStringParameter(params, REQ_PARAM_LICENSE_MODEL);
+        boolean autoScalingEnabled = RequestUtil.getBooleanParameterDefaultValueFalse(params, Constants.AUTOSCALING_ENABLED, false);
+
+        if (licenseModelStr != null && (!(LicenseModel.NEW.toString().equalsIgnoreCase(licenseModelStr) || LicenseModel.BYOL.toString()
+                .equalsIgnoreCase(licenseModelStr)))) {
+            LOGGER.severe("Invalid License Model : " + licenseModelStr);
+            throw Errors.invalidParameter(REQ_PARAM_LICENSE_MODEL);
+        }
+
         if(!tags.isEmpty()) {
             tags.put(Constants.OSB_INSTANCE_ID_LABEL, instanceId);
         }
@@ -305,7 +317,7 @@ public ServiceInstanceAsyncOperation updateServiceInstance(String instanceId, Se
                 .DEFINED_TAGS, false);
 
         try (AutonomousDatabaseOCIClient adbServiceClient = new AutonomousDatabaseOCIClient(provider, compartmentId)) {
-            adbServiceClient.update(svcData.getOcid(), name, cpuCount, storageSize, tags, definedTags);
+            adbServiceClient.update(svcData.getOcid(), name, cpuCount, storageSize, tags, definedTags, licenseModelStr, autoScalingEnabled);
             response.setStatusCode(HTTP_ACCEPTED);
         } catch(UpdateNotRequiredException ue) {
             response.setStatusCode(HTTP_OK);
@@ -532,9 +544,11 @@ private boolean isSameInstance(AutonomousDatabaseInstance instance, Map<String,
         Integer cpuCount = RequestUtil.getIntegerParameter(reqParams, REQ_PARAM_CPU_COUNT, false);
         Integer storageSize = RequestUtil.getIntegerParameter(reqParams, REQ_PARAM_STORAGE_SIZE_TB, false);
         String licenseModel = RequestUtil.getStringParameter(reqParams, REQ_PARAM_LICENSE_MODEL, false);
+        boolean isAutoScalingEnabled = RequestUtil.getBooleanParameterDefaultValueFalse(reqParams,
+                                                                        Constants.AUTOSCALING_ENABLED, false);
         if (instance.getDisplayName().equals(displayName) && instance.getCpuCoreCount() == cpuCount &&
                 instance.getStorageSizeInGBs() == storageSize && instance.getDbName().equals(dbName) && instance
-                .getLicenseModel().toString().equalsIgnoreCase(licenseModel)) {
+                .getLicenseModel().toString().equalsIgnoreCase(licenseModel) && instance.isAutoScalingEnabled() == isAutoScalingEnabled) {
             return true;
         }
         return false;
diff --git a/oci-service-broker/src/main/java/com/oracle/oci/osb/adapters/adb/AutonomousDatabaseInstance.java b/oci-service-broker/src/main/java/com/oracle/oci/osb/adapters/adb/AutonomousDatabaseInstance.java
@@ -18,6 +18,7 @@ public class AutonomousDatabaseInstance {
     private int storageSizeInGBs;
     private String dbName;
     private AutonomousDatabaseAdapter.LicenseModel licenseModel;
+    private boolean autoScalingEnabled;
     private Map<String, String> freeformTags;
     private LifecycleState lifecycleState;
 
@@ -31,7 +32,8 @@ public enum TYPE {
 
 
     public AutonomousDatabaseInstance(String id, AutonomousDatabaseAdapter.DBWorkloadType dbWorkloadType, String displayName, int cpuCoreCount, int
-            storageSizeInGBs, String dbName, AutonomousDatabaseAdapter.LicenseModel licenseModel, Map<String, String> freeformTags, LifecycleState lifecycleState) {
+            storageSizeInGBs, String dbName, AutonomousDatabaseAdapter.LicenseModel licenseModel, boolean autoScalingEnabled,
+                                      Map<String, String> freeformTags, LifecycleState lifecycleState) {
         this.id = id;
         this.dbWorkloadType = dbWorkloadType;
         this.displayName = displayName;
@@ -41,6 +43,7 @@ public AutonomousDatabaseInstance(String id, AutonomousDatabaseAdapter.DBWorkloa
         this.licenseModel = licenseModel;
         this.freeformTags = freeformTags;
         this.lifecycleState = lifecycleState;
+        this.autoScalingEnabled = autoScalingEnabled;
     }
 
     public static LifecycleState lifecycleState(String lifecycleStateStr) {
@@ -76,6 +79,8 @@ public int getStorageSizeInGBs() {
         return storageSizeInGBs;
     }
 
+    public boolean isAutoScalingEnabled() { return autoScalingEnabled; }
+
     public LifecycleState getLifecycleState() {
         return lifecycleState;
     }
diff --git a/oci-service-broker/src/main/java/com/oracle/oci/osb/adapters/adb/AutonomousDatabaseOCIClient.java b/oci-service-broker/src/main/java/com/oracle/oci/osb/adapters/adb/AutonomousDatabaseOCIClient.java
diff --git a/oci-service-broker/src/main/java/com/oracle/oci/osb/util/Constants.java b/oci-service-broker/src/main/java/com/oracle/oci/osb/util/Constants.java
diff --git a/oci-service-broker/src/main/java/com/oracle/oci/osb/util/RequestUtil.java b/oci-service-broker/src/main/java/com/oracle/oci/osb/util/RequestUtil.java
diff --git a/oci-service-broker/src/main/resources/adw-catalog.json b/oci-service-broker/src/main/resources/adw-catalog.json
diff --git a/oci-service-broker/src/main/resources/atp-catalog.json b/oci-service-broker/src/main/resources/atp-catalog.json
