Merge pull request #24 from i2-open/0.6-dev

Revised verison numbers to 0.6.0-Alpha

Author: independentid

i2scim-core/src/main/java/com/independentid/scim/protocol/ConfigResponse.java

@@ -21,7 +21,6 @@
 import com.independentid.scim.core.err.ForbiddenException;
 import com.independentid.scim.core.err.NotFoundException;
 import com.independentid.scim.core.err.ScimException;
-import com.independentid.scim.resource.ComplexValue;
 import com.independentid.scim.resource.ScimResource;
 import com.independentid.scim.schema.ResourceType;
 import com.independentid.scim.schema.Schema;
@@ -52,8 +51,8 @@ public class ConfigResponse extends ListResponse {
 
     /**
      * Builds a SCIM response based on the internal SCIM operational configuration (rather than pulled from backend)
-     * @param ctx   The {@link RequestCtx} object containing the GET request (either by URL or by POST .search)
-     * @param configMgr The system {@link ConfigMgr} object containing the operational configuration and schema
+     * @param ctx        The {@link RequestCtx} object containing the GET request (either by URL or by POST .search)
+     * @param configMgr  The system {@link ConfigMgr} object containing the operational configuration and schema
      * @param maxResults The maximum number of results that may be returned.
      */
     public ConfigResponse(RequestCtx ctx, ConfigMgr configMgr, int maxResults) {
@@ -117,7 +116,7 @@ public ConfigResponse(RequestCtx ctx, ConfigMgr configMgr, int maxResults) {
 
                     for (Schema sch : smgr.getSchemas()) {
                         try {
-                            if(sch.getId().equals(ScimParams.SCHEMA_SCHEMA_Common))
+                            if (sch.getId().equals(ScimParams.SCHEMA_SCHEMA_Common))
                                 continue;
                             this.entries.add(new ScimResource(smgr, sch.toJsonNode(), ScimParams.PATH_TYPE_SCHEMAS));
                         } catch (ParseException | ScimException e) {
@@ -237,7 +236,7 @@ public void serializeServiceProviderConfig(RequestCtx ctx, JsonGenerator gen) th
         // Identify the server
         gen.writeStringField("ProductName", "Independent Identity i2scim Directory");
         //gen.writeStringField("ProductId", "BigDirectory");
-        gen.writeStringField("ProductVersion", "V0.5.0-Alpha");
+        gen.writeStringField("ProductVersion", "V0.6.0-Alpha");
 
 
         /* Not defined in standard schema.

pkg-i2scim-prov-memory/4-i2scim-memory-deploy.yml

@@ -9,7 +9,7 @@ metadata:
     prometheus.io/path: /metrics
   labels:
     app.kubernetes.io/name: i2scim-mem
-    app.kubernetes.io/version: 0.5.0-Alpha
+    app.kubernetes.io/version: 0.6.0-Alpha
   name: i2scim-mem
   namespace: scim-mem
 ---
@@ -23,17 +23,17 @@ metadata:
     prometheus.io/path: /metrics
   labels:
     app.kubernetes.io/name: i2scim-mem
-    app.kubernetes.io/version: 0.5.0-Alpha
+    app.kubernetes.io/version: 0.6.0-Alpha
   name: i2scim-mem
   namespace: scim-mem
 spec:
   ports:
-  - name: http
-    port: 8080
-    targetPort: 8080
+    - name: http
+      port: 8080
+      targetPort: 8080
   selector:
     app.kubernetes.io/name: i2scim-mem
-    app.kubernetes.io/version: 0.5.0-Alpha
+    app.kubernetes.io/version: 0.6.0-Alpha
   type: LoadBalancer
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -46,8 +46,8 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
   name: view
 subjects:
-- kind: ServiceAccount
-  name: i2scim-mem
+  - kind: ServiceAccount
+    name: i2scim-mem
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -59,15 +59,15 @@ metadata:
     prometheus.io/path: /metrics
   labels:
     app.kubernetes.io/name: i2scim-mem
-    app.kubernetes.io/version: 0.5.0-Alpha
+    app.kubernetes.io/version: 0.6.0-Alpha
   name: i2scim-mem
   namespace: scim-mem
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: i2scim-mem
-      app.kubernetes.io/version: 0.5.0-Alpha
+      app.kubernetes.io/version: 0.6.0-Alpha
   template:
     metadata:
       annotations:
@@ -77,66 +77,66 @@ spec:
         prometheus.io/path: /metrics
       labels:
         app.kubernetes.io/name: i2scim-mem
-        app.kubernetes.io/version: 0.5.0-Alpha
+        app.kubernetes.io/version: 0.6.0-Alpha
       namespace: scim-mem
     spec:
       containers:
-      - env:
-        - name: KUBERNETES_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        envFrom:
-        - secretRef:
-            name: i2scim-root
-        - configMapRef:
-            name: i2scim-mem-config
-        image: independentid/i2scim-mem:0.5.0-Alpha
-        imagePullPolicy: Always
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /q/health/live
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 0
-          periodSeconds: 30
-          successThreshold: 1
-          timeoutSeconds: 10
-        name: i2scim-mem
-        ports:
-        - containerPort: 8080
-          name: http
-          protocol: TCP
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /q/health/ready
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 5
-          periodSeconds: 30
-          successThreshold: 1
-          timeoutSeconds: 10
-        volumeMounts:
-        - mountPath: /config
-          name: configschema
-          readOnly: true
-          subPath: ""
-        - mountPath: /scim
-          name: i2scim-pvc
-          readOnly: false
-          subPath: ""
+        - env:
+            - name: KUBERNETES_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          envFrom:
+            - secretRef:
+                name: i2scim-root
+            - configMapRef:
+                name: i2scim-mem-config
+          image: independentid/i2scim-mem:0.6.0-Alpha
+          imagePullPolicy: Always
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /q/health/live
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 0
+            periodSeconds: 30
+            successThreshold: 1
+            timeoutSeconds: 10
+          name: i2scim-mem
+          ports:
+            - containerPort: 8080
+              name: http
+              protocol: TCP
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /q/health/ready
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 5
+            periodSeconds: 30
+            successThreshold: 1
+            timeoutSeconds: 10
+          volumeMounts:
+            - mountPath: /config
+              name: configschema
+              readOnly: true
+              subPath: ""
+            - mountPath: /scim
+              name: i2scim-pvc
+              readOnly: false
+              subPath: ""
       imagePullSecrets:
-      - name: regcred
+        - name: regcred
       serviceAccount: i2scim-mem
       volumes:
-      - configMap:
-          defaultMode: 292
-          name: i2scim-config-schema
-          optional: false
-        name: configschema
-      - name: i2scim-pvc
-        persistentVolumeClaim:
-          claimName: i2scim-pvc
-          readOnly: false
+        - configMap:
+            defaultMode: 292
+            name: i2scim-config-schema
+            optional: false
+          name: configschema
+        - name: i2scim-pvc
+          persistentVolumeClaim:
+            claimName: i2scim-pvc
+            readOnly: false