revert versioncmp changes made by pdk validate

manifests/init.pp

@@ -410,10 +410,7 @@
       if $facts['os']['release']['full'] =~ /^6(.[0-9])?/ and $agent_version == 'latest' {
         notice("datadog-agent ${_agent_major_version}.51 is the last supported version on CentOS 6. Installing ${_agent_major_version}.51 now")
         $agent_full_version='7.51.1'
-# $_agent_minor_version is a Integer, so we can't use the versioncmp function
-# lint:ignore:version_comparison
       } elsif $facts['os']['release']['full'] =~ /^6(.[0-9])?/ and $_agent_minor_version != undef and $_agent_minor_version > 51 {
-# lint:endignore
         fail("datadog-agent ${_agent_major_version}.51 is the last supported version on CentOS 6.")
       } else {
         $agent_full_version = $agent_version
@@ -422,12 +419,9 @@
     default: { $agent_full_version = $agent_version }
   }
 
-# $_agent_major_version is a Integer, so we can't use the versioncmp function
-# lint:ignore:version_comparison
   if $_agent_major_version != 5 and $_agent_major_version != 6 and $_agent_major_version != 7 {
     fail("agent_major_version must be either 5, 6 or 7, not ${_agent_major_version}")
   }
-# lint:endignore
 
   if ($facts['os']['name'] == 'Windows' and $windows_ddagentuser_name != undef) {
     $dd_user = $windows_ddagentuser_name
@@ -436,10 +430,7 @@
   }
 
   if $conf_dir == undef {
-# $_agent_major_version is a Integer, so we can't use the versioncmp function
-# lint:ignore:version_comparison
     if $_agent_major_version == 5 {
-# lint:endignore
       $_conf_dir = $datadog_agent::params::legacy_conf_dir
     } else {
       $_conf_dir = $datadog_agent::params::conf_dir
@@ -663,10 +654,7 @@
     }
   }
 
-# $_agent_major_version is a Integer, so we can't use the versioncmp function
-# lint:ignore:version_comparison
   if $_agent_major_version == 5 {
-# lint:endignore
     if ($facts['os']['name'] == 'Windows') {
       fail('Installation of agent 5 with puppet is not supported on Windows')
     }

manifests/integration.pp

@@ -10,7 +10,7 @@
   # datadog_agent class, causing a dependency cycle. If using this class
   # directly, you should define datadog_agent before datadog_agent::integration.
 
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/${integration}.d"
     $dst = "${dst_dir}/${$conf_file}.yaml"
     if (! defined(File[$dst_dir])) {

manifests/integrations/activemq_xml.pp

@@ -55,7 +55,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/activemq_xml.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/activemq_xml.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/apache.pp

@@ -36,7 +36,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/apache.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/apache.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/cacti.pp

@@ -21,7 +21,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/cacti.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/cacti.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/cassandra.pp

@@ -39,7 +39,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/cassandra.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/cassandra.d"
 
     file { $legacy_dst:

manifests/integrations/ceph.pp

@@ -24,7 +24,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/ceph.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/ceph.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/consul.pp

@@ -36,7 +36,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/consul.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/consul.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/directory.pp

@@ -89,7 +89,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/directory.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/directory.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/disk.pp

@@ -90,7 +90,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/disk.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/disk.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/dns_check.pp

@@ -36,7 +36,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/dns_check.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/dns_check.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/docker_daemon.pp

@@ -64,7 +64,7 @@
     notify  => Service[$datadog_agent::params::service_name],
   }
 
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $legacy_dir = "${datadog_agent::params::conf_dir}/docker_daemon.d"
 
     file { $legacy_dir:
@@ -84,7 +84,7 @@
     ensure => 'absent',
   }
 
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/docker.d"
 
     file { $dst_dir:

manifests/integrations/elasticsearch.pp

@@ -66,7 +66,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/elastic.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/elastic.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/fluentd.pp

@@ -24,7 +24,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/fluentd.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/fluentd.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/generic.pp

@@ -24,7 +24,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/${integration_name}.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/${integration_name}.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/haproxy.pp

@@ -37,7 +37,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/haproxy.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/haproxy.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/http_check.pp

@@ -239,7 +239,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/http_check.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/http_check.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/jenkins.pp

@@ -19,7 +19,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/jenkins.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/jenkins.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/jmx.pp

@@ -68,7 +68,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/jmx.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/jmx.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/kafka.pp

@@ -87,7 +87,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kafka.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kafka.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/kong.pp

@@ -35,7 +35,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kong.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kong.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/kubernetes.pp

@@ -33,7 +33,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kubernetes.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kubernetes.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/kubernetes_state.pp

@@ -25,7 +25,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/kubernetes_state.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/kubernetes_state.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/linux_proc_extras.pp

@@ -19,7 +19,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/linux_proc_extras.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/linux_proc_extras.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/logs.pp

@@ -39,7 +39,7 @@
 class datadog_agent::integrations::logs (
   Array $logs = [],
 ) inherits datadog_agent::params {
-  unless versioncmp($datadog_agent::_agent_major_version, '5') == 0 {
+  unless $datadog_agent::_agent_major_version == 5 {
     require datadog_agent
 
     file { "${datadog_agent::params::conf_dir}/logs.yaml":

manifests/integrations/marathon.pp

@@ -19,7 +19,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/marathon.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/marathon.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/memcache.pp

@@ -55,7 +55,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mcache.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mcache.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/mesos_master.pp

@@ -18,7 +18,7 @@
 ) inherits datadog_agent::params {
   require datadog_agent
 
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mesos.d"
 
     file { $dst_dir:
@@ -39,7 +39,7 @@
   }
 
   $legacy_dst_master = "${datadog_agent::params::legacy_conf_dir}/mesos_master.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_master_dir = "${datadog_agent::params::conf_dir}/mesos_master.d"
     file { $legacy_dst_master:
       ensure => 'absent',

manifests/integrations/mesos_slave.pp

@@ -17,7 +17,7 @@
   String $url = 'http://localhost:5051'
 ) inherits datadog_agent::params {
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mesos_slave.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mesos_slave.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/mongo.pp

@@ -99,7 +99,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mongo.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mongo.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/mysql.pp

@@ -117,7 +117,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/mysql.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/mysql.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/network.pp

@@ -42,7 +42,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/network.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/network.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/nginx.pp

@@ -66,7 +66,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/nginx.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/nginx.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/ntp.pp

@@ -33,7 +33,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/ntp.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/ntp.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/pgbouncer.pp

@@ -54,7 +54,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/pgbouncer.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/pgbouncer.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/php_fpm.pp

@@ -51,7 +51,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/php_fpm.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/php_fpm.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/postfix.pp

@@ -49,7 +49,7 @@
   }
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/postfix.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/postfix.d"
     file { $legacy_dst:
       ensure => 'absent',

manifests/integrations/postgres.pp

@@ -103,7 +103,7 @@
   require datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/postgres.yaml"
-  if versioncmp($datadog_agent::_agent_major_version, '5') > 0 {
+  if $datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/postgres.d"
     file { $legacy_dst:
       ensure => 'absent',