Skip to content

Commit

Permalink
Merge pull request #1242 from rexscaria/rex/teams-changes
Browse files Browse the repository at this point in the history
feat: updated gateway teams rule settings
  • Loading branch information
jacobbednarz committed Mar 23, 2023
2 parents 0a69e78 + 7cac7f3 commit a9f0947
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
7 changes: 7 additions & 0 deletions .changelog/1242.txt
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
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

0 comments on commit a9f0947

Please sign in to comment.