bosh-gen 0.96.0 → 0.97.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ece591a7a7c0e87b516792c42779191fc9fc092
-  data.tar.gz: b08c4f05ca34ad67ad3efc30f81b9f97a94c8466
+  metadata.gz: 3b7692351ac5b6596e8b513a4798897bdbc89018
+  data.tar.gz: c2c2156c41a4127e0f4ab4a918f71d7ac18c2f7f
 SHA512:
-  metadata.gz: a6820845800b4a4abfbc00a6b60e31a7bdb8d01c636d30a30dd908a51f93c239f0de675e3978fe612ebb0f20e7b280dd82c1019385f9ede9ede3b32a65091cd7
-  data.tar.gz: f163a68e509785684c0c5057853d28504f9a10e2de44fa26e4011c2df600ad77bd0e967acdbbc87acaa61e866efb4e2ecf49515a47cd4ca0d317c2e184de5e27
+  metadata.gz: 4f4f02ce3983d769d5ee81e239f89f05daf823d44b394e2f5635e73322d05fa9b91a0b37ae6acdb46f887e560bf8ded11c31d024900a5253a0e96c7de9b20ab1
+  data.tar.gz: 2f7fe7100365e577267af10cfa69c4fa7ec5b56da1134db7130b5664038bb2f5c62d862b3a56d5fd590958ed9b7eb1b0c592265742e73b4e653f9aa05639c6f5

data/lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/bin/run.tt

@@ -5,9 +5,6 @@ exec 2>&1
 set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
 
-# Setup env vars and folders for the errand script
-source /var/vcap/jobs/<%= job_name %>/helpers/ctl_setup.sh '<%= job_name %>'
-
 ############################################################################
 
 # put your errand steps here...

data/lib/bosh/gen/generators/job_generator/templates/jobs/%job_name%_bpm/templates/config/bpm.yml.tt

@@ -12,4 +12,3 @@ processes:
     open_files: 1024
 
 # example at https://github.com/cloudfoundry-incubator/bpm-release/blob/master/jobs/bpm-test-agent/templates/bpm.yml.erb
-# example at https://github.com/cloudfoundry-incubator/bpm-release/blob/master/jobs/bpm-test-agent/templates/bpm.yml.erb

data/lib/bosh/gen/generators/new_release_generator.rb

@@ -37,14 +37,11 @@ module Bosh::Gen
         template "LICENSE.md.tt", "LICENSE.md"
       end
 
-      def rakefile
-        copy_file "Rakefile"
-      end
-
       def directories
         %w[jobs packages src blobs manifests].each do |dir|
           directory dir
         end
+        chmod 'manifests/operators/pick-from-cloud-config.sh', 0755
       end
 
       def blobs_yaml

data/lib/bosh/gen/generators/new_release_generator/templates/README.md.tt

@@ -17,7 +17,7 @@ If your BOSH does not have Credhub/Config Server, then remember `--vars-store` t
 
 ### Update
 
-When new versions of `redis-boshrelease` are released the `manifests/redis.yml` file will be updated. This means you can easily `git pull` and `bosh deploy` to upgrade.
+When new versions of `<%= project_name %>-boshrelease` are released the `manifests/<%= project_name %>.yml` file will be updated. This means you can easily `git pull` and `bosh deploy` to upgrade.
 
 ```
 export BOSH_ENVIRONMENT=<bosh-alias>
@@ -25,5 +25,5 @@ export BOSH_DEPLOYMENT=<%= project_name %>
 cd <%= project_name %>-boshrelease
 git pull
 cd -
-bosh deploy <%= project_name %>-boshrelease/manifests/redis.yml
+bosh deploy <%= project_name %>-boshrelease/manifests/<%= project_name %>.yml
 ```

data/lib/bosh/gen/generators/new_release_generator/templates/manifests/operators/pick-from-cloud-config.sh.tt

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# The base manifests/<%= project_name %>.yml assumes that your `bosh cloud-config` contains
+# "vm_type" and "networks" named "default". Its quite possible you don't have this.
+# This script will select the first "vm_types" and first "networks" to use in
+# your deployment. It will print to stderr the choices it made.
+#
+# Usage:
+#   bosh deploy manifests/<%= project_name %>.yml -o <(./manifests/operators/pick-from-cloud-config.sh)
+
+: ${BOSH_ENVIRONMENT:?required}
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR/../..
+
+instance_groups=$(bosh int <(cat manifests/*.yml) $@ --path /instance_groups | grep "^  name:" | awk '{print $2}' | sort | uniq)
+cloud_config=$(bosh cloud-config)
+if [[ -z ${cloud_config} ]]; then
+  echo "BOSH env missing a cloud-config"
+  exit 1
+fi
+vm_type=$(bosh int <(echo "$cloud_config") --path /vm_types/0/name)
+network=$(bosh int <(echo "$cloud_config") --path /networks/0/name)
+
+>&2 echo "vm_type: ${vm_type}, network: ${network}"
+
+for ig in $instance_groups; do
+cat <<YAML
+- type: replace
+  path: /instance_groups/name=${ig}/networks/name=default/name
+  value: ${network}
+
+- type: replace
+  path: /instance_groups/name=${ig}/vm_type
+  value: ${vm_type}
+
+YAML
+done

data/lib/bosh/gen/generators/new_release_generator/templates/manifests/operators/use-network.yml.tt

@@ -0,0 +1,3 @@
+- type: replace
+  path: /instance_groups/name=<%= project_name %>/networks/name=default/name
+  value: ((network_name))

data/lib/bosh/gen/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Gen
-    VERSION = "0.96.0"
+    VERSION = "0.97.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-gen
 version: !ruby/object:Gem::Version
-  version: 0.96.0
+  version: 0.97.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -177,8 +177,6 @@ files:
 - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/monit.tt
 - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/bin/run.tt
 - lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/config/.gitkeep
-- lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/helpers/ctl_setup.sh
-- lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/helpers/ctl_utils.sh
 - lib/bosh/gen/generators/extract_job_generator.rb
 - lib/bosh/gen/generators/extract_package_generator.rb
 - lib/bosh/gen/generators/job_generator.rb
@@ -197,13 +195,14 @@ files:
 - lib/bosh/gen/generators/new_release_generator.rb
 - lib/bosh/gen/generators/new_release_generator/templates/LICENSE.md.tt
 - lib/bosh/gen/generators/new_release_generator/templates/README.md.tt
-- lib/bosh/gen/generators/new_release_generator/templates/Rakefile
 - lib/bosh/gen/generators/new_release_generator/templates/blobs/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name%/monit.tt
 - lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name%/spec.tt
 - lib/bosh/gen/generators/new_release_generator/templates/jobs/%project_name%/templates/ignoreme
 - lib/bosh/gen/generators/new_release_generator/templates/manifests/%project_name%.yml.tt
 - lib/bosh/gen/generators/new_release_generator/templates/manifests/operators/dev.yml.tt
+- lib/bosh/gen/generators/new_release_generator/templates/manifests/operators/pick-from-cloud-config.sh.tt
+- lib/bosh/gen/generators/new_release_generator/templates/manifests/operators/use-network.yml.tt
 - lib/bosh/gen/generators/new_release_generator/templates/packages/.gitkeep
 - lib/bosh/gen/generators/new_release_generator/templates/src/.gitkeep
 - lib/bosh/gen/generators/package_apt_generator.rb
@@ -245,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: ''

data/lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/helpers/ctl_setup.sh

@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# Setup env vars and folders for the ctl script
-# This helps keep the ctl script as readable
-# as possible
-
-# Usage options:
-# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh JOB_NAME OUTPUT_LABEL
-# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar
-# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar foobar
-# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar nginx
-
-set -e # exit immediately if a simple command exits with a non-zero status
-set -u # report the usage of uninitialized variables
-
-JOB_NAME=$1
-output_label=${2:-${JOB_NAME}}
-
-export JOB_DIR=/var/vcap/jobs/$JOB_NAME
-chmod 755 $JOB_DIR # to access file via symlink
-
-source $JOB_DIR/helpers/ctl_utils.sh
-
-# Setup the PATH and LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-''} # default to empty
-for package_dir in $(ls -d /var/vcap/packages/*)
-do
-  has_busybox=0
-	# Add all packages' /bin & /sbin into $PATH
-  for package_bin_dir in $(ls -d ${package_dir}/*bin)
-  do
-    # Do not add any packages that use busybox, as impacts builtin commands and
-    # is often used for different architecture (via containers)
-    if [ -f ${package_bin_dir}/busybox ]
-    then
-      has_busybox=1
-    else
-      export PATH=${package_bin_dir}:$PATH
-    fi
-  done
-  if [ "$has_busybox" == "0" ] && [ -d ${package_dir}/lib ]
-  then
-    export LD_LIBRARY_PATH=${package_dir}/lib:$LD_LIBRARY_PATH
-  fi
-done
-
-# Setup log, run and tmp folders
-
-export RUN_DIR=/var/vcap/sys/run/$JOB_NAME
-export LOG_DIR=/var/vcap/sys/log/$JOB_NAME
-export TMP_DIR=/var/vcap/sys/tmp/$JOB_NAME
-export STORE_DIR=/var/vcap/store/$JOB_NAME
-for dir in $RUN_DIR $LOG_DIR $TMP_DIR $STORE_DIR
-do
-  mkdir -p ${dir}
-  chown vcap:vcap ${dir}
-  chmod 775 ${dir}
-done
-export TMPDIR=$TMP_DIR
-
-export C_INCLUDE_PATH=/var/vcap/packages/mysqlclient/include/mysql:/var/vcap/packages/sqlite/include:/var/vcap/packages/libpq/include
-export LIBRARY_PATH=/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib
-
-echo '$PATH' $PATH

data/lib/bosh/gen/generators/errand_generator/templates/jobs/%job_name%/templates/helpers/ctl_utils.sh

@@ -1,155 +0,0 @@
-# Helper functions used by ctl scripts
-
-# links a job file (probably a config file) into a package
-# Example usage:
-# link_job_file_to_package config/redis.yml [config/redis.yml]
-# link_job_file_to_package config/wp-config.php wp-config.php
-link_job_file_to_package() {
-  source_job_file=$1
-  target_package_file=${2:-$source_job_file}
-  full_package_file=$WEBAPP_DIR/${target_package_file}
-
-  link_job_file ${source_job_file} ${full_package_file}
-}
-
-# links a job file (probably a config file) somewhere
-# Example usage:
-# link_job_file config/bashrc /home/vcap/.bashrc
-link_job_file() {
-  source_job_file=$1
-  target_file=$2
-  full_job_file=$JOB_DIR/${source_job_file}
-
-  echo link_job_file ${full_job_file} ${target_file}
-  if [[ ! -f ${full_job_file} ]]
-  then
-    echo "file to link ${full_job_file} does not exist"
-  else
-    # Create/recreate the symlink to current job file
-    # If another process is using the file, it won't be
-    # deleted, so don't attempt to create the symlink
-    mkdir -p $(dirname ${target_file})
-    ln -nfs ${full_job_file} ${target_file}
-  fi
-}
-
-# If loaded within monit ctl scripts then pipe output
-# If loaded from 'source ../utils.sh' then normal STDOUT
-redirect_output() {
-  SCRIPT=$1
-  mkdir -p /var/vcap/sys/log/monit
-  exec 1>> /var/vcap/sys/log/monit/$SCRIPT.log 2>&1
-}
-
-pid_guard() {
-  pidfile=$1
-  name=$2
-
-  if [ -f "$pidfile" ]; then
-    pid=$(head -1 "$pidfile")
-
-    if [ -n "$pid" ] && [ -e /proc/$pid ]; then
-      echo "$name is already running, please stop it first"
-      exit 1
-    fi
-
-    echo "Removing stale pidfile..."
-    rm $pidfile
-  fi
-}
-
-wait_pid() {
-  pid=$1
-  try_kill=$2
-  timeout=${3:-0}
-  force=${4:-0}
-  countdown=$(( $timeout * 10 ))
-
-  echo wait_pid $pid $try_kill $timeout $force $countdown
-  if [ -e /proc/$pid ]; then
-    if [ "$try_kill" = "1" ]; then
-      echo "Killing $pidfile: $pid "
-      kill $pid
-    fi
-    while [ -e /proc/$pid ]; do
-      sleep 0.1
-      [ "$countdown" != '0' -a $(( $countdown % 10 )) = '0' ] && echo -n .
-      if [ $timeout -gt 0 ]; then
-        if [ $countdown -eq 0 ]; then
-          if [ "$force" = "1" ]; then
-            echo -ne "\nKill timed out, using kill -9 on $pid... "
-            kill -9 $pid
-            sleep 0.5
-          fi
-          break
-        else
-          countdown=$(( $countdown - 1 ))
-        fi
-      fi
-    done
-    if [ -e /proc/$pid ]; then
-      echo "Timed Out"
-    else
-      echo "Stopped"
-    fi
-  else
-    echo "Process $pid is not running"
-    echo "Attempting to kill pid anyway..."
-    kill $pid
-  fi
-}
-
-wait_pidfile() {
-  pidfile=$1
-  try_kill=$2
-  timeout=${3:-0}
-  force=${4:-0}
-  countdown=$(( $timeout * 10 ))
-
-  if [ -f "$pidfile" ]; then
-    pid=$(head -1 "$pidfile")
-    if [ -z "$pid" ]; then
-      echo "Unable to get pid from $pidfile"
-      exit 1
-    fi
-
-    wait_pid $pid $try_kill $timeout $force
-
-    rm -f $pidfile
-  else
-    echo "Pidfile $pidfile doesn't exist"
-  fi
-}
-
-kill_and_wait() {
-  pidfile=$1
-  # Monit default timeout for start/stop is 30s
-  # Append 'with timeout {n} seconds' to monit start/stop program configs
-  timeout=${2:-25}
-  force=${3:-1}
-  if [[ -f ${pidfile} ]]
-  then
-    wait_pidfile $pidfile 1 $timeout $force
-  else
-    # TODO assume $1 is something to grep from 'ps ax'
-    pid="$(ps auwwx | grep "$1" | awk '{print $2}')"
-    wait_pid $pid 1 $timeout $force
-  fi
-}
-
-check_nfs_mount() {
-  opts=$1
-  exports=$2
-  mount_point=$3
-
-  if grep -qs $mount_point /proc/mounts; then
-    echo "Found NFS mount $mount_point"
-  else
-    echo "Mounting NFS..."
-    mount $opts $exports $mount_point
-    if [ $? != 0 ]; then
-      echo "Cannot mount NFS from $exports to $mount_point, exiting..."
-      exit 1
-    fi
-  fi
-}

data/lib/bosh/gen/generators/new_release_generator/templates/Rakefile

@@ -1,15 +0,0 @@
-desc "Generates a properties file for each job based on properties.X.Y used in templates"
-task :job_properties do
-  require "fileutils"
-  Dir["jobs/*"].each do |path|
-    puts "Searching job #{File.basename(path)}..."
-    FileUtils.chdir(path) do
-      properties = []
-      Dir["templates/*.erb"].each do |template_path|
-        properties |= File.read(template_path).scan(/\bproperties\.[\w\.]*\b/)
-        puts properties.join("\n")
-        File.open("properties", "w") { |file| file << properties.join("\n") }
-      end
-    end
-  end
-end