Fixes #31213 - hostgroup API facets extension point #8115

ezr-ondrej · 2020-10-29T18:44:34Z

Adds Facet extension points for Hostgroup API responses.
Adds forgotten refresh for existing entires on hostgroup.

EDIT: This is needed by foreman_puppet_enc plugin since theforeman/foreman_puppet@40cfb9b#diff-8dc4b7b4116cb63c7a7b1b3c40a25c515f61ccceff63bb4b387eda1f10607988R102-R104

theforeman-bot · 2020-10-29T18:44:41Z

Issues: #31213

ShimShtein

Do we have the usage counterpart for this?

app/models/concerns/facets/hostgroup_extensions.rb

ezr-ondrej · 2020-11-18T17:00:18Z

Do we have the usage counterpart for this?

Sorry not to include it right away, this is the counterpart:
theforeman/foreman_puppet@40cfb9b#diff-8dc4b7b4116cb63c7a7b1b3c40a25c515f61ccceff63bb4b387eda1f10607988R102-R104
Just clone the plugin, require it :)

ShimShtein

Unfortunately, katello test failures are related.

Log from local run:

2020-11-22T10:42:54 [I|app|] Backtrace for 'Action failed' error (ActionView::Template::Error): undefined method `content_view_version' for #<Katello::Hostgroup::ContentFace
t:0x0000000018f6fd70>
 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/activemodel-6.0.3.4/lib/active_model/attribute_methods.rb:432:in `method_missing'
 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/audited-4.9.0/lib/audited/auditor.rb:99:in `method_missing'
 | /home/vagrant/katello/app/views/katello/api/v2/content_facet/show.json.rabl:6:in `block (2 levels) in cached_source_3397887158937366876'
 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/rabl-0.14.3/lib/rabl/builder.rb:157:in `node'
 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/rabl-0.14.3/lib/rabl/builder.rb:116:in `block in compile_settings'
...
 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/rabl-0.14.3/lib/rabl/engine.rb:287:in `partial'
 | /home/vagrant/foreman/app/views/api/v2/hostgroups/show.json.rabl:25:in `block (2 levels) in cached_source_1252319207728911631'
 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/rabl-0.14.3/lib/rabl/builder.rb:157:in `node'
 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/rabl-0.14.3/lib/rabl/builder.rb:116:in `block in compile_settings'
...
 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/rabl-0.14.3/lib/rabl/engine.rb:49:in `render'
 | /home/vagrant/foreman/config/initializers/rabl_init.rb:49:in `render'
 | /home/vagrant/foreman/app/views/api/v2/hostgroups/update.json.rabl:3:in `_40ee894962f6d73f981bdbae3abcc910'

ezr-ondrej · 2020-11-22T22:06:43Z

Unfortunately, katello test failures are related.

I think it's because of initialization of the association being done twice. Rails are not handling it that well.
I've rewritten it to register the associations only once, I think it's bit better like this, let me know what you think.
Maybe the method naming is bit off? 🤔

ezr-ondrej · 2020-11-22T22:07:57Z

app/models/concerns/facets/model_extensions_base.rb

@@ -41,16 +41,20 @@ def refresh_facet_relations
      #    host.foo # => will call Host.my_facet.foo
      def register_facet_relation(facet_config)


this method is now not being called IIRC, but not sure about that.

ezr-ondrej · 2020-11-23T12:19:10Z

I've extracted the refresh / register to #8151

ShimShtein

Still failing on katello content hosts page:

15:36:05 rails.1   | 2020-11-23T15:36:05 [W|app|da21f3e1] Action failed
15:36:05 rails.1   | 2020-11-23T15:36:05 [I|app|da21f3e1] Backtrace for 'Action failed' error (ActionView::Template::Error): undefined local variable or method `hostgroup' for #<Rabl::Engine:0x0000000014698b10>
15:36:05 rails.1   |  da21f3e1 | /home/vagrant/foreman/.vendor/ruby/2.5.0/gems/rabl-0.14.3/lib/rabl/engine.rb:359:in `method_missing'
15:36:05 rails.1   |  da21f3e1 | /home/vagrant/foreman/app/views/api/v2/hosts/main.json.rabl:61:in `block in cached_source_3230678856672812020'
15:36:05 rails.1   |  da21f3e1 | /home/vagrant/foreman/app/views/api/v2/hosts/main.json.rabl:59:in `each'
15:36:05 rails.1   |  da21f3e1 | /home/vagrant/foreman/app/views/api/v2/hosts/main.json.rabl:59:in `cached_source_3230678856672812020'
...
15:36:05 rails.1   |  da21f3e1 | /home/vagrant/foreman/config/initializers/rabl_init.rb:49:in `render'
15:36:05 rails.1   |  da21f3e1 | /home/vagrant/foreman/app/views/api/v2/hosts/index.json.rabl:3:in `_d400f40cad14669013188f1e28fe919e'

ezr-ondrej · 2020-11-24T08:34:46Z

[test katello]

ezr-ondrej · 2020-11-29T20:57:00Z

[test katello]

Adds Facet extension points for Hostgroup API responses. Refactor refresh for facets, to ensure all run just once. Now the already registered entries are being run once the facet entry point is configured. The hook is registered also on the entry point registration. It should give us more clear API of the new facet entry poin registration.

fixes an issue with an Model having access to general facet definitions (entries) rather than it's own (model based entries) definitions.

test/controllers/api/v2/hosts_controller_test.rb

test/controllers/api/v2/hostgroups_controller_test.rb

ezr-ondrej · 2020-11-30T16:19:57Z

[test katello] https://ci.theforeman.org/job/test_develop_pr_katello/6695 passed, it could be a node host that makes the difference or the test concurrency

ezr-ondrej · 2020-11-30T23:45:21Z

I've added tests and we are 🍏

tbrisker · 2021-01-05T15:37:28Z

ping @ShimShtein what's the status here?

ShimShtein · 2021-01-06T11:02:17Z

Merged, thanks @ezr-ondrej!

* Fixes #31213 - hostgroup API facets extension point Adds Facet extension points for Hostgroup API responses. Refactor refresh for facets, to ensure all run just once. Now the already registered entries are being run once the facet entry point is configured. The hook is registered also on the entry point registration. It should give us more clear API of the new facet entry poin registration. * Refs #31213 - model specific definition iterrable fixes an issue with an Model having access to general facet definitions (entries) rather than it's own (model based entries) definitions. * Refs #31213 - Add tests for API response with facets

theforeman-bot added Needs testing Not yet reviewed labels Oct 29, 2020

ezr-ondrej force-pushed the add_hostgroup_api_facets branch 3 times, most recently from 8b10ef7 to a7e4423 Compare October 29, 2020 22:42

ezr-ondrej assigned ShimShtein Nov 4, 2020

ShimShtein requested changes Nov 11, 2020

View reviewed changes

app/models/concerns/facets/hostgroup_extensions.rb Show resolved Hide resolved

theforeman-bot added Waiting on contributor and removed Not yet reviewed labels Nov 11, 2020

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from a7e4423 to 76459ac Compare November 21, 2020 15:00

theforeman-bot added Needs re-review and removed Waiting on contributor labels Nov 21, 2020

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from 76459ac to e27b97b Compare November 21, 2020 15:02

ShimShtein approved these changes Nov 22, 2020

View reviewed changes

theforeman-bot removed the Needs re-review label Nov 22, 2020

ShimShtein requested changes Nov 22, 2020

View reviewed changes

theforeman-bot added the Waiting on contributor label Nov 22, 2020

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from e27b97b to d4bf69f Compare November 22, 2020 16:33

theforeman-bot added Needs re-review and removed Waiting on contributor labels Nov 22, 2020

ezr-ondrej force-pushed the add_hostgroup_api_facets branch 2 times, most recently from 526f1de to b9bfb6c Compare November 22, 2020 22:03

ezr-ondrej commented Nov 22, 2020

View reviewed changes

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from b9bfb6c to 85b0c66 Compare November 22, 2020 22:11

ezr-ondrej force-pushed the add_hostgroup_api_facets branch 2 times, most recently from 05bfb01 to 2b5a18c Compare November 23, 2020 13:10

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from 2b5a18c to b9b703e Compare November 23, 2020 14:49

ShimShtein requested changes Nov 23, 2020

View reviewed changes

theforeman-bot added Waiting on contributor and removed Needs re-review labels Nov 23, 2020

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from b9b703e to 711a1a8 Compare November 23, 2020 15:56

theforeman-bot added Needs re-review and removed Waiting on contributor labels Nov 23, 2020

ezr-ondrej added 2 commits November 30, 2020 15:11

Refs #31213 - model specific definition iterrable

2c05135

fixes an issue with an Model having access to general facet definitions (entries) rather than it's own (model based entries) definitions.

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from 711a1a8 to 663fddd Compare November 30, 2020 14:11

houndci-bot reviewed Nov 30, 2020

View reviewed changes

test/controllers/api/v2/hosts_controller_test.rb Outdated Show resolved Hide resolved

test/controllers/api/v2/hostgroups_controller_test.rb Outdated Show resolved Hide resolved

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from 663fddd to 371123d Compare November 30, 2020 15:34

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from 371123d to 0053393 Compare November 30, 2020 17:24

Refs #31213 - Add tests for API response with facets

1bfb711

ezr-ondrej force-pushed the add_hostgroup_api_facets branch from 0053393 to 1bfb711 Compare November 30, 2020 20:23

ShimShtein approved these changes Jan 6, 2021

View reviewed changes

theforeman-bot removed the Needs re-review label Jan 6, 2021

ShimShtein merged commit 477d457 into theforeman:develop Jan 6, 2021

ezr-ondrej deleted the add_hostgroup_api_facets branch January 6, 2021 13:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #31213 - hostgroup API facets extension point #8115

Fixes #31213 - hostgroup API facets extension point #8115

ezr-ondrej commented Oct 29, 2020 •

edited

Loading

theforeman-bot commented Oct 29, 2020

ShimShtein left a comment

ezr-ondrej commented Nov 18, 2020

ShimShtein left a comment

ezr-ondrej commented Nov 22, 2020

ezr-ondrej Nov 22, 2020

ezr-ondrej commented Nov 23, 2020

ShimShtein left a comment

ezr-ondrej commented Nov 24, 2020

ezr-ondrej commented Nov 29, 2020

ezr-ondrej commented Nov 30, 2020

ezr-ondrej commented Nov 30, 2020

tbrisker commented Jan 5, 2021

ShimShtein commented Jan 6, 2021

		@@ -41,16 +41,20 @@ def refresh_facet_relations
		# host.foo # => will call Host.my_facet.foo
		def register_facet_relation(facet_config)

Fixes #31213 - hostgroup API facets extension point #8115

Fixes #31213 - hostgroup API facets extension point #8115

Conversation

ezr-ondrej commented Oct 29, 2020 • edited Loading

theforeman-bot commented Oct 29, 2020

ShimShtein left a comment

Choose a reason for hiding this comment

ezr-ondrej commented Nov 18, 2020

ShimShtein left a comment

Choose a reason for hiding this comment

ezr-ondrej commented Nov 22, 2020

ezr-ondrej Nov 22, 2020

Choose a reason for hiding this comment

ezr-ondrej commented Nov 23, 2020

ShimShtein left a comment

Choose a reason for hiding this comment

ezr-ondrej commented Nov 24, 2020

ezr-ondrej commented Nov 29, 2020

ezr-ondrej commented Nov 30, 2020

ezr-ondrej commented Nov 30, 2020

tbrisker commented Jan 5, 2021

ShimShtein commented Jan 6, 2021

ezr-ondrej commented Oct 29, 2020 •

edited

Loading