App registration: fix URI validation for a docker artifact

Added docker artifact regex validation
Added tests for docker artifact
Resolves #814

Author: oodamien

ui/src/app/apps/apps-register/apps-register.validator.spec.ts

@@ -1,5 +1,5 @@
-import {FormControl, FormGroup} from '@angular/forms';
-import {AppsRegisterValidator} from './apps-register.validator';
+import { FormControl, FormGroup } from '@angular/forms';
+import { AppsRegisterValidator } from './apps-register.validator';
 
 /**
  * Test Application Register Validator functions {AppsRegisterValidator}.
@@ -30,14 +30,13 @@ describe('AppsRegisterValidator', () => {
 
   });
 
-  // TODO: to complete
   describe('uri', () => {
     it('invalid', () => {
       [
         ' ',
-        /*'http://foo. bar',
+        'http://foo. bar',
         'http://foo.b@r',
-        'http://foo.b%%r',*/
+        'http://foo.b%%r',
         'f'
       ].forEach((mock) => {
         const uri: FormControl = new FormControl(mock);
@@ -57,6 +56,11 @@ describe('AppsRegisterValidator', () => {
         'http://foo.bar:bar.foo:bar',
         'http://foo.bar:bar.foo-foo:bar',
         'http://foo.bar:bar.foo-foo:bar-bar',
+        'docker:sabby/xfmr:0.0.7.BUILD-SNAPSHOT',
+        'http://bit.ly/Celsius-BUILD-SNAPSHOT-stream-applications-kafka-10-maven',
+        'http://bit.ly/Clark-BUILD-SNAPSHOT-task-applications-maven',
+        'docker:springcloudstream/counter-sink-rabbit:1.3.1.RELEASE',
+        'docker:spring_cloud_stream/counter-sink_rabbit:1.3.1.RELEASE'
       ].forEach((mock) => {
         const uri: FormControl = new FormControl(mock);
         const result = AppsRegisterValidator.uri(uri);

ui/src/app/apps/apps-register/apps-register.validator.ts

@@ -1,4 +1,4 @@
-import {FormControl, FormGroup} from '@angular/forms';
+import { FormControl } from '@angular/forms';
 
 /**
  * Validators for Register Form
@@ -18,6 +18,12 @@ export class AppsRegisterValidator {
    */
   static uriRegex = /^([a-zA-Z0-9-]+:\/\/)([\\w\\.:-]+)?([a-zA-Z0-9-\/.:-]+)*$/;
 
+
+  /**
+   * Docker artifact regex
+   */
+  static dockerArtifactRegex = /^(docker:)([a-zA-Z0-9-.-_]*)(\/)([a-zA-Z0-9-.-_]*)(\:)([a-zA-Z0-9-.-_]*)$/;
+
   /**
    * Validate the name conditions: no space, 2 characters min, no specials characters
    *
@@ -30,7 +36,7 @@ export class AppsRegisterValidator {
     }
 
     if (!AppsRegisterValidator.nameRegex.test(formControl.value)) {
-      return {invalid: true};
+      return { invalid: true };
     }
 
     return null;
@@ -47,8 +53,8 @@ export class AppsRegisterValidator {
       return null;
     }
 
-    if (!AppsRegisterValidator.uriRegex.test(formControl.value)) {
-      return {invalid: true};
+    if (!AppsRegisterValidator.uriRegex.test(formControl.value) && !AppsRegisterValidator.dockerArtifactRegex.test(formControl.value)) {
+      return { invalid: true };
     }
 
     return null;