Merge branch 'dev' into feature/core-name-configuration

mesg-foundation · Sep 24, 2018 · ea64cae · ea64cae
2 parents f3b67c0 + 50bf400
commit ea64cae
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 21 deletions.
diff --git a/service/importer/assets/schema.go b/service/importer/assets/schema.go
diff --git a/service/importer/assets/schema.json b/service/importer/assets/schema.json
@@ -28,7 +28,7 @@
           "type": "object",
           "additionalProperties": false,
           "patternProperties": {
-            "^[a-zA-Z_-]+$": {
+            "^[0-9a-zA-Z_-]+$": {
               "$ref": "#/definitions/event"
             }
           }
@@ -42,7 +42,7 @@
           "type": "object",
           "additionalProperties": false,
           "patternProperties": {
-            "^[a-zA-Z_-]+$": {
+            "^[0-9a-zA-Z_-]+$": {
               "$ref": "#/definitions/task"
             }
           }
@@ -53,7 +53,7 @@
       "type": "object",
       "additionalProperties": false,
       "patternProperties": {
-        "^[a-zA-Z_-]+$": {
+        "^[0-9a-zA-Z_-]+$": {
           "$ref": "#/definitions/dependency",
           "required": [
             "image"
@@ -73,7 +73,7 @@
           "type": "object",
           "additionalProperties": false,
           "patternProperties": {
-            "^[a-zA-Z_-]+$": {
+            "^[0-9a-zA-Z_-]+$": {
               "type": "object",
               "additionalProperties": false,
               "required": [
@@ -131,7 +131,7 @@
           "type": "object",
           "additionalProperties": false,
           "patternProperties": {
-            "^[a-zA-Z_-]+$": {
+            "^[0-9a-zA-Z_-]+$": {
               "type": "object",
               "additionalProperties": false,
               "required": [

diff --git a/service/importer/tests/service-names-valid/Dockerfile b/service/importer/tests/service-names-valid/Dockerfile
@@ -0,0 +1 @@
+FROM node
diff --git a/service/importer/tests/service-names-valid/mesg.yml b/service/importer/tests/service-names-valid/mesg.yml
@@ -0,0 +1,28 @@
+name: "minimal-valid"
+
+events:
+  Name1-_:
+    name: "name"
+    data:
+      Name1-_:
+        name: "name"
+        type: String
+
+tasks:
+    Name1-_:
+      inputs:
+        Name1-_:
+          name: "name"
+          type: String
+
+      outputs:
+        Name1-_:
+          name: "name"
+          data:
+            Name1-_:
+              name: "name"
+              type: String
+
+dependencies:
+  Name1-_:
+    image: nginx
diff --git a/service/importer/validation_test.go b/service/importer/validation_test.go
@@ -10,63 +10,71 @@ import (
 
 func TestValidate(t *testing.T) {
 	validation, err := Validate("./tests/service-valid")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.True(t, validation.IsValid())
 	require.True(t, validation.ServiceFileExist)
-	require.Equal(t, 0, len(validation.ServiceFileWarnings))
+	require.Len(t, validation.ServiceFileWarnings, 0)
 	require.True(t, validation.DockerfileExist)
 }
 
+func TestValidateYMLNames(t *testing.T) {
+	validation, err := Validate("./tests/service-names-valid")
+	require.NoError(t, err)
+	require.True(t, validation.IsValid())
+	require.True(t, validation.ServiceFileExist)
+	require.Len(t, validation.ServiceFileWarnings, 0)
+}
+
 func TestValidateDockerfileIsMissing(t *testing.T) {
 	validation, err := Validate("./tests/service-docker-missing")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.False(t, validation.IsValid())
 	require.True(t, validation.ServiceFileExist)
-	require.Equal(t, 0, len(validation.ServiceFileWarnings))
+	require.Len(t, validation.ServiceFileWarnings, 0)
 	require.False(t, validation.DockerfileExist)
 }
 
 func TestValidateFromMissingServiceFile(t *testing.T) {
 	validation, err := Validate("./tests/service-file-missing")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.False(t, validation.IsValid())
 	require.False(t, validation.ServiceFileExist)
-	require.Equal(t, 1, len(validation.ServiceFileWarnings))
+	require.Len(t, validation.ServiceFileWarnings, 1)
 	require.True(t, validation.DockerfileExist)
 }
 
 func TestValidateFromNonExistingPath(t *testing.T) {
 	validation, err := Validate("./tests/service-non-existing")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.False(t, validation.IsValid())
 	require.False(t, validation.ServiceFileExist)
-	require.Equal(t, 1, len(validation.ServiceFileWarnings))
+	require.Len(t, validation.ServiceFileWarnings, 1)
 	require.False(t, validation.DockerfileExist)
 }
 
 func TestValidateFromMalFormattedServiceFile(t *testing.T) {
 	_, err := Validate("./tests/service-file-mal-formatted")
-	require.NotNil(t, err)
+	require.Error(t, err)
 }
 
 func TestValidateFromInvalidServiceFile(t *testing.T) {
 	validation, err := Validate("./tests/service-file-invalid")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.False(t, validation.IsValid())
 	require.True(t, validation.ServiceFileExist)
-	require.Equal(t, 1, len(validation.ServiceFileWarnings))
+	require.Len(t, validation.ServiceFileWarnings, 1)
 	require.True(t, validation.DockerfileExist)
 }
 
 // Test IsValid function
 
 func TestIsValid(t *testing.T) {
 	isValid, err := IsValid("./tests/service-valid")
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.True(t, isValid)
 }
 
 func TestIsValidMalFormattedServiceFile(t *testing.T) {
 	_, err := IsValid("./tests/service-file-mal-formatted")
-	require.NotNil(t, err)
+	require.Error(t, err)
 }