Merge pull request #535 from chef/ashiqueps/remove-netaddr

[CVE] Removed the netaddr gem

.expeditor/verify.pipeline.yml

@@ -7,23 +7,6 @@ expeditor:
  timeout_in_minutes: 30
 
 steps:
-
-- label: run-lint-and-specs-ruby-2.7
- command:
- - .expeditor/run_linux_tests.sh rake
- expeditor:
- executor:
- docker:
- image: ruby:2.7-buster
-
-- label: run-lint-and-specs-ruby-3.0
- command:
- - .expeditor/run_linux_tests.sh rake
- expeditor:
- executor:
- docker:
- image: ruby:3.0-buster
-
 - label: run-lint-and-specs-ruby-3.1
  command:
  - .expeditor/run_linux_tests.sh rake
@@ -32,30 +15,6 @@ steps:
  docker:
  image: ruby:3.1-buster
 
-- label: run-specs-windows-ruby-2.7
- command:
- - bundle config --local path vendor/bundle
- - bundle config set --local without docs debug
- - bundle install --jobs=7 --retry=3
- - bundle exec rake
- expeditor:
- executor:
- docker:
- host_os: windows
- image: rubydistros/windows-2019:2.7
-
-- label: run-specs-windows-ruby-3.0
- command:
- - bundle config --local path vendor/bundle
- - bundle config set --local without docs debug
- - bundle install --jobs=7 --retry=3
- - bundle exec rake
- expeditor:
- executor:
- docker:
- host_os: windows
- image: rubydistros/windows-2019:3.0
-
 - label: run-specs-windows-ruby-3.1
  command:
  - bundle config --local path vendor/bundle

knife-vsphere.gemspec

@@ -9,10 +9,9 @@ Gem::Specification.new do |s|
  s.description = "VMware vSphere support for Chef Infra's Knife command"
  s.email = "[email protected]"
  s.files = Dir["lib/**/*"] + %w{LICENSE}
- s.required_ruby_version = ">= 2.7"
+ s.required_ruby_version = ">= 3.1"
  s.homepage = "https://github.com/chef/knife-vsphere"
  s.license = "Apache-2.0"
- s.add_dependency "netaddr", "~> 1.5"
  s.add_dependency "rbvmomi2", ">= 3.5.0", "< 4.0"
  s.add_dependency "filesize", ">= 0.1.1", "< 0.3.0"
  s.add_dependency "chef-vault", ">= 2.6"

lib/chef/knife/vsphere_hosts_list.rb

@@ -8,7 +8,6 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
 
  deps do
  Chef::Knife::BaseVsphereCommand.load_deps
- require "netaddr" unless defined?(NetAddr)
  end
 
  common_options

lib/chef/knife/vsphere_pool_query.rb

@@ -7,7 +7,6 @@ class Chef::Knife::VspherePoolQuery < Chef::Knife::BaseVsphereCommand
 
  deps do
  Chef::Knife::BaseVsphereCommand.load_deps
- require "netaddr" unless defined?(NetAddr)
  end
 
  common_options

lib/chef/knife/vsphere_pool_show.rb

@@ -6,7 +6,6 @@ class Chef::Knife::VspherePoolShow < Chef::Knife::BaseVsphereCommand
 
  deps do
  Chef::Knife::BaseVsphereCommand.load_deps
- require "netaddr" unless defined?(NetAddr)
  end
 
  common_options

lib/chef/knife/vsphere_vm_clone.rb

@@ -16,7 +16,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
  deps do
  Chef::Knife::BaseVsphereCommand.load_deps
  require "ipaddr" unless defined?(IPAddr)
- require "netaddr" unless defined?(NetAddr)
  require "securerandom" unless defined?(SecureRandom)
  require "chef/json_compat"
 
@@ -742,18 +741,20 @@ def generate_adapter_map(ip = nil, gw = nil, mac = nil)
  if ip.nil? || ip.casecmp("dhcp") == 0
  settings.ip = RbVmomi::VIM::CustomizationDhcpIpGenerator.new
  else
- cidr_ip = NetAddr::CIDR.create(ip)
- settings.ip = RbVmomi::VIM::CustomizationFixedIp(ipAddress: cidr_ip.ip)
- settings.subnetMask = cidr_ip.netmask_ext
+ ip_addr = IPAddr.new(ip)
+ ip_string, _length = ip.split("/")
+ settings.ip = RbVmomi::VIM::CustomizationFixedIp(ipAddress: ip_string)
+ settings.subnetMask = ip_addr.netmask
 
  # TODO: want to confirm gw/ip are in same subnet?
  # Only set gateway on first IP.
  if config[:customization_ips].split(",").first == ip
  if gw.nil?
- settings.gateway = [cidr_ip.network(Objectify: true).next_ip]
+ next_ip = IPAddr.new(ip_addr.to_i + 1, Socket::AF_INET).to_s
+ settings.gateway = [next_ip]
  else
- gw_cidr = NetAddr::CIDR.create(gw)
- settings.gateway = [gw_cidr.ip]
+ gw_string, _length = gw.split("/")
+ settings.gateway = [gw_string]
  end
  end
  end

lib/chef/knife/vsphere_vm_network_add.rb

@@ -24,10 +24,6 @@ class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
  description: "Adapter MAC address eg. AA:BB:CC:DD:EE:FF",
  required: false
 
- deps do
- require "netaddr" unless defined?(NetAddr)
- end
-
  common_options
 
  def run