Merge pull request #1382 from DavidS/rsapi-module-removal

pmcmaw · web-flow · commit a6101cb48d2d · 2021-04-20T14:55:14.000+01:00
Remove puppet5-specific resource_api module dependency
diff --git a/metadata.json b/metadata.json
@@ -11,10 +11,6 @@
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 3.2.0 < 8.0.0"
-    },
-    {
-      "name": "puppetlabs/resource_api",
-      "version_requirement": ">= 1.0.0 < 2.0.0"
     }
   ],
   "operatingsystem_support": [
diff --git a/spec/acceptance/types/mysql_login_path_spec.rb b/spec/acceptance/types/mysql_login_path_spec.rb
@@ -35,9 +35,6 @@
 
   describe 'setup' do
     pp = <<-MANIFEST
-      if versioncmp($::puppetversion, '6.0.0') < 0 {
-        include resource_api
-      }
       user { 'loginpath_test':
         ensure => present,
         managehome => true,

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,6 @@`
`11`	`11`	`{`
`12`	`12`	`"name": "puppetlabs/stdlib",`
`13`	`13`	`"version_requirement": ">= 3.2.0 < 8.0.0"`
`14`		`- },`
`15`		`- {`
`16`		`- "name": "puppetlabs/resource_api",`
`17`		`- "version_requirement": ">= 1.0.0 < 2.0.0"`
`18`	`14`	`}`
`19`	`15`	`],`
`20`	`16`	`"operatingsystem_support": [`