Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: updated gateway teams rule settings #1242

Merged
merged 3 commits into from
Mar 23, 2023
Merged

feat: updated gateway teams rule settings #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e5ae92
feat: updated gateway teams rule settings
Mar 23, 2023
b3adae0
make changelog more specific
jacobbednarz Mar 23, 2023
7cac7f3
Merge branch 'master' into rex/teams-changes
jacobbednarz Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changelog/1242.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:bug
teams_rules: `AllowChildBypass` changes from a `bool` to `*bool`
```

```release-note:bug
teams_rules: `BypassParentRule` changes from a `bool` to `*bool`
```
8 changes: 4 additions & 4 deletions teams_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ type TeamsRuleSettings struct {
// Turns on ip category based filter on dns if the rule contains dns category checks
IPCategories bool `json:"ip_categories"`

// Allow parent MSP accounts to enable bypass their children's rules.
AllowChildBypass bool `json:"allow_child_bypass"`
// Allow parent MSP accounts to enable bypass their children's rules. Do not set them for non MSP accounts.
AllowChildBypass *bool `json:"allow_child_bypass,omitempty"`

// Allow child MSP accounts to bypass their parent's rules
BypassParentRule bool `json:"bypass_parent_rule"`
// Allow child MSP accounts to bypass their parent's rules. Do not set them for non MSP accounts.
BypassParentRule *bool `json:"bypass_parent_rule,omitempty"`

// Action taken when an untrusted origin certificate error occurs in a http allow rule
UntrustedCertSettings *UntrustedCertSettings `json:"untrusted_cert"`
Expand Down