New Release v1.3.1 for OCI Service Broker

- Minor Bug Fixes

Co-authored-by: Ashokkumar Kannan [email protected]
Co-authored-by: Jayasheelan Kumar [email protected]
Co-authored-by: Naman Mehta [email protected]

Author: jayasheelankumar

CHANGELOG.md

@@ -5,6 +5,10 @@ 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.1]
+
+- Minor Bug Fixes
+
 [1.3.0]
 
 - Adding support for Mumbai (BOM), Zurich (ZRH), Sao Paulo (GRU), Sydney (SYD) regions

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.3.0/oci-service-broker-1.3.0.tgz
+https://github.com/oracle/oci-service-broker/releases/download/v1.3.1/oci-service-broker-1.3.1.tgz
 ```
 
 ## Samples

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.3.0
+version: 1.3.1

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.3.0/oci-service-broker-1.3.0.tgz
+https://github.com/oracle/oci-service-broker/releases/download/v1.3.1/oci-service-broker-1.3.1.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.3.0/oci-service-broker-1.3.0.tgz  --name oci-service-broker \
+ helm install https://github.com/oracle/oci-service-broker/releases/download/v1.3.1/oci-service-broker-1.3.1.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.3.0/oci-service-broker-1.3.0.tgz  --name oci-service-broker \
+ helm install https://github.com/oracle/oci-service-broker/releases/download/v1.3.1/oci-service-broker-1.3.1.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.3.0/oci-service-broker-1.3.0.tgz | tar xz
+curl https://github.com/oracle/oci-service-broker/releases/download/v1.3.1/oci-service-broker-1.3.1.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.

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.3.0
+  tag:  1.3.1
 
   # The image pull policy
   pullPolicy: Always

oci-service-broker/build.gradle

@@ -30,7 +30,7 @@ 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.3.0'
+version = project.hasProperty('version_num') ? project.getProperty('version_num') : '1.3.1'
 ext.dockerGroup = 'iad.ocir.io/oci-cnp-dev'
 mainClassName = 'com.oracle.oci.osb.Broker'
 

oci-service-broker/src/main/java/com/oracle/oci/osb/model/Extra.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
+import java.util.Map;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Identity {
@@ -20,7 +21,7 @@ public class Identity {
     @JsonProperty("groups")
     private List<String> groups = null;
     @JsonProperty("extra")
-    private Extra extra;
+    private Map<String,List<String>> extra;
 
     @JsonProperty("username")
     public String getUsername() {
@@ -53,12 +54,12 @@ public void setGroups(List<String> groups) {
     }
 
     @JsonProperty("extra")
-    public Extra getExtra() {
+    public Map<String,List<String>> getExtra() {
         return extra;
     }
 
     @JsonProperty("extra")
-    public void setExtra(Extra extra) {
+    public void setExtra(Map<String,List<String>> extra) {
         this.extra = extra;
     }
 }

oci-service-broker/src/main/java/com/oracle/oci/osb/model/Identity.java

@@ -63,9 +63,11 @@ private void validAPIVersion(ContainerRequestContext ctx) {
                     //Ignore as error  will be thrown further down.
                 }
             }
+            LOGGER.fine("Invalid value for Broker API version: " + version);
             abortWithError(ctx, Errors.brokerAPIVersionHeaderInvalid(),
                     "Invalid value for Broker API version: " + version);
         } else {
+            LOGGER.fine("Broker API Version header missing in request");
             abortWithError(ctx, Errors.brokerAPIVersionHeaderMissing(),
                     "Broker API Version header missing in request");
         }
@@ -78,11 +80,13 @@ private void setOriginatingEntity(ContainerRequestContext ctx) {
         }
         String originatingIdentity = ctx.getHeaderString(Constants.IDENTITY_HEADER);
         if (originatingIdentity == null) {
+            LOGGER.fine("Broker Originating Identity header missing in request");
             abortWithError(ctx, Errors.brokerOriginatingIdentityHeaderMissing(),
                     "Broker Originating Identity header missing in request");
         }
         Identity identity = parseIdentity(originatingIdentity);
         if (identity == null) {
+            LOGGER.fine("Invalid value for header Broker Originating Identity: " + originatingIdentity);
             abortWithError(ctx, Errors.brokerOriginatingIdentityHeaderInvalid(),
                     "Invalid value for Broker Originating Identity: " + originatingIdentity);
         }