relaxed contain rule so exports of different kinds can overlap in sub…

…jects (#25)

exports.go

@@ -45,14 +45,7 @@ func (e *Exports) Add(i ...*Export) {
 	*e = append(*e, i...)
 }
 
-// Validate calls validate on all of the exports
-func (e *Exports) Validate(vr *ValidationResults) error {
-	var subjects []Subject
-	for _, v := range *e {
-		subjects = append(subjects, v.Subject)
-		v.Validate(vr)
-	}
-	// collect all the subjects, and validate that no subject is a subset
+func isContainedIn(kind ExportType, subjects []Subject, vr *ValidationResults) {
 	m := make(map[string]string)
 	for i, ns := range subjects {
 		for j, s := range subjects {
@@ -73,10 +66,28 @@ func (e *Exports) Validate(vr *ValidationResults) error {
 		for k, v := range m {
 			var vi ValidationIssue
 			vi.Blocking = true
-			vi.Description = fmt.Sprintf("export subject %q already exports %q", k, v)
+			vi.Description = fmt.Sprintf("%s export subject %q already exports %q", kind, k, v)
 			vr.Add(&vi)
 		}
 	}
+}
+
+// Validate calls validate on all of the exports
+func (e *Exports) Validate(vr *ValidationResults) error {
+	var serviceSubjects []Subject
+	var streamSubjects []Subject
+
+	for _, v := range *e {
+		if v.IsService() {
+			serviceSubjects = append(serviceSubjects, v.Subject)
+		} else {
+			streamSubjects = append(streamSubjects, v.Subject)
+		}
+		v.Validate(vr)
+	}
+
+	isContainedIn(Service, serviceSubjects, vr)
+	isContainedIn(Stream, streamSubjects, vr)
 
 	return nil
 }

exports_test.go

@@ -80,7 +80,7 @@ func TestExportsValidation(t *testing.T) {
 	}
 
 	if exports.HasExportContainingSubject("bar.*") {
-		t.Errorf("Export list does not has the subject, and should say so")
+		t.Errorf("Export list does not have the subject, and should say so")
 	}
 }
 
@@ -98,3 +98,48 @@ func TestOverlappingExports(t *testing.T) {
 		t.Errorf("export has overlapping subjects")
 	}
 }
+
+func TestDifferentExportTypes_OverlapOK(t *testing.T) {
+	i := &Export{Subject: "bar.foo", Type: Service}
+	i2 := &Export{Subject: "bar.*", Type: Stream}
+
+	exports := &Exports{}
+	exports.Add(i, i2)
+
+	vr := CreateValidationResults()
+	exports.Validate(vr)
+
+	if len(vr.Issues) != 0 {
+		t.Errorf("should allow overlaps on different export kind")
+	}
+}
+
+func TestDifferentExportTypes_SameSubjectOK(t *testing.T) {
+	i := &Export{Subject: "bar", Type: Service}
+	i2 := &Export{Subject: "bar", Type: Stream}
+
+	exports := &Exports{}
+	exports.Add(i, i2)
+
+	vr := CreateValidationResults()
+	exports.Validate(vr)
+
+	if len(vr.Issues) != 0 {
+		t.Errorf("should allow overlaps on different export kind")
+	}
+}
+
+func TestSameExportType_SameSubject(t *testing.T) {
+	i := &Export{Subject: "bar", Type: Service}
+	i2 := &Export{Subject: "bar", Type: Service}
+
+	exports := &Exports{}
+	exports.Add(i, i2)
+
+	vr := CreateValidationResults()
+	exports.Validate(vr)
+
+	if len(vr.Issues) != 1 {
+		t.Errorf("should not allow same subject on same export kind")
+	}
+}