Skip to content

Commit

Permalink
Adds code comments, updates Makefile.config.example
Browse files Browse the repository at this point in the history
  • Loading branch information
bgdeutsch authored and davidejones committed Feb 5, 2021
1 parent 01a57f8 commit 4fd8ba7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Makefile.config.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

GITHUB_TOKEN := ${github_personal_token}
CREATE_I18N_PLACEHOLDERS:= false
PULL_RBAC_PERMISSIONS := true
DD_API_KEY := ${datadog_api_key}
DD_APP_KEY := ${datadog_application_key}
RUN_SERVER := true
RUN_WEBPACK := true
CONFIGURATION_FILE := "./local/bin/py/build/configurations/pull_config_preview.yaml"
Expand Down
4 changes: 3 additions & 1 deletion layouts/partials/rbac-permissions-table.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{{/* Scopable columns may be refactored or moved to a different page later, but should remain hardcoded for now. */}}

{{ $scopable_permissions := slice "logs_read_data" "logs_write_exclusion_filters" "logs_write_processors" "logs_read_archives" "logs_read_index_data" }}
{{ $is_scopable := false }}
{{ $hide_scopable_column := false }}
Expand Down Expand Up @@ -48,7 +50,7 @@
{{/* Harcoding the legacy logs section until deprecation */}}
{{ if eq $permission_group "Logs" }}
Log Management RBAC also includes two legacy permissions, superseded by finer-grained and more extensive <code>logs_read_data</code> permission:

<table>
<thead>
<tr>
Expand Down
2 changes: 2 additions & 0 deletions layouts/shortcodes/permissions.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{{ $permissions_data := $.Site.Data.permissions }}
{{ $single_permission_group := .Get "group" }}

{{/* Passing a single permission group name allows us to render one set of permissions at a time. Currently this is used to separate General from Advanced Permissions on the account_management/rbac/permissions page, but could be re-used elsewhere in the future. */}}

{{ if ne $single_permission_group nil }}
{{ $permissions_data := index $permissions_data $single_permission_group }}
{{ partial "rbac-permissions-table.html" (dict "data" $permissions_data "group" $single_permission_group) }}
Expand Down

0 comments on commit 4fd8ba7

Please sign in to comment.