Skip to content

Commit

Permalink
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Fixes #14514:…
Browse files Browse the repository at this point in the history 
… Add a generic method to add ACLs on a given file

Fixes #14514: Add a generic method to add ACLs on a given file
  • Loading branch information
@Fdall
Fdall committed May 22, 2019
1 parent 129c8b7 commit 92ebf25
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 79 deletions.
22 changes: 11 additions & 11 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.non_recursive.audit.error.cf
View file
Expand Up @@ -113,18 +113,18 @@ bundle agent test

methods:
"enable" usebundle => set_dry_run_mode("true");
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "error", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "error", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "error", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "error", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "error", "ph5" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "error", "ph6" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "error", "ph7" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "error", "ph1", "audit" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "error", "ph2", "audit" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "error", "ph3", "audit" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "error", "ph4", "audit" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "error", "ph5", "audit" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "error", "ph6", "audit" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "error", "ph7", "audit" );
# Do not apply anything on 8
"ph9" usebundle => apply_gm("permissions_acl_entry", @{args9}, "error", "ph9" );
"ph10" usebundle => apply_gm("permissions_acl_entry", @{args10}, "error", "ph10" );
"ph11" usebundle => apply_gm("permissions_acl_entry", @{args11}, "error", "ph11" );
"ph12" usebundle => apply_gm("permissions_acl_entry", @{args12}, "error", "ph12" );
"ph9" usebundle => apply_gm("permissions_acl_entry", @{args9}, "error", "ph9", "audit" );
"ph10" usebundle => apply_gm("permissions_acl_entry", @{args10}, "error", "ph10", "audit" );
"ph11" usebundle => apply_gm("permissions_acl_entry", @{args11}, "error", "ph11", "audit" );
"ph12" usebundle => apply_gm("permissions_acl_entry", @{args12}, "error", "ph12", "audit" );
"disable" usebundle => set_dry_run_mode("false");
}

Expand Down
14 changes: 7 additions & 7 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.non_recursive.audit.success.cf
View file
Expand Up @@ -94,13 +94,13 @@ bundle agent test

methods:
"enable" usebundle => set_dry_run_mode("true");
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "success", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "success", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "success", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "success", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "success", "ph5" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "success", "ph6" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "success", "ph7" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "success", "ph1", "audit" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "success", "ph2", "audit" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "success", "ph3", "audit" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "success", "ph4", "audit" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "success", "ph5", "audit" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "success", "ph6", "audit" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "success", "ph7", "audit" );
"disable" usebundle => set_dry_run_mode("false");
}

Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.non_recursive.error.cf
View file
Expand Up @@ -77,11 +77,11 @@ bundle agent test
"args${init.indices}" slist => { "${init.tmp}/${init.files[${init.indices}]}", "false", "${init.user[${init.indices}]}", "${init.group[${init.indices}]}", "${init.other[${init.indices}]}" };

methods:
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "error", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "error", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "error", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "error", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "error", "ph5" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "error", "ph1", "enforce" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "error", "ph2", "enforce" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "error", "ph3", "enforce" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "error", "ph4", "enforce" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "error", "ph5", "enforce" );
}

#######################################################
Expand Down
16 changes: 8 additions & 8 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.non_recursive.repaired.cf
View file
Expand Up @@ -108,15 +108,15 @@ bundle agent test
"args${init.indices}" slist => { "${init.tmp}/${init.files[${init.indices}]}", "false", "${init.user[${init.indices}]}", "${init.group[${init.indices}]}", "${init.other[${init.indices}]}" };

methods:
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "repaired", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "repaired", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "repaired", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "repaired", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "repaired", "ph5" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "repaired", "ph6" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "repaired", "ph7" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "repaired", "ph1", "enforce" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "repaired", "ph2", "enforce" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "repaired", "ph3", "enforce" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "repaired", "ph4", "enforce" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "repaired", "ph5", "enforce" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "repaired", "ph6", "enforce" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "repaired", "ph7", "enforce" );
# Do not apply anything on 8-10
"ph11" usebundle => apply_gm("permissions_acl_entry", @{args11}, "repaired", "ph11" );
"ph11" usebundle => apply_gm("permissions_acl_entry", @{args11}, "repaired", "ph11", "enforce" );
}

#######################################################
Expand Down
14 changes: 7 additions & 7 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.non_recursive.success.cf
View file
Expand Up @@ -93,13 +93,13 @@ bundle agent test
"args${init.indices}" slist => { "${init.tmp}/${init.files[${init.indices}]}", "false", "${init.user[${init.indices}]}", "${init.group[${init.indices}]}", "${init.other[${init.indices}]}" };

methods:
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "success", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "success", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "success", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "success", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "success", "ph5" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "success", "ph6" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "success", "ph7" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "success", "ph1", "enforce" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "success", "ph2", "enforce" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "success", "ph3", "enforce" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "success", "ph4", "enforce" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "success", "ph5", "enforce" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "success", "ph6", "enforce" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "success", "ph7", "enforce" );
}

#######################################################
Expand Down
24 changes: 12 additions & 12 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.recursive.audit.error.cf
View file
Expand Up @@ -128,19 +128,19 @@ bundle agent test

methods:
"enable" usebundle => set_dry_run_mode("true");
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "error", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "error", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "error", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "error", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "error", "ph5" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "error", "ph6" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "error", "ph7" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "error", "ph1", "audit" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "error", "ph2", "audit" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "error", "ph3", "audit" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "error", "ph4", "audit" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "error", "ph5", "audit" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "error", "ph6", "audit" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "error", "ph7", "audit" );
# Do not apply anything on 8
"ph9" usebundle => apply_gm("permissions_acl_entry", @{args9}, "error", "ph9" );
"ph10" usebundle => apply_gm("permissions_acl_entry", @{args10}, "error", "ph10" );
"ph11" usebundle => apply_gm("permissions_acl_entry", @{args11}, "error", "ph11" );
"ph12" usebundle => apply_gm("permissions_acl_entry", @{args12}, "error", "ph12" );
"ph13" usebundle => apply_gm("permissions_acl_entry", @{args13}, "error", "ph13" );
"ph9" usebundle => apply_gm("permissions_acl_entry", @{args9}, "error", "ph9", "audit" );
"ph10" usebundle => apply_gm("permissions_acl_entry", @{args10}, "error", "ph10", "audit" );
"ph11" usebundle => apply_gm("permissions_acl_entry", @{args11}, "error", "ph11", "audit" );
"ph12" usebundle => apply_gm("permissions_acl_entry", @{args12}, "error", "ph12", "audit" );
"ph13" usebundle => apply_gm("permissions_acl_entry", @{args13}, "error", "ph13", "audit" );
"disable" usebundle => set_dry_run_mode("false");
}

Expand Down
16 changes: 8 additions & 8 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.recursive.audit.success.cf
View file
Expand Up @@ -99,14 +99,14 @@ bundle agent test

methods:
"enable" usebundle => set_dry_run_mode("true");
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "success", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "success", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "success", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "success", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "success", "ph5" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "success", "ph6" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "success", "ph7" );
"ph8" usebundle => apply_gm("permissions_acl_entry", @{args8}, "success", "ph8" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "success", "ph1", "audit" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "success", "ph2", "audit" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "success", "ph3", "audit" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "success", "ph4", "audit" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "success", "ph5", "audit" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "success", "ph6", "audit" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "success", "ph7", "audit" );
"ph8" usebundle => apply_gm("permissions_acl_entry", @{args8}, "success", "ph8", "audit" );
"disable" usebundle => set_dry_run_mode("false");
}

Expand Down
10 changes: 5 additions & 5 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.recursive.error.cf
View file
Expand Up @@ -77,11 +77,11 @@ bundle agent test
"args${init.indices}" slist => { "${init.tmp}/${init.files[${init.indices}]}", "true", "${init.user[${init.indices}]}", "${init.group[${init.indices}]}", "${init.other[${init.indices}]}" };

methods:
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "error", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "error", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "error", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "error", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "error", "ph5" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "error", "ph1", "enforce" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "error", "ph2", "enforce" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "error", "ph3", "enforce" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "error", "ph4", "enforce" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "error", "ph5", "enforce" );
}

#######################################################
Expand Down
16 changes: 8 additions & 8 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.recursive.repaired.cf
View file
Expand Up @@ -116,15 +116,15 @@ bundle agent test
"args${init.indices}" slist => { "${init.tmp}/${init.files[${init.indices}]}", "true", "${init.user[${init.indices}]}", "${init.group[${init.indices}]}", "${init.other[${init.indices}]}" };

methods:
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "repaired", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "repaired", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "repaired", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "repaired", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "repaired", "ph5" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "repaired", "ph6" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "repaired", "ph7" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "repaired", "ph1", "enforce" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "repaired", "ph2", "enforce" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "repaired", "ph3", "enforce" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "repaired", "ph4", "enforce" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "repaired", "ph5", "enforce" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "repaired", "ph6", "enforce" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "repaired", "ph7", "enforce" );
# Do not apply anything on 8-10
"ph11" usebundle => apply_gm("permissions_acl_entry", @{args11}, "repaired", "ph11" );
"ph11" usebundle => apply_gm("permissions_acl_entry", @{args11}, "repaired", "ph11", "enforce" );
}

#######################################################
Expand Down
16 changes: 8 additions & 8 deletions tests/acceptance/30_generic_methods/permissions_acl_entry.recursive.success.cf
View file
Expand Up @@ -98,14 +98,14 @@ bundle agent test
"args${init.indices}" slist => { "${init.tmp}/${init.files[${init.indices}]}", "true", "${init.user[${init.indices}]}", "${init.group[${init.indices}]}", "${init.other[${init.indices}]}" };

methods:
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "success", "ph1" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "success", "ph2" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "success", "ph3" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "success", "ph4" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "success", "ph5" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "success", "ph6" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "success", "ph7" );
"ph8" usebundle => apply_gm("permissions_acl_entry", @{args8}, "success", "ph8" );
"ph1" usebundle => apply_gm("permissions_acl_entry", @{args1}, "success", "ph1", "enforce" );
"ph2" usebundle => apply_gm("permissions_acl_entry", @{args2}, "success", "ph2", "enforce" );
"ph3" usebundle => apply_gm("permissions_acl_entry", @{args3}, "success", "ph3", "enforce" );
"ph4" usebundle => apply_gm("permissions_acl_entry", @{args4}, "success", "ph4", "enforce" );
"ph5" usebundle => apply_gm("permissions_acl_entry", @{args5}, "success", "ph5", "enforce" );
"ph6" usebundle => apply_gm("permissions_acl_entry", @{args6}, "success", "ph6", "enforce" );
"ph7" usebundle => apply_gm("permissions_acl_entry", @{args7}, "success", "ph7", "enforce" );
"ph8" usebundle => apply_gm("permissions_acl_entry", @{args8}, "success", "ph8", "enforce" );
}

#######################################################
Expand Down

0 comments on commit 92ebf25

Please sign in to comment.