chef-provisioning-vsphere 2.2.2 → 2.3.0

data/spec/unit_tests/support/vsphere_helper_stub.rb

@@ -6,7 +6,7 @@ module ChefProvisioningVsphereStubs
     def network_device_changes(_action_handler, _vm_template, _options)
       [
         [RbVmomi::VIM::VirtualDeviceConfigSpec.new],
-        [RbVmomi::VIM::VirtualDeviceConfigSpec.new]
+        [RbVmomi::VIM::VirtualDeviceConfigSpec.new],
       ]
     end
 
@@ -34,7 +34,7 @@ module RbVmomi
   class VIM::HostSystem
     attr_reader :parent
 
-    def parent
+    def parent # rubocop:disable Lint/DuplicateMethods
       @parent ||= RbVmomi::VIM::ComputeResource.new
     end
   end
@@ -44,8 +44,8 @@ module RbVmomi
   class VIM::ComputeResource
     attr_reader :resourcePool
 
-    def resourcePool
-      @resourcePool ||= RbVmomi::VIM::ResourcePool.new(nil, nil)
+    def resourcePool # rubocop:disable Lint/DuplicateMethods
+      @resourcePool ||= RbVmomi::VIM::ResourcePool.new(nil, nil) # rubocop:disable Naming/VariableName
     end
   end
 end

data/spec/unit_tests/vsphere_helpers_spec.rb

@@ -1,44 +1,45 @@
-require 'chef/provisioning/vsphere_driver'
+# frozen_string_literal: true
+require "chef/provisioning/vsphere_driver"
 
 describe ChefProvisioningVsphere::VsphereHelper do
   let(:subject) do
     connection_opts = {
-      host: 'fake.host.com',
-      port: 443
+      host: "fake.host.com",
+      port: 443,
     }
-    ChefProvisioningVsphere::VsphereHelper.new(connection_opts, 'fake datacenter')
+    ChefProvisioningVsphere::VsphereHelper.new(connection_opts, "fake datacenter")
   end
-  let(:vm) { vm = double('vm') }
-  let(:task) { double('task', wait_for_completion: true) }
+  let(:vm) { vm = double("vm") } # rubocop:disable Lint/UselessAssignment
+  let(:task) { double("task", wait_for_completion: true) }
 
-  describe '#set_additional_disks_for' do    
+  describe "#set_additional_disks_for" do
     before do
-      allow(vm).to receive(:disks).and_return(['root_disk'], ['root_disk', 'first_disk'])
+      allow(vm).to receive(:disks).and_return(["root_disk"], %w{root_disk first_disk})
     end
 
-    context 'when datastore is missing' do
+    context "when datastore is missing" do
       let(:datastore) { nil }
-      it 'and no extra disks, nothing is raised' do
+      it "and no extra disks, nothing is raised" do
         additional_disk_size_gb = nil
         expect { subject.set_additional_disks_for vm, datastore, additional_disk_size_gb }.not_to raise_error
       end
 
-      it 'and has 1 disk, error is raised' do
+      it "and has 1 disk, error is raised" do
         additional_disk_size_gb = 1
         expect { subject.set_additional_disks_for vm, datastore, additional_disk_size_gb }.to raise_error(RuntimeError)
       end
 
-      it 'and has multiple disks, error is raised' do
+      it "and has multiple disks, error is raised" do
         additional_disk_size_gb = [1, 2]
         expect { subject.set_additional_disks_for vm, datastore, additional_disk_size_gb }.to raise_error(RuntimeError)
       end
     end
 
-    context 'when datastore is present' do
-      let(:datastore) { 'some datastore' }
+    context "when datastore is present" do
+      let(:datastore) { "some datastore" }
       let(:disk_1) do
         {
-            spec: RbVmomi::VIM.VirtualMachineConfigSpec(
+          spec: RbVmomi::VIM.VirtualMachineConfigSpec(
             deviceChange: [
               RbVmomi::VIM::VirtualDeviceConfigSpec(
                 operation: :add,
@@ -47,22 +48,22 @@ describe ChefProvisioningVsphere::VsphereHelper do
                   key: 1,
                   backing: RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
                     fileName: "[#{datastore}]",
-                    diskMode: 'persistent',
+                    diskMode: "persistent",
                     thinProvisioned: true
                   ),
                   capacityInKB: 1 * 1024 * 1024,
                   controllerKey: 1000,
                   unitNumber: 1
                 )
-              )
+              ),
             ]
-          )
+          ),
         }
       end
 
       let(:disk_2) do
         {
-            spec: RbVmomi::VIM.VirtualMachineConfigSpec(
+          spec: RbVmomi::VIM.VirtualMachineConfigSpec(
             deviceChange: [
               RbVmomi::VIM::VirtualDeviceConfigSpec(
                 operation: :add,
@@ -71,50 +72,50 @@ describe ChefProvisioningVsphere::VsphereHelper do
                   key: 2,
                   backing: RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
                     fileName: "[#{datastore}]",
-                    diskMode: 'persistent',
+                    diskMode: "persistent",
                     thinProvisioned: true
                   ),
                   capacityInKB: 2 * 1024 * 1024,
                   controllerKey: 1000,
                   unitNumber: 2
                 )
-              )
+              ),
             ]
-          )
+          ),
         }
       end
 
-      it 'and no extra disks, nothing is created' do
+      it "and no extra disks, nothing is created" do
         additional_disk_size_gb = nil
         expect(vm).not_to receive(:ReconfigVM_Task)
         subject.set_additional_disks_for vm, datastore, additional_disk_size_gb
       end
 
-      it 'and disk is a string, nothing is created' do
-        additional_disk_size_gb = ['not a number']
+      it "and disk is a string, nothing is created" do
+        additional_disk_size_gb = ["not a number"]
         expect(vm).not_to receive(:ReconfigVM_Task)
         subject.set_additional_disks_for vm, datastore, additional_disk_size_gb
       end
 
-      it 'and has 0 GB, nothing is created' do
+      it "and has 0 GB, nothing is created" do
         additional_disk_size_gb = [0]
         expect(vm).not_to receive(:ReconfigVM_Task)
         subject.set_additional_disks_for vm, datastore, additional_disk_size_gb
       end
 
-      it 'and has -1 GB, nothing is created' do
+      it "and has -1 GB, nothing is created" do
         additional_disk_size_gb = [-1]
         expect(vm).not_to receive(:ReconfigVM_Task)
         subject.set_additional_disks_for vm, datastore, additional_disk_size_gb
       end
 
-      it 'and has 1 x 1 GB, create disk' do
+      it "and has 1 x 1 GB, create disk" do
         additional_disk_size_gb = 1
         expect(vm).to receive(:ReconfigVM_Task).with(disk_1).and_return(task)
         subject.set_additional_disks_for vm, datastore, additional_disk_size_gb
       end
 
-      it 'and has 2 disks, create 2 disks' do
+      it "and has 2 disks, create 2 disks" do
         additional_disk_size_gb = [1, 2]
 
         expect(vm).to receive(:ReconfigVM_Task).with(disk_1).and_return(task)
@@ -122,7 +123,7 @@ describe ChefProvisioningVsphere::VsphereHelper do
         subject.set_additional_disks_for vm, datastore, additional_disk_size_gb
       end
 
-      it 'and has 3 disks, including 1 of 0 size, create 2 disks' do
+      it "and has 3 disks, including 1 of 0 size, create 2 disks" do
         additional_disk_size_gb = [0, 1, 2]
         expect(vm).to receive(:ReconfigVM_Task).with(disk_1).and_return(task)
         expect(vm).to receive(:ReconfigVM_Task).with(disk_2).and_return(task)
@@ -132,52 +133,51 @@ describe ChefProvisioningVsphere::VsphereHelper do
     end
   end
 
-  describe '#set_initial_iso' do
+  describe "#set_initial_iso" do
     let(:cd_rom) do
-      double('cd_rom',
-        class: RbVmomi::VIM::VirtualCdrom,
-        key: 'some key',
-        controllerKey: 'some controller key'
-      )
+      double("cd_rom",
+             class: RbVmomi::VIM::VirtualCdrom,
+             key: "some key",
+             controllerKey: "some controller key")
     end
 
     let(:fake_backing) do
-      RbVmomi::VIM::VirtualCdromIsoBackingInfo(fileName: 'some_iso.iso')
+      RbVmomi::VIM::VirtualCdromIsoBackingInfo(fileName: "some_iso.iso")
     end
 
     let(:iso_spec) do
-      { 
+      {
         spec: RbVmomi::VIM.VirtualMachineConfigSpec(
           deviceChange: [
             operation: :edit,
             device: RbVmomi::VIM::VirtualCdrom(
               backing: fake_backing,
-              key: 'some key',
-              controllerKey: 'some controller key',
+              key: "some key",
+              controllerKey: "some controller key",
               connectable: RbVmomi::VIM::VirtualDeviceConnectInfo(
                 startConnected: true,
                 connected: true,
                 allowGuestControl: true
               )
-            )
+            ),
           ]
-        )
+        ),
       }
     end
 
     before do
       allow(vm).to receive_message_chain(:config, :hardware, :device)
-      .and_return([cd_rom])
+        .and_return([cd_rom])
     end
 
-    it 'does nothing when no iso' do
+    it "does nothing when no iso" do
       expect(vm).not_to receive(:ReconfigVM_Task)
       subject.set_initial_iso vm, nil
     end
 
-    it 'sets initial iso' do
+    it "sets initial iso" do
       expect(vm).to receive(:ReconfigVM_Task).with(iso_spec).and_return(task)
-      subject.set_initial_iso vm, 'some_iso.iso'
+      subject.set_initial_iso vm, "some_iso.iso"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - CenturyLink Cloud
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -217,12 +217,9 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Jenkinsfile
 - LICENSE
 - LICENSE-Rally
 - README.md

data/.rubocop.yml

@@ -1,10 +0,0 @@
-AllCops:
-  Exclude:
-    - "spec/**/*"
-    - "vendor/**/*"
-    - "pkg/**/*"
-    - "vsphere_testing/**/*"
-    - "examples/**/*"
-    - "spec/unit/plugins/darwin/system_profiler_output.rb"
-
-inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,135 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2017-10-30 16:48:40 -0700 using RuboCop version 0.49.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
-# SupportedStylesAlignWith: start_of_line, def
-Lint/DefEndAlignment:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/driver.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Lint/EndAlignment:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/driver.rb'
-
-# Offense count: 6
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb'
-    - 'lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb'
-    - 'lib/kitchen/driver/vsphere.rb'
-
-# Offense count: 34
-Metrics/AbcSize:
-  Max: 47
-
-# Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 29
-
-# Offense count: 1
-# Configuration parameters: CountBlocks.
-Metrics/BlockNesting:
-  Max: 4
-
-# Offense count: 3
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 643
-
-# Offense count: 11
-Metrics/CyclomaticComplexity:
-  Max: 12
-
-# Offense count: 140
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 189
-
-# Offense count: 41
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 62
-
-# Offense count: 8
-Metrics/PerceivedComplexity:
-  Max: 14
-
-# Offense count: 1
-Style/CaseEquality:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/driver.rb'
-
-# Offense count: 3
-Style/ClassVars:
-  Exclude:
-    - 'lib/kitchen/driver/vsphere.rb'
-
-# Offense count: 5
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb'
-
-# Offense count: 13
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb'
-    - 'lib/chef/provisioning/vsphere_driver/driver.rb'
-    - 'lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb'
-
-# Offense count: 1
-Style/MultilineTernaryOperator:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/driver.rb'
-
-# Offense count: 1
-Style/NestedTernaryOperator:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/driver.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/chef/provisioning/vsphere_driver/driver.rb'
-
-# Offense count: 3
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/chef/provisioning/vsphere_driver/driver.rb'
-
-# Offense count: 3
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: snake_case, camelCase
-Style/VariableName:
-  Exclude:
-    - 'lib/chef/provisioning/vsphere_driver/clone_spec_builder.rb'
-    - 'lib/chef/provisioning/vsphere_driver/vsphere_helpers.rb'

data/Jenkinsfile

@@ -1,82 +0,0 @@
-pipeline {
-    agent {
-        docker {
-            args "-u root"
-                reuseNode false
-                image "localhost:5000/jjkeysv5"
-                }
-    }
-    triggers {
-        pollSCM('H * * * *')
-    }
-  stages {
-    stage('Pull down ChefDK') {
-      steps {
-        sh '''apt-get update
-apt-get install -y curl sudo git build-essential
-curl -L https://chef.io/chef/install.sh | sudo bash -s -- -P chefdk -c current
-if [ -d "vsphere_testing" ]; then rm -rf vsphere_testing; fi'''
-      }
-    }
-    stage('Bundle') {
-      steps {
-        sh 'chef exec bundle install'
-      }
-    }
-    stage('Checks') {
-      steps {
-        parallel(
-          "Unit": {
-            sh 'chef exec rake unit'
-
-          },
-          "Docs": {
-            sh 'chef exec rake yard'
-
-          }
-        )
-      }
-    }
-    stage('Kitchen setup') {
-      steps {
-        sh '''if [ -d "vsphere_testing" ]; then rm -rf vsphere_testing; fi
-git clone https://github.com/jjasghar/vsphere_testing.git
-cd vsphere_testing
-for i in recipes/*; do sed -i 's/PASSWORD/Good4bye!/g' "$i"; done
-sed -i 's/PASSWORD/Good4bye!/g' .kitchen.yml
-sed -i 's/ORG/jj-model-t/g' recipes/windows_provision.rb
-chef exec bundle install
-chef exec gem install test-kitchen
-chef exec bundle exec kitchen list'''
-      }
-    }
-    stage('Kitchen verify') {
-      steps {
-        sh '''cd vsphere_testing
-chef exec bundle exec kitchen test -c 2'''
-      }
-    }
-    stage('chef-provisioning-vsphere create') {
-        steps {
-            parallel(
-                     "Linux": {
-                         sh  '''cd vsphere_testing
-chef exec bundle exec chef-client -z recipes/linux_provision.rb'''
-                             },
-                     "Windows": {
-                         sh '''cd vsphere_testing
-chef exec bundle exec chef-client -z recipes/windows_provision.rb'''
-                             }
-                     )
-                }
-    }
-    stage('chef-provisioning-vsphere delete') {
-      steps {
-        sh '''cd vsphere_testing
-chef exec bundle exec chef-client -z recipes/destroy.rb
-chef exec knife node delete testing-windows -y
-chef exec knife client delete testing-windows -y'''
-      }
-    }
-  }
-}