Merge branch 'main' of github.com:cloudfoundry/bosh into HEAD

Author: git

.github/workflows/ruby.yml

@@ -10,7 +10,6 @@ jobs:
         - common:parallel
         - monitor:parallel
         - nats_sync:parallel
-        - template:parallel
         - release
     steps:
     - uses: actions/checkout@v4

ci/pipeline.yml

@@ -9,7 +9,6 @@ groups:
       - unit-common
       - unit-monitor
       - unit-nats-sync
-      - unit-template
       - unit-release
       - unit-director-sqlite
       - unit-director-mysql-8
@@ -66,7 +65,6 @@ jobs:
       - unit-common
       - unit-monitor
       - unit-nats-sync
-      - unit-template
       - unit-release
       - unit-director-sqlite
       - unit-director-mysql-8
@@ -137,26 +135,6 @@ jobs:
         DB: sqlite
         RAKE_TASK: spec:unit:nats_sync
 
-  - name: unit-template
-    public: true
-    serial: true
-    serial_groups: [unit-template]
-    build_logs_to_retain: 250
-    plan:
-    - in_parallel:
-      - get: bosh-ci
-      - get: bosh
-        trigger: true
-        passed: [gate]
-      - get: integration-image
-    - task: test-rake-task
-      timeout: 2h
-      file: bosh-ci/ci/tasks/test-rake-task.yml
-      image: integration-image
-      params:
-        DB: sqlite
-        RAKE_TASK: spec:unit:template
-
   - name: unit-release
     public: true
     serial: true
@@ -391,7 +369,6 @@ jobs:
         - unit-common
         - unit-monitor
         - unit-nats-sync
-        - unit-template
         - unit-release
         - unit-director-sqlite
         - unit-director-mysql-8

ci/tasks/test-rake-task.sh

@@ -40,7 +40,10 @@ start_db() {
 
       export MYSQL_ROOT=/var/lib/mysql
       if [ ! -d /var/lib/mysql-src ]; then # Set up MySQL if it's the first time
-        mkdir /var/lib/mysql-src
+        mv "${MYSQL_ROOT}" /var/lib/mysql-src
+        mkdir -p "${MYSQL_ROOT}"
+        mount -t tmpfs -o size=512M tmpfs "${MYSQL_ROOT}"
+        mv /var/lib/mysql-src/* "${MYSQL_ROOT}/"
 
         echo "Copy 'src/spec/assets/sandbox/database/database_server/{private_key,certificate.pem}' to '${MYSQL_ROOT}/'"
         cp bosh/src/spec/assets/sandbox/database/database_server/private_key "${MYSQL_ROOT}/server.key"

packages/director/spec

@@ -9,6 +9,5 @@ dependencies:
 files:
 - bosh-director/**/*
 - bosh_common/**/*
-- bosh-template/**/*
 - vendor/cache/*.gem
 - vendor/cache/extensions/**

scripts/rsync-bbl

@@ -38,8 +38,6 @@ main() {
   do-rsync bosh-director bin
   do-rsync bosh-director db
   do-rsync bosh-director lib
-  do-rsync bosh-template bin
-  do-rsync bosh-template lib
 
   echo "Replacing Director Version to $(version)"
 

scripts/rsync-vbox

@@ -28,8 +28,6 @@ main() {
   do-rsync bosh-director bin director
   do-rsync bosh-director db director
   do-rsync bosh-director lib director
-  do-rsync bosh-template bin director
-  do-rsync bosh-template lib director
   do-rsync bosh-monitor lib health_monitor
   do-rsync bosh-monitor bin health_monitor
   do-rsync bosh-nats-sync bin nats

src/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'bosh-director', path: 'bosh-director'
 gem 'bosh-monitor', path: 'bosh-monitor'
 gem 'bosh-nats-sync', path: 'bosh-nats-sync'
-gem 'bosh-template', path: 'bosh-template'
 gem 'bosh_common', path: 'bosh_common'
 
 gem 'mysql2'

src/Gemfile.lock

@@ -2,8 +2,8 @@ PATH
   remote: bosh-director
   specs:
     bosh-director (0.0.0)
+      activesupport
       bcrypt
-      bosh-template (~> 0.0.0)
       bosh_common (~> 0.0.0)
       bosh_cpi
       cf-uaa-lib
@@ -57,14 +57,6 @@ PATH
       openssl
       rufus-scheduler
 
-PATH
-  remote: bosh-template
-  specs:
-    bosh-template (0.0.0)
-      activesupport
-      openssl
-      ostruct
-
 PATH
   remote: bosh_common
   specs:
@@ -346,7 +338,6 @@ DEPENDENCIES
   bosh-director!
   bosh-monitor!
   bosh-nats-sync!
-  bosh-template!
   bosh_common!
   bundle-audit
   factory_bot

src/bosh-template/bin/bosh-template src/bosh-director/bin/bosh-template

@@ -28,12 +28,13 @@ Gem::Specification.new do |spec|
     'bosh-director-sync-dns',
     'bosh-director-trigger-one-time-sync-dns',
     'bosh-director-worker',
+    'bosh-template',
   ]
   spec.require_paths = ['lib']
 
   spec.add_dependency 'bosh_common',   "~>#{Bosh::Director::VERSION}"
-  spec.add_dependency 'bosh-template', "~>#{Bosh::Director::VERSION}"
 
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'bcrypt'
   spec.add_dependency 'bosh_cpi'
   spec.add_dependency 'cf-uaa-lib'

src/bosh-director/bosh-director.gemspec

@@ -6,6 +6,5 @@ gem 'rake'
 gem 'bundler'
 
 group :development, :test do
-  gem 'bosh-template', path: '../../../..'
   gem 'rspec'
 end

src/bosh-template/lib/bosh/template.rb src/bosh-director/lib/bosh/template.rb

@@ -3,7 +3,7 @@
 
 describe 'bin/bosh-template' do
   subject(:bin_file) do
-    File.expand_path('../../bin/bosh-template', File.dirname(__FILE__))
+    File.expand_path('../../../bin/bosh-template', File.dirname(__FILE__))
   end
 
   let(:template) do
@@ -18,7 +18,6 @@
     asset_content('nats.json')
   end
 
-
   it 'correctly renders a realistic nats config template' do
     output = run("#{bin_file} #{template} --context '#{context}'")
 

src/bosh-template/lib/bosh/template/evaluation_context.rb src/bosh-director/lib/bosh/template/evaluation_context.rb

@@ -10,10 +10,14 @@
 require 'pg'
 require 'tempfile'
 require 'tmpdir'
+require 'yaml'
 require 'zlib'
 
 require 'db_migrator'
 require 'bosh/director'
+require 'bosh/template'
+
+require 'common/deep_copy'
 
 require 'webmock/rspec'