agentless-catalog-executor 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d791e5e1528ffc2b85e6040851de75ef8618d918
-  data.tar.gz: 552781fb8ab839d69ac6c51a0d1e6d602cb317e4
+SHA256:
+  metadata.gz: 92395f0079ad1725aee845a780da2c613c02b6709053288e60ff374bf9f1260c
+  data.tar.gz: a8e35c7eaca53dc0e294779122a50f85b325b312c51bcdca192bcfd4b00d3b18
 SHA512:
-  metadata.gz: 4fef3a93cdb37b5ab0d6604f2e90af25413957f5323913b11fa9d19629e1e4b9f43c7fd4a55b453100cf127d295c4b611dac99b04781cb8be8aafef1a3b88e75
-  data.tar.gz: abd5923765bf1bc755312655fc181b00ac7e61c7029d74ac1d48bf96b7bd3a45cb89b0a6cac9a75b62866e190e00ec090e433a600cb74eafffd72211ef1177e1
+  metadata.gz: 4eeeacc1233b2541287c3965409f9b8e155de490e430ee0eb927af210484fa42d81f4bc475bc88f5475464639489d41bac550943751f38a3e493af64e8caa8a5
+  data.tar.gz: a8e6988f55d193eb286e1139aa5b7f8dbc37849ff77d8664a27140878de2ad1715d0ca3438f787ceaf842107d01890bb287d53c1e3a2e782ea1f5a11b8ea6d09

data/.rubocop.yml

@@ -13,6 +13,9 @@ AllCops:
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/WordArray:
+  Enabled: false
+
 Style/AccessModifierDeclarations:
   Enabled: false
 

data/.travis.yml

@@ -1,7 +1,16 @@
-sudo: false
+dist: xenial
 language: ruby
 rvm:
   - 2.5.1
 env:
   - COVERAGE=yes
-before_install: gem install bundler -v 1.16.1
+services:
+  - docker
+# Workaround for https://tickets.puppetlabs.com/browse/FM-8106
+install: bundle install --path=.bundle
+before_install:
+  - docker network create spec_default
+  - docker-compose -f ./spec/docker-compose.yml up -d --build
+  - docker ps -a
+  - while true; do echo Checking...; echo $(docker logs spec_puppet_1 --tail 10) | grep -q 'Puppet Server has successfully started' && break; sleep 1; done ;
+  - docker exec spec_puppet_1 puppetserver ca generate --certname aceserver --subject-alt-names 'puppet,localhost,aceserver,ace_aceserver_1,spec_puppetserver_1,ace_server,puppet_server,spec_aceserver_1,puppetdb,spec_puppetdb_1,0.0.0.0'

data/CHANGELOG.md

@@ -3,6 +3,21 @@
 All significant changes to this repo will be summarized in this file.
 
 
+## [v0.10.0](https://github.com/puppetlabs/ace/tree/v0.10.0) (2019-07-25)
+[Full Changelog](https://github.com/puppetlabs/ace/compare/v0.9.1...v0.10.0)
+
+**Merged pull requests:**
+
+- fixed rubocop offenses [\#46](https://github.com/puppetlabs/ace/pull/46) ([Lavinia-Dan](https://github.com/Lavinia-Dan))
+- \(FM-8106\) Workaround license\_finder issue [\#45](https://github.com/puppetlabs/ace/pull/45) ([DavidS](https://github.com/DavidS))
+- \(FM-7953\) Add acceptance tests to travis [\#43](https://github.com/puppetlabs/ace/pull/43) ([da-ar](https://github.com/da-ar))
+- \(maint\) making it clear on order of running the containers [\#42](https://github.com/puppetlabs/ace/pull/42) ([Thomas-Franklin](https://github.com/Thomas-Franklin))
+- \(FM-7954\) plugin cache purge for stale environments [\#41](https://github.com/puppetlabs/ace/pull/41) ([Thomas-Franklin](https://github.com/Thomas-Franklin))
+- \(maint\) fixing up the docker setup for executing catalogs [\#40](https://github.com/puppetlabs/ace/pull/40) ([Thomas-Franklin](https://github.com/Thomas-Franklin))
+- \(maint\) Docker doc update [\#39](https://github.com/puppetlabs/ace/pull/39) ([willmeek](https://github.com/willmeek))
+- \(FM-7927\) Update developer docs [\#38](https://github.com/puppetlabs/ace/pull/38) ([DavidS](https://github.com/DavidS))
+- \(FM-7975\) Remove mock responses from /execute\_catalog endpoint [\#37](https://github.com/puppetlabs/ace/pull/37) ([da-ar](https://github.com/da-ar))
+
 ## [v0.9.1](https://github.com/puppetlabs/ace/tree/v0.9.1) (2019-04-16)
 [Full Changelog](https://github.com/puppetlabs/ace/compare/v0.9.0...v0.9.1)
 
@@ -12,6 +27,7 @@ All significant changes to this repo will be summarized in this file.
 
 **Merged pull requests:**
 
+- \(maint\) Release prep for v0.9.1 [\#36](https://github.com/puppetlabs/ace/pull/36) ([willmeek](https://github.com/willmeek))
 - \(FM-7927\) Docs review [\#35](https://github.com/puppetlabs/ace/pull/35) ([clairecadman](https://github.com/clairecadman))
 
 ## [v0.9.0](https://github.com/puppetlabs/ace/tree/v0.9.0) (2019-04-16)

data/Dockerfile

@@ -1,5 +1,5 @@
 # Install gems
-FROM alpine:3.8 as build
+FROM puppet/puppet-agent-alpine:6.4.2 as build
 
 RUN \
 apk --no-cache add build-base ruby-dev ruby-bundler ruby-json ruby-bigdecimal git openssl-dev && \
@@ -10,14 +10,9 @@ RUN mkdir /ace
 # Gemfile requires gemspec which requires ace/version which requires ace
 ADD . /ace
 WORKDIR /ace
-RUN rm Gemfile.lock
+RUN rm -f Gemfile.lock
 RUN bundle install --no-cache --path vendor/bundle
 
-# symlink the usr local ruby to the one expected
-# in a task
-RUN mkdir -p /opt/puppetlabs/puppet/bin/ && \
-    ln -s /usr/bin/ruby /opt/puppetlabs/puppet/bin/ruby
-
 # Final image
 FROM build
 ARG ace_version=no-version

data/Gemfile

@@ -8,6 +8,7 @@ group :tests do
   gem 'codecov'
   gem 'license_finder' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
   gem 'simplecov-console'
+  gem 'webmock'
 end
 
 group :development do
@@ -15,7 +16,6 @@ group :development do
   gem 'github_changelog_generator', '~> 1.14'
   gem 'pry-byebug'
   gem 'rubocop-rspec'
-  gem 'webmock'
 end
 
 # Specify your gem's dependencies in agentless-catalog-executor.gemspec

data/README.md

@@ -1,22 +1,26 @@
 # Agentless::Catalog::Executor
 
-## Installation
+## App Overview
+
+The Agentless Catalog Executor (ACE) provides agentless executions services for tasks and catalogs to Puppet Enterprise (PE). See [developer-docs/api](developer-docs/api.md) for an API spec. See below for development info.
+
+## Code Overview
 
-The Agentless Catalog Executor (ACE) is built-in to Puppet Enterprise (PE) as pe-ace-server.
+API entrypoints are in `lib/ace/transport_app.rb`.
 
-## Usage
+Fork isolation is implemented in `lib/ace/fork_utils.rb`
 
-To spin up an instance for development, run the puma server:
+Catalog compilations use the certless [v4 catalog](https://github.com/puppetlabs/puppetserver/blob/master/documentation/puppet-api/v4/catalog.markdown) puppetserver endpoint and expose it through the indirector in `lib/puppet/indirector/catalog/certless.rb`.
+
+## Installation
 
-```
-ACE_CONF=config/local.conf bundle exec puma -C config/transport_tasks_config.rb
-```
+ACE is built-in to PE as pe-ace-server.
 
 ## Development
 
-As ACE is dependent on Puppet Server, there is a docker-compose file in the `spec/` directory which we advise you run before  the ACE service to ensure that the certs and keys are valid. For more information, see the [docker documentation](developer-docs/docker).
+As ACE is dependent on Puppet Server, there is a docker-compose file in the `spec/` directory which we advise you run before  the ACE service to ensure that the certs and keys are valid. For more information, see the [docker documentation](developer-docs/docker.md).
 
-To release a new version, update the version number in `version.rb` and  run `bundle exec rake release`, which creates a git tag for the version, pushes git commits and tags, and pushes the `.gem` file to [rubygems.org](https://rubygems.org). Released gems are eventually consumed by [ace-vanagon](https://github.com/puppetlabs/ace-vanagon) and promoted into PE.
+To release a new version, update the version number in `version.rb`, generate a new changelog with `bundle exec rake changelog`, commit the results and run `bundle exec rake release`, which creates a git tag for the version, pushes git commits and tags, and pushes the `.gem` file to [rubygems.org](https://rubygems.org). Released gems are eventually consumed by [ace-vanagon](https://github.com/puppetlabs/ace-vanagon) and promoted into PE.
 
 ## Contributing
 

data/Rakefile

@@ -12,9 +12,7 @@ task default: %i[rubocop spec license_finder]
 #### RSPEC ####
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.exclude_pattern = 'spec/acceptance/**/*_spec.rb'
-end
+RSpec::Core::RakeTask.new(:spec)
 
 namespace :spec do
   desc 'Run RSpec code examples with coverage collection'

data/agentless-catalog-executor.gemspec

@@ -30,7 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails-auth", ">= 2.1.4"
   spec.add_dependency "sinatra", ">= 2.0.4"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", ">= 1.16", "< 3.0.0"
+  spec.add_development_dependency "faraday"
   spec.add_development_dependency "rack-test", "~> 1.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/config/docker.conf

@@ -1,9 +1,18 @@
 ace-server: {
-    ssl-cert: "spec/volumes/puppet/ssl/certs/aceserver.pem"
-    ssl-key: "spec/volumes/puppet/ssl/private_keys/aceserver.pem"
-    ssl-ca-cert: "spec/volumes/puppet/ssl/certs/ca.pem"
-    ssl-ca-crls: "spec/volumes/puppet/ssl/certs/crl.pem"
-    puppet-server-uri: "https://spec_puppet_1:8140"
+    # being explicit about the pathing within the container
+    # although it is ran from within the /ace directory
+    # we feel it is best to distinguish that this is a
+    # docker configuration file and not a `local`
+    ssl-cert: "/ace/spec/volumes/puppet/ssl/certs/aceserver.pem"
+    ssl-key: "/ace/spec/volumes/puppet/ssl/private_keys/aceserver.pem"
+    ssl-ca-cert: "/ace/spec/volumes/puppet/ssl/certs/ca.pem"
+    ssl-ca-crls: "/ace/spec/volumes/puppet/ssl/ca/ca_crl.pem"
+    # the dns of puppet within  the docker network
+    # is the same as spec_puppet_1 locally as the
+    # hostname is `puppet` within the docker network
+    puppet-server-uri: "https://puppet:8140"
     loglevel: debug
+    # host to run the ACE service on, i.e.
+    # 0.0.0.0 within the container
     host: "0.0.0.0"
 }

data/developer-docs/api.md

@@ -110,30 +110,6 @@ The `compiler` is a JSON object which contains parameters regarding the compilat
 This is a copy of [bolt's task object](https://github.com/puppetlabs/bolt/blob/master/developer-docs/bolt-api-servers.md#task-object)
 
 
-## Running ACE in a container
-*Recommended*
+## Running ACE
 
-From your checkout of ACE start the docker-compose to run ACE
-
-```
-docker-compose up -d --build
-```
-
-You can now make a curl request to ACE, which should respond with 'OK':
-
-```
-curl -X POST http://0.0.0.0:44633/check
-```
-
-## Running from source
-
-From your checkout of ACE run
-
-```
-bundle exec puma -p 44633 -C puma_config.rb
-```
-
-You can now make a curl request to ACE, which should respond with 'OK':
-```
-curl -X POST http://0.0.0.0:44633/check
-```
+See the [docker](docker.md) docs on how to run ACE for development.

data/developer-docs/docker.md

@@ -4,27 +4,16 @@
 
 [Docker-compose installation](https://docs.docker.com/compose/install/) would need to be followed and setup in order to use the ACE containers for development.
 
-
-The ACE compose file is dependent on a Docker network created when launching the Puppetserver and PuppetDB containers within the `spec/` directory, the network will default to `spec_default`, since the containers are built from the `spec/` directory they will be assigned the `<folder>_default` network.
-
-As the ACE container is build outside of the `spec/` directory it would not be able to create the `spec_default` network. This can be created manually through:
-
-```
-docker network create spec_default
-```
-
-Once this is done the ACE container can be launched by executing the following within the root folder:
+The ACE service is dependent on having access to a Puppetserver and a PuppetDB, these are included as Docker containers. Navigate to the `spec/` folder and build the Puppetserver and PuppetDB containers using the following command.
 
 ```
 docker-compose up -d --build
 ```
 
-This will take some time as it needs to perform the initial build of fetching the images and running through the build.
-
-Navigate to the `spec/` folder and build the Puppetserver and PuppetDB containers using the same command. The Puppetserver will take some time to start and typically using the following command to verify that it is ready:
+The Puppetserver will take some time to start and typically using the following command to verify that it is ready:
 
 ```
-docker logs --follow spec_puppetserver_1
+docker logs --follow spec_puppet_1
 ```
 
 Once the Puppetserver is ready, the following message is reported:
@@ -42,7 +31,7 @@ sudo chmod a+rx -R volumes/
 
 At this point it is required to generate certs for the `aceserver`, this can be achieved though:
 
-`docker exec spec_puppet_1 puppetserver ca generate --certname aceserver --subject-alt-names localhost,aceserver,ace_aceserver_1,spec_puppetserver_1,ace_server,puppet_server,spec_aceserver_1,puppetdb,spec_puppetdb_1,0.0.0.0,puppet`
+`docker exec spec_puppet_1 puppetserver ca generate --certname aceserver --subject-alt-names localhost,aceserver,ace_aceserver_1,spec_puppetserver_1,ace_server,puppet_server,spec_aceserver_1,puppetdb,spec_puppetdb_1,0.0.0.0,puppet,spec_puppet_1,ace_aceserver_1`
 
 On Linux, ensure that you have access to the newly created files:
 
@@ -52,11 +41,26 @@ sudo chmod a+rx -R volumes/
 
 Reasoning for this is that it makes it easier to ensure that the cert names are consistent across environments.
 
+Once the containers in the `spec/` directory are running, the ACE container can be launched by executing the following command within the root of the project:
+
+```
+docker-compose up -d --build
+```
+
+_Note_: If the `aceserver` certificate needs regenerated the following steps can be performed:
+
+```
+docker exec spec_puppet_1 puppetserver ca revoke --certname aceserver
+docker exec spec_puppet_1 rm /etc/puppetlabs/puppet/ssl/certs/aceserver.pem /etc/puppetlabs/puppet/ssl/private_keys/aceserver.pem /etc/puppetlabs/puppet/ssl/public_keys/aceserver.pem /etc/puppetlabs/puppet/ssl/ca/signed/aceserver.pem
+```
+
+And then generate the certificate again using the `ca generate` command from above.
+
 ## Verifying the services
 
 [Postman](https://www.getpostman.com/) is advisable to verify that the endpoints are configured. In order to set up Postman, navigate to Settings > Certificates and add client certificates for hosts `0.0.0.0:8140` and `0.0.0.0:44633` where the CRT file points to `spec/volumes/puppet/ssl/certs/aceserver.pem` and Key file points to `spec/volumes/puppet/ssl/private_keys/aceserver.pem`
 
-*Note*: These cert and key files will only be created when the PuppetServer container has finished initalising.
+*Note*: These cert and key files will only be created when the PuppetServer container has finished initalising and the `ca generate` command has been used.
 
 ### PuppetServer /tasks/:module/:task
 

data/lib/ace/error.rb

@@ -17,15 +17,19 @@ module ACE
     end
 
     def to_h
+      Error.to_h(msg, kind, details, issue_code)
+    end
+
+    def to_json(opts = nil)
+      to_h.to_json(opts)
+    end
+
+    def self.to_h(message, kind, details = nil, issue_code = nil)
       h = { 'kind' => kind,
             'msg' => message,
             'details' => details }
       h['issue_code'] = issue_code if issue_code
       h
     end
-
-    def to_json(opts = nil)
-      to_h.to_json(opts)
-    end
   end
 end

data/lib/ace/fork_util.rb

@@ -2,6 +2,8 @@
 
 # English module required for $CHILD_STATUS rather than $?
 require 'English'
+require 'json'
+require 'ace/error'
 
 module ACE
   class ForkUtil
@@ -11,26 +13,46 @@ module ACE
     def self.isolate
       reader, writer = IO.pipe
       pid = fork {
+        # :nocov:
         success = true
         begin
           response = yield
           writer.puts JSON.generate(response)
+        rescue ACE::Error => e
+          writer.puts({
+            msg: e.message,
+            kind: e.kind,
+            details: {
+              class: e.class,
+              backtrace: e.backtrace
+            }
+          }.to_json)
+          success = false
         rescue StandardError => e
-          writer.puts(e)
+          writer.puts({
+            msg: e.message,
+            kind: e.class,
+            details: {
+              class: e.class,
+              backtrace: e.backtrace
+            }
+          }.to_json)
           success = false
         ensure
           Process.exit! success
         end
+        # :nocov:
       }
       unless pid
-        log "Could not fork"
+        warn "Could not fork"
         exit 1
       end
       writer.close
       output = reader.read
       Process.wait(pid)
       if $CHILD_STATUS != 0
-        raise output
+        error = JSON.parse(output)
+        raise ACE::Error.new(error['msg'], error['kind'], error['details'])
       else
         JSON.parse(output)
       end

data/lib/ace/plugin_cache.rb

@@ -9,9 +9,19 @@ require 'ace/fork_util'
 module ACE
   class PluginCache
     attr_reader :cache_dir_mutex, :cache_dir
+
+    PURGE_TIMEOUT = 60 * 60
+    PURGE_INTERVAL = 24 * PURGE_TIMEOUT
+    PURGE_TTL = 7 * PURGE_INTERVAL
+
     def initialize(environments_cache_dir)
       @cache_dir = environments_cache_dir
       @cache_dir_mutex = Concurrent::ReadWriteLock.new
+
+      @purge = Concurrent::TimerTask.new(execution_interval: PURGE_INTERVAL,
+                                         timeout_interval: PURGE_TIMEOUT,
+                                         run_now: true) { expire(PURGE_TTL) }
+      @purge.execute
     end
 
     def setup
@@ -75,5 +85,23 @@ module ACE
       Puppet::Configurer::PluginHandler.new.download_plugins(env)
       libdir(File.join(environments_dir, 'plugins'))
     end
+
+    # the cache_dir will be the `cache-dir` from
+    # the ace config, with the appended environments, i.e.
+    # /opt/puppetlabs/server/data/ace-server/cache/environments
+    # then the directories within this path, which will be
+    # the puppet environments will be removed if they have
+    # not been modified in the last 7 days
+    # when the purge runs (every 24 hours)
+    def expire(purge_ttl)
+      expired_time = Time.now - purge_ttl
+      cache_dir_mutex.with_write_lock do
+        Dir.glob(File.join(cache_dir, '*')).select { |f| File.directory?(f) }.each do |dir|
+          if File.mtime(dir) < expired_time
+            FileUtils.remove_dir(dir)
+          end
+        end
+      end
+    end
   end
 end

data/lib/ace/transport_app.rb

@@ -104,9 +104,9 @@ module ACE
     def validate_schema(schema, body)
       schema_error = JSON::Validator.fully_validate(schema, body)
       if schema_error.any?
-        ACE::Error.new("There was an error validating the request body.",
-                       'puppetlabs/ace/schema-error',
-                       schema_error)
+        raise ACE::Error.new("There was an error validating the request body.",
+                             'puppetlabs/ace/schema-error',
+                             schema_error: schema_error.first)
       end
     end
 
@@ -155,18 +155,19 @@ module ACE
 
       begin
         body = JSON.parse(request.body.read)
+        validate_schema(@schemas["run_task"], body)
+      rescue ACE::Error => e
+        request_error = { _error: e.to_h }
+        return [400, request_error.to_json]
       rescue StandardError => e
         request_error = {
-          _error: ACE::Error.new(e.message,
-                                 'puppetlabs/ace/request_exception',
-                                 class: e.class, backtrace: e.backtrace)
+          _error: ACE::Error.to_h(e.message,
+                                  'puppetlabs/ace/request_exception',
+                                  class: e.class, backtrace: e.backtrace)
         }
         return [400, request_error.to_json]
       end
 
-      error = validate_schema(@schemas["run_task"], body)
-      return [400, error.to_json] unless error.nil?
-
       opts = body['target'].merge('protocol' => 'remote')
 
       # This is a workaround for Bolt due to the way it expects to receive the target info
@@ -195,57 +196,72 @@ module ACE
 
       begin
         body = JSON.parse(request.body.read)
+        validate_schema(@schemas["execute_catalog"], body)
+
+        environment = body['compiler']['environment']
+        certname = body['compiler']['certname']
+        trans_id = body['compiler']['transaction_uuid']
+        job_id = body['compiler']['job_id']
+      rescue ACE::Error => e
+        request_error = {
+          status: 'failure',
+          result: {
+            _error: e.to_h
+          }
+        }
+        return [400, request_error.to_json]
       rescue StandardError => e
         request_error = {
-          _error: ACE::Error.new(e.message,
-                                 'puppetlabs/ace/request_exception',
-                                 class: e.class, backtrace: e.backtrace)
+          status: 'failure',
+          result: {
+            _error: ACE::Error.to_h(e.message,
+                                    'puppetlabs/ace/request_exception',
+                                    class: e.class, backtrace: e.backtrace)
+          }
         }
         return [400, request_error.to_json]
       end
 
-      error = validate_schema(@schemas["execute_catalog"], body)
-      return [400, error.to_json] unless error.nil?
-
-      environment = body['compiler']['environment']
-      certname = body['compiler']['certname']
-
-      # TODO: (needs groomed) - proper error handling, errors within the block can be rescued
-      # and handled correctly, ACE::Errors we can handle similar to the task
-      # workflow, errors within the Configuer and not as pleasant - can have
-      # _some_ control over them, especially around status codes from
-      # the /v4/catalog endpoint
-      @plugins.with_synced_libdir(environment, certname) do
-        ACE::TransportApp.init_puppet_target(certname, body['target']['remote-transport'], body['target'])
-        configurer = ACE::Configurer.new(body['compiler']['transaction_uuid'], body['compiler']['job_id'])
-        configurer.run(transport_name: certname,
-                       environment: environment,
-                       network_device: true,
-                       pluginsync: false,
-                       trusted_facts: ACE::TransportApp.trusted_facts(certname))
-      end
-
-      # simulate expected error cases
-      if body['compiler']['certname'] == 'fail.example.net'
-        [200, { _error: {
-          msg: 'catalog compile failed',
-          kind: 'puppetlabs/ace/compile_failed',
-          details: 'upstream api errors go here'
-        } }.to_json]
-      elsif body['compiler']['certname'] == 'credentials.example.net'
-        [200, { _error: {
-          msg: 'target specification invalid',
-          kind: 'puppetlabs/ace/target_spec',
-          details: 'upstream api errors go here'
-        } }.to_json]
-      elsif body['compiler']['certname'] == 'reports.example.net'
-        [200, { _error: {
-          msg: 'report submission failed',
-          kind: 'puppetlabs/ace/reporting_failed',
-          details: 'upstream api errors go here'
-        } }.to_json]
+      begin
+        @plugins.with_synced_libdir(environment, certname) do
+          ACE::TransportApp.init_puppet_target(certname, body['target']['remote-transport'], body['target'])
+          configurer = ACE::Configurer.new(body['compiler']['transaction_uuid'], body['compiler']['job_id'])
+          configurer.run(transport_name: certname,
+                         environment: environment,
+                         network_device: true,
+                         pluginsync: false,
+                         trusted_facts: ACE::TransportApp.trusted_facts(certname))
+        end
+      rescue ACE::Error => e
+        process_error = {
+          certname: certname,
+          status: 'failure',
+          result: {
+            _error: e.to_h
+          }
+        }
+        return [400, process_error.to_json]
+      rescue StandardError => e
+        process_error = {
+          certname: certname,
+          status: 'failure',
+          result: {
+            _error: ACE::Error.to_h(e.message,
+                                    'puppetlabs/ace/processing_exception',
+                                    class: e.class, backtrace: e.backtrace).to_h
+          }
+        }
+        return [500, process_error.to_json]
       else
-        [200, '{}']
+        result = {
+          certname: certname,
+          status: 'report_generated',
+          result: {
+            transaction_uuid: trans_id,
+            job_id: job_id
+          }
+        }
+        [200, result.to_json]
       end
     end
   end

data/lib/ace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ACE
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agentless-catalog-executor
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - David Schmitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bolt
@@ -112,16 +112,36 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ACE lets you run remote tasks and catalogs using puppet and bolt.