Merge pull request #3024 from zendesk/grosser/env2

make env variables always be valid
zendesk · Oct 29, 2018 · 2525d77 · 2525d77
2 parents a56d295 + cb440ed
commit 2525d77
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/models/job_execution.rb b/app/models/job_execution.rb
@@ -240,7 +240,9 @@ def make_builds_available
 
     # make repo-digests available to stage commands
     builds.map do |build|
-      ["BUILD_FROM_#{build.dockerfile || build.image_name}", build.docker_repo_digest]
+      name = build.dockerfile || build.image_name
+      name = name.gsub(/[^A-Za-z\d_]/, "_") # IEEE Std 1003.1-2001 A-Z, digits, '_' (+ a-z for backwards compatibility)
+      ["BUILD_FROM_#{name}", build.docker_repo_digest]
     end.to_h
   end
 

diff --git a/test/models/job_execution_test.rb b/test/models/job_execution_test.rb
@@ -322,6 +322,12 @@ def last_line_of_output
       job.output.must_include "export BUILD_FROM_Dockerfile=docker-registry.example.com"
     end
 
+    it "creates valid env variables when build name is not valid" do
+      build.update_columns(dockerfile: nil, image_name: 'foo-bar-∂-baz')
+      JobExecution.new('master', job).send(:run)
+      job.output.must_include "export BUILD_FROM_foo_bar___baz=docker-registry.example.com"
+    end
+
     it "makes builds without dockerfile available via env" do
       build.update_columns(dockerfile: nil, image_name: 'foo')
       JobExecution.new('master', job).send(:run)