puppet-resource_api 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1109f2b5351f7edd2125d6636807aa1792597d33e5c2ee13be26a9f95cfe3fd
-  data.tar.gz: 90243f80c3466f014a86fd4c5c4e0fd83521147f173764f95b2163fc25ce67ca
+  metadata.gz: 8adaec9101c4bdf2bfaabfbb4ef87147d37c7360dd5008a8da7d0d653bd4071c
+  data.tar.gz: a81e2f4b6e643587b74e7ae4313e9b011f76aeec10b09abc292d9bb65083df2a
 SHA512:
-  metadata.gz: 46eb1a5d01c9f75ba77c558c12415a73b9f9a153f922c7817b9f4efb8d313183e7def1dc79e1bba806aecc2e2436e5985f2896eaafcd4b286a900f784c8538f0
-  data.tar.gz: 95930d409605838df56773c7c95be80f0124bb90a55bb841cb19f8621a486d48ee4b8872a12909bfccf9ce98986ac571493ac799cf0d12259f0de1aa00223161
+  metadata.gz: f910f226a69685dcdadd6391b5ad4f2b5064f1861fdc06c8a7ed36d84f4da49d850983550809eb7053959d94799946c8c6109e0c3c848dbe9649d2bbc23f4f20
+  data.tar.gz: 47ba949ac49e663add1eed1d9648d5b4642346ac4ecbf944447670352e9aa8f75813d5964cab7fd9f2793e1ae49b41153b24d54b0e9bb5884484284d101bb0ca

data/.travis.yml

@@ -10,27 +10,38 @@ script:
 cache: bundler
 matrix:
   include:
-    - rvm: 2.4.1
-      env: PUPPET_GEM_VERSION='~> 5'
+    - rvm: 2.4.3
+      env: PUPPET_GEM_VERSION='~> 5' # 5.5
     - rvm: jruby-1.7.26
       env: PUPPET_GEM_VERSION='~> 5' JRUBY_OPTS="--debug"
     - rvm: jruby-9.1.9.0
       env: PUPPET_GEM_VERSION='~> 5' JRUBY_OPTS="--debug"
-    - rvm: 2.4.1
+    - rvm: 2.4.3
       env: CHECK=rubocop
+    - rvm: 2.4.3
+      env: CHECK=license_finder
+      bundler_args: ""
+
+    - rvm: 2.4.3
+      env: PUPPET_GEM_VERSION='~> 5.4.0'
+    - rvm: 2.4.2
+      env: PUPPET_GEM_VERSION='~> 5.3.0'
+    - rvm: 2.4.1
+      env: PUPPET_GEM_VERSION='~> 5.2.0'
+    - rvm: 2.4.1
+      env: PUPPET_GEM_VERSION='~> 5.1.0'
     - rvm: 2.4.1
       env: PUPPET_GEM_VERSION='~> 5.0.0'
     - rvm: 2.1.9
-      env: PUPPET_GEM_VERSION='~> 4'
+      env: PUPPET_GEM_VERSION='~> 4' # 4.10
     - rvm: 2.1.9
       env: PUPPET_GEM_VERSION='~> 4.9.0'
     - rvm: 2.1.9
       env: PUPPET_GEM_VERSION='~> 4.8.0'
     - rvm: 2.1.9
       env: PUPPET_GEM_VERSION='~> 4.7.0'
-    - rvm: 2.4.1
-      env: CHECK=license_finder
-      bundler_args: ""
+    - rvm: 2.4.3
+      env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#master'
 notifications:
   hipchat:
     rooms:

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [v1.0.2](https://github.com/puppetlabs/puppet-resource_api/tree/v1.0.2) (2018-03-26)
+[Full Changelog](https://github.com/puppetlabs/puppet-resource_api/compare/v1.0.1...v1.0.2)
+
+**Implemented enhancements:**
+
+- \(PDK-875\) Validate behaviour values when registering a type [\#49](https://github.com/puppetlabs/puppet-resource_api/pull/49) ([da-ar](https://github.com/da-ar))
+
+**Fixed bugs:**
+
+- \(PDK-882,PDK-883\) validate only when needed [\#48](https://github.com/puppetlabs/puppet-resource_api/pull/48) ([DavidS](https://github.com/DavidS))
+- \(PDK-884\) Handle missing namevars returned by providers [\#47](https://github.com/puppetlabs/puppet-resource_api/pull/47) ([da-ar](https://github.com/da-ar))
+
+**Merged pull requests:**
+
+- \(PDK-810\) run CI against all the versions [\#46](https://github.com/puppetlabs/puppet-resource_api/pull/46) ([DavidS](https://github.com/DavidS))
+
 ## [v1.0.1](https://github.com/puppetlabs/puppet-resource_api/tree/v1.0.1) (2018-03-23)
 [Full Changelog](https://github.com/puppetlabs/puppet-resource_api/compare/v1.0.0...v1.0.1)
 
@@ -12,6 +28,7 @@ All significant changes to this repo will be summarized in this file.
 
 **Merged pull requests:**
 
+- Release prep for v1.0.1 [\#45](https://github.com/puppetlabs/puppet-resource_api/pull/45) ([DavidS](https://github.com/DavidS))
 - Release prep for v1.0.0 [\#43](https://github.com/puppetlabs/puppet-resource_api/pull/43) ([da-ar](https://github.com/da-ar))
 
 ## [v1.0.0](https://github.com/puppetlabs/puppet-resource_api/tree/v1.0.0) (2018-03-23)

data/Gemfile

@@ -30,7 +30,7 @@ end
 # `git://somewhere.git#branch`. You can also use a file source location, which
 # is specified as `file://some/location/on/disk`.
 def location_for(place_or_version, fake_version = nil)
-  if place_or_version =~ /^(git[:@][^#]*)#(.*)/
+  if place_or_version =~ /^((?:git|https)[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place_or_version =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]

data/README.md

@@ -198,10 +198,16 @@ Currently working:
 
 There are still a few notable gaps between the implementation and the specification:
 * Only a single runtime environment (the Puppet commands) is currently implemented.
+* The `:init_only` behaviour is not yet implemented ([PDK-885](https://tickets.puppetlabs.com/browse/PDK-885))
 
 Restrictions of running under puppet:
 * `supports_noop` is not effective, as puppet doesn't call into the type under noop.
 
+Future possibilities:
+* [Composite Namevars](https://tickets.puppetlabs.com/browse/PDK-531)
+* [Multiple Providers](https://tickets.puppetlabs.com/browse/PDK-530)
+* [Commands API](https://tickets.puppetlabs.com/browse/PDK-847)
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -220,10 +226,10 @@ To cut a new release, from a current `master` checkout:
 * Update the CHANGELOG
   * Have a [CHANGELOG_GITHUB_TOKEN](https://github.com/skywinder/github-changelog-generator#github-token) set in your environment
   * run `rake changelog`
-  * double check the PRs to make sure they're all tagged correctly
+  * double check the PRs to make sure they're all tagged correctly (using the new CHANGELOG for cross-checking)
 * Check README and other materials for up-to-date-ness
 * Commit changes with title "Release prep for v<VERSION>"
 * Upload and PR the release prep to github as normal
 * Check that CI is green and merge the PR
-* Run `rake release[upstream]` to release what just passed CI
-  * make sure to use the name of the git remote to main repo instead of "upstream"
+* Run `rake release[upstream]` to release from your checkout
+  * make sure to use the name of your git remote pointing to main repo instead of "upstream"

data/lib/puppet/resource_api.rb

@@ -62,7 +62,11 @@ module Puppet::ResourceApi
 
       define_method(:initialize) do |attributes|
         # $stderr.puts "A: #{attributes.inspect}"
-        attributes = attributes.to_hash if attributes.is_a? Puppet::Resource
+        if attributes.is_a? Puppet::Resource
+          attributes = attributes.to_hash
+        else
+          @called_from_resource = true
+        end
         # $stderr.puts "B: #{attributes.inspect}"
         if feature_support?('canonicalize')
           attributes = my_provider.canonicalize(context, [attributes])[0]
@@ -76,10 +80,21 @@ module Puppet::ResourceApi
         missing_attrs = []
         definition[:attributes].each do |name, options|
           type = Puppet::Pops::Types::TypeParser.singleton.parse(options[:type])
-          unless [:read_only, :namevar].include? options[:behaviour]
-            missing_attrs << name if value(name).nil? && !(type.instance_of? Puppet::Pops::Types::POptionalType)
+          # skip read only vars and the namevar
+          next if [:read_only, :namevar].include? options[:behaviour]
+
+          # skip properties if the resource is being deleted
+          next if definition[:attributes][:ensure] &&
+                  value(:ensure) == :absent &&
+                  options[:behaviour].nil?
+
+          if value(name).nil? && !(type.instance_of? Puppet::Pops::Types::POptionalType)
+            missing_attrs << name
           end
         end
+
+        missing_attrs -= [:ensure] if @called_from_resource
+
         if missing_attrs.any?
           error_msg = "The following mandatory attributes where not provided:\n    *  " + missing_attrs.join(", \n    *  ")
           raise Puppet::ResourceError, error_msg
@@ -89,6 +104,12 @@ module Puppet::ResourceApi
       definition[:attributes].each do |name, options|
         # puts "#{name}: #{options.inspect}"
 
+        if options[:behaviour]
+          unless [:read_only, :namevar, :parameter].include? options[:behaviour]
+            raise Puppet::ResourceError, "`#{options[:behaviour]}` is not a valid behaviour value"
+          end
+        end
+
         # TODO: using newparam everywhere would suppress change reporting
         #       that would allow more fine-grained reporting through context,
         #       but require more invest in hooking up the infrastructure to emulate existing data
@@ -200,6 +221,9 @@ module Puppet::ResourceApi
             property = definition[:attributes][key.first]
             attr_def[key.first] = property
           end
+          if resource_hash[namevar_name].nil?
+            raise Puppet::ResourceError, "`#{name}.get` did not return a value for the `#{namevar_name}` namevar attribute"
+          end
           Puppet::ResourceApi::TypeShim.new(resource_hash[namevar_name], resource_hash, name, namevar_name, attr_def)
         end
       end

data/lib/puppet/resource_api/version.rb

@@ -1,5 +1,5 @@
 module Puppet
   module ResourceApi
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-resource_api
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - David Schmitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hocon