ENT-13295: Added evaluation order option in body agent control

[victormlg]

You can now override the body common control's evaluation_order option for agents.

body common control
{
  evaluation_order => "classic";
}
body agent control
{
  evaluation_order => "top_down"; #override
}
bundle agent main
{
  reports:
    "Hello world!";
}

I removed this because it doesn't look like it does much.

if (CommonControlFromString(cp->lval) != COMMON_CONTROL_MAX)
{
    /* Already handled in generic_agent */
    continue;
}

[nickanderson]

s/body agent/body file/g

;)

I am trolling here in case it's not obvious.

[olehermanse]

s/body agent/body file/g

No, that's a separate ticket. This is just about making it work in both body common control and body agent control.

[nickanderson]

s/body agent/body file/g

No, that's a separate ticket. This is just about making it work in both body common control and body agent control.

🧌

[nickanderson]

You can now override the body common control's evaluation_order option for agents using agent_evaluation_order.

Great ...

I had to use a different name because by default in the C code, it skips the options that have the same name in common control: > > > if (CommonControlFromString(cp->lval) != COMMON_CONTROL_MAX) > { > _* Already handled in generic_agent *_ > continue; > } >

This is I think worth looking at more closely. I have not filed a ticket that I recall, but it has indeed annoyed me when we have identical config options that override that are not named the same. I don't recall specific attributes that re this way, but i think that this:

body common control
{
      # This applies to all components, unless the component has a more specific setting
      evaluation_order => "classic"; # I think this should also support "normal" but it's just a nitpick
}

body agent control
{
      # cf-agent only, will process policy top-down, other componetns (cf-serverd, cf-execd, cf-monitord, cf-hub) will follow common control or their own control setting.
      evaluation_order => "top_down";
 }

Looks nicer than:

body common control
{
      # This applies to all components, unless the component has a more specific setting
      evaluation_order => "classic"; # I think this should also support "normal" but it's just a nitpick
}

body agent control
{
      # cf-agent only, will process policy top-down, other componetns (cf-serverd, cf-execd, cf-monitord, cf-hub) will follow common control or their own control setting.
      agent_evaluation_order => "top_down";
 }

I'd almost rather prefer this if we must not use the same attribute names:

body common control
{
      # This applies to all components, unless the component has a more specific setting
      common_evaluation_order => "classic"; # I think this should also support "normal" but it's just a nitpick
}

body agent control
{
      # cf-agent only, will process policy top-down, other componetns (cf-serverd, cf-execd, cf-monitord, cf-hub) will follow common control or their own control setting.
      agent_evaluation_order => "top_down";
 }

[victormlg]

I updated the PR description

[nickanderson]

I won't judge the C code, but 👍 on the CFEngine syntax.

[olehermanse]

@cf-bottom jenkins, please :)

[cf-bottom]

Sure, I triggered a build:

Jenkins: https://ci.cfengine.com/job/pr-pipeline/12920/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12920/

[larsewi]

Suggested change

	// or if not defined there either, default to true (normal order)
	// or if not defined there either, default to true (classic order)