Speed up interpolation

chef_vault_item is pretty expensive --> hoist out of loop
simplify templates while we're at it

Author: adriaanm

recipes/_worker-config-debian.rb

@@ -54,6 +54,10 @@
       end
     end
 
+    privateRepo = chef_vault_item("worker-publish", "private-repo")
+    s3Downloads = chef_vault_item("worker-publish", "s3-downloads")
+    sonatype    = chef_vault_item("worker-publish", "sonatype")
+
     { "#{jenkinsHome}/.credentials-private-repo" => "credentials-private-repo.erb",
       "#{jenkinsHome}/.credentials-sonatype"     => "credentials-sonatype.erb",
       "#{jenkinsHome}/.credentials"              => "credentials-private-repo.erb",
@@ -70,12 +74,9 @@
         sensitive true
 
         variables({
-          :sonatypePass    => chef_vault_item("worker-publish", "sonatype")['pass'],
-          :sonatypeUser    => chef_vault_item("worker-publish", "sonatype")['user'],
-          :privateRepoPass => chef_vault_item("worker-publish", "private-repo")['pass'],
-          :privateRepoUser => chef_vault_item("worker-publish", "private-repo")['user'],
-          :s3DownloadsPass => chef_vault_item("worker-publish", "s3-downloads")['pass'],
-          :s3DownloadsUser => chef_vault_item("worker-publish", "s3-downloads")['user']
+          :privateRepo => privateRepo,
+          :s3Downloads => s3Downloads,
+          :sonatype    => sonatype
         })
         helpers(ScalaJenkinsInfra::JobBlurbs)
       end

recipes/_worker-config-rhel.rb

@@ -18,6 +18,8 @@
     end
   end
 
+  privateRepo = chef_vault_item("worker", "private-repo-public-jobs")
+
   { "#{jenkinsHome}/.m2/settings.xml" => "m2-settings-public-jobs.xml.erb",
     "#{jenkinsHome}/.credentials"     => "credentials-private-repo.erb"
   }.each do |target, templ|
@@ -27,8 +29,7 @@
       sensitive true
 
       variables({
-        :privateRepoPass => chef_vault_item("worker", "private-repo-public-jobs")['pass'],
-        :privateRepoUser => chef_vault_item("worker", "private-repo-public-jobs")['user']
+        :privateRepo => privateRepo
       })
       helpers(ScalaJenkinsInfra::JobBlurbs)
     end

recipes/_worker-config-windows.rb

@@ -10,6 +10,8 @@
 
 node["jenkinsHomes"].each do |jenkinsHome, workerConfig|
   if workerConfig["publish"]
+    s3Downloads = chef_vault_item("worker-publish", "s3-downloads")
+
     # TODO: once s3-plugin supports it, use instance profile instead of credentials
     {
       "#{jenkinsHome}/.s3credentials" => "s3credentials.erb"
@@ -20,8 +22,7 @@
         user      workerConfig["jenkinsUser"]
 
         variables({
-          :s3DownloadsPass => chef_vault_item("worker-publish", "s3-downloads")['pass'],
-          :s3DownloadsUser => chef_vault_item("worker-publish", "s3-downloads")['user']
+          :s3Downloads => s3Downloads
         })
       end
     end

templates/default/credentials-private-repo.erb

@@ -1,4 +1,4 @@
 realm=<%=node['repos']['private']['realm']%>
 host=<%=node['repos']['private']['host']%>
-user=<%= @privateRepoUser %>
-password=<%= @privateRepoPass %>
+user=<%= @privateRepo['user'] %>
+password=<%= @privateRepo['pass'] %>

templates/default/credentials-sonatype.erb

@@ -1,4 +1,4 @@
 realm=Sonatype Nexus Repository Manager
 host=oss.sonatype.org
-user=<%= @sonatypeUser %>
-password=<%= @sonatypePass %>
+user=<%= @sonatype['user'] %>
+password=<%= @sonatype['pass'] %>

templates/default/m2-settings-public-jobs.xml.erb

@@ -11,8 +11,8 @@
   <servers>
     <server>
       <id>pr-scala</id>
-      <username><%= @privateRepoUser %></username>
-      <password><%= xmlSafe(@privateRepoPass) %></password>
+      <username><%= @privateRepo['user'] %></username>
+      <password><%= xmlSafe(@privateRepo['pass']) %></password>
     </server>
   </servers>
 

templates/default/m2-settings.xml.erb

@@ -11,13 +11,13 @@
   <servers>
     <server>
       <id>sonatype-nexus</id>
-      <username><%= @sonatypeUser %></username>
-      <password><%= @sonatypePass %></password>
+      <username><%= @sonatype['user'] %></username>
+      <password><%= @sonatype['pass'] %></password>
     </server>
     <server>
       <id>private-repo</id>
-      <username><%= @privateRepoUser %></username>
-      <password><%= xmlSafe(@privateRepoPass) %></password>
+      <username><%= @privateRepo['user'] %></username>
+      <password><%= xmlSafe(@privateRepo['pass']) %></password>
     </server>
     <!-- <server>
       <id>mirror</id>

templates/default/s3credentials.erb

@@ -1,4 +1,4 @@
 realm=Amazon S3
 host=<%=node['s3']['downloads']['host']%>
-user=<%=@s3DownloadsUser%>
-password=<%=@s3DownloadsPass%>
+user=<%=@s3Downloads['user']%>
+password=<%=@s3Downloads['pass']%>

templates/default/s3curl.erb

@@ -1,6 +1,6 @@
 %awsSecretAccessKeys = (
     typesafe => {
-        id  => '<%= @s3DownloadsUser %>',
-        key => '<%= @s3DownloadsPass %>',
+        id  => '<%= @s3Downloads['user'] %>',
+        key => '<%= @s3Downloads['pass'] %>',
     }
 )

templates/default/sonatype-curl.erb

@@ -1 +1 @@
-user = <%= @sonatypeUser %>:<%= @sonatypePass %>
+user = <%= @sonatype['user'] %>:<%= @sonatype['pass'] %>