When build is present, add a validation for service names to not incl…

…ude caps.

app/models/compose_validator.rb

@@ -101,9 +101,16 @@ def validate_expose_format(value, path, errors)
 
       def validate_service_name(value, path, errors)
         regex = /^[a-zA-Z0-9]*$/
+        regex_with_build = /^[a-z0-9]*$/
         service_name = path[0]
-        unless service_name =~ regex
-          errors << Kwalify::ValidationError.new('Invalid service name. Valid characters are [a-zA-Z0-9]', path)
+        if value.include?('build')
+          unless service_name =~ regex_with_build
+            errors << Kwalify::ValidationError.new('Invalid service name. Valid characters are [a-z0-9]', path)
+          end
+        else
+          unless service_name =~ regex
+            errors << Kwalify::ValidationError.new('Invalid service name. Valid characters are [a-zA-Z0-9]', path)
+          end
         end
       end
     end

spec/models/compose_validator_spec.rb

@@ -15,13 +15,28 @@
         expect(errors.first.message).to eq ('Invalid service name. Valid characters are [a-zA-Z0-9]')
       end
 
-      it 'adds an error if service name format is invalid' do
+      it 'does not add an error if service name format is valid' do
+        subject.validate_hook({'image' => 'foo'}, rule, ["Drupal728"], errors)
+        expect(errors).to be_empty
+      end
+
+      it 'adds an error if service name format has caps, when build is present' do
+        subject.validate_hook({'build' => 'foo'}, rule, ["Drupal728"], errors)
+        expect(errors.first.message).to eq ('Invalid service name. Valid characters are [a-z0-9]')
+      end
+
+      it 'does not add an error if service name format has no caps, when build is present' do
+        subject.validate_hook({'build' => 'foo'}, rule, ["drupal728"], errors)
+        expect(errors).to be_empty
+      end
+
+      it 'does not add an error if service name format has caps, when build is not present' do
         subject.validate_hook({'image' => 'foo'}, rule, ["Drupal728"], errors)
         expect(errors).to be_empty
       end
 
       it 'adds an error if image and build are both present' do
-        subject.validate_hook({ 'image' => 'foo', 'build' => 'foo'}, rule, path, errors)
+        subject.validate_hook({ 'image' => 'foo', 'build' => 'foo'}, rule, ["drupal728"], errors)
         expect(errors.first.message).to eq ('service must use either image or build, not both')
       end
 
@@ -36,7 +51,7 @@
       end
 
       it 'does not add an error if build is present without image' do
-        subject.validate_hook({ 'build' => 'foo'}, rule, path, errors)
+        subject.validate_hook({ 'build' => 'foo'}, rule, ["drupal728"], errors)
         expect(errors).to be_empty
       end