Update Stream deployment properties validation key

Update regex
Update tests

Author: oodamien

ui/src/app/streams/stream-deploy/stream-deploy.validator.spec.ts

@@ -45,7 +45,9 @@ describe('StreamsDefinitionValidator', () => {
         'aaa111.121321aaa',
         'aaa111.1213_21aaa',
         'aaa111.1213-21aaa',
-        'aaaa.aaaa.aaaa'
+        'aaaa.aaaa.aaaa',
+        'metrics.schedule-interval',
+        'applicationMetrics.destination'
       ].forEach((mock) => {
         const control: FormControl = new FormControl(mock);
         expect(StreamDeployValidator.key(control)).toBeNull();
@@ -76,7 +78,9 @@ describe('StreamsDefinitionValidator', () => {
         'version.file',
         'deployer.*.foo',
         'deployer.file.foo',
-        'spring.cloud.dataflow.skipper.platformName'
+        'spring.cloud.dataflow.skipper.platformName',
+        'app.*.spring.cloud.stream.bindings.applicationMetrics.destination',
+        'app.*.spring.cloud.stream.metrics.schedule-interval'
       ].forEach((mock) => {
         const control: FormControl = new FormControl(mock);
         expect(StreamDeployValidator.keyProperty(control)).toBeNull();
@@ -108,6 +112,14 @@ describe('StreamsDefinitionValidator', () => {
       result = StreamDeployValidator.validateDeploymentProperties(formControl);
       expect(result).toBe(undefined);
 
+      formControl.setValue('app.*.spring.cloud.stream.bindings.applicationMetrics.destination=metrics');
+      result = StreamDeployValidator.validateDeploymentProperties(formControl);
+      expect(result).toBe(undefined);
+
+      formControl.setValue('app.*.spring.cloud.stream.metrics.schedule-interval=PT10S');
+      result = StreamDeployValidator.validateDeploymentProperties(formControl);
+      expect(result).toBe(undefined);
+
       formControl.setValue('baz');
       result = StreamDeployValidator.validateDeploymentProperties(formControl);
       expect(result.validateDeploymentProperties.reason).toBe('Invalid deployment property "baz" must contain a single "=".');

ui/src/app/streams/stream-deploy/stream-deploy.validator.ts

@@ -18,7 +18,7 @@ export class StreamDeployValidator {
   /**
    * PropertyKey regex
    */
-  static propertyKeyRegex = /^(deployer|app|version)(\.\*)?([.][a-zA-Z0-9]{2,50}?)*$/;
+  static propertyKeyRegex = /^(deployer|app|version)(\.\*)?([.][a-zA-Z0-9-\-\_]{2,50}?)*$/;
   /**
    * PropertyKey regex
    */