From 91181d488c48a936b78748c853b6a9214dad6d8c Mon Sep 17 00:00:00 2001 From: Pierre Cauchois Date: Thu, 19 Oct 2023 13:19:58 -0700 Subject: [PATCH 1/4] Add Browser Isolation Non-identity onramp support --- .changelog/1424.txt | 3 +++ teams_accounts.go | 1 + teams_accounts_test.go | 8 ++++++++ 3 files changed, 12 insertions(+) create mode 100644 .changelog/1424.txt diff --git a/.changelog/1424.txt b/.changelog/1424.txt new file mode 100644 index 00000000000..ef9e1b1e5a9 --- /dev/null +++ b/.changelog/1424.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +teams: Add `non_identity_enabled` boolean in browser isolation settings +``` diff --git a/teams_accounts.go b/teams_accounts.go index db63f05389f..3c96096da5b 100644 --- a/teams_accounts.go +++ b/teams_accounts.go @@ -48,6 +48,7 @@ type TeamsAccountSettings struct { type BrowserIsolation struct { UrlBrowserIsolationEnabled bool `json:"url_browser_isolation_enabled"` + NonIdentityEnabled bool `json:"non_identity_enabled"` } type TeamsAntivirus struct { diff --git a/teams_accounts_test.go b/teams_accounts_test.go index c1dfe4be46e..5526a8e144e 100644 --- a/teams_accounts_test.go +++ b/teams_accounts_test.go @@ -78,6 +78,10 @@ func TestTeamsAccountConfiguration(t *testing.T) { "logo_path": "https://logos.com/a.png", "background_color": "#ff0000", "suppress_footer": true + }, + "browser_isolation": { + "url_browser_isolation_enabled": true, + "non_identity_enabled": true } } } @@ -108,6 +112,10 @@ func TestTeamsAccountConfiguration(t *testing.T) { MailtoSubject: "Blocked User Inquiry", SuppressFooter: BoolPtr(true), }, + BrowserIsolation: &BrowserIsolation{ + UrlBrowserIsolationEnabled: true, + NonIdentityEnabled: true, + }, }) } } From 1f4dd0808e3411323288ba402c0a2d2fbfbc2c81 Mon Sep 17 00:00:00 2001 From: Pierre Cauchois Date: Mon, 23 Oct 2023 12:18:38 -0700 Subject: [PATCH 2/4] Change bool values to *bool to accomodate terraform provider issues --- teams_accounts.go | 4 ++-- teams_accounts_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/teams_accounts.go b/teams_accounts.go index 3c96096da5b..25a0168faa4 100644 --- a/teams_accounts.go +++ b/teams_accounts.go @@ -47,8 +47,8 @@ type TeamsAccountSettings struct { } type BrowserIsolation struct { - UrlBrowserIsolationEnabled bool `json:"url_browser_isolation_enabled"` - NonIdentityEnabled bool `json:"non_identity_enabled"` + UrlBrowserIsolationEnabled *bool `json:"url_browser_isolation_enabled,omitempty"` + NonIdentityEnabled *bool `json:"non_identity_enabled,omitempty"` } type TeamsAntivirus struct { diff --git a/teams_accounts_test.go b/teams_accounts_test.go index 5526a8e144e..4942dcad1a5 100644 --- a/teams_accounts_test.go +++ b/teams_accounts_test.go @@ -113,8 +113,8 @@ func TestTeamsAccountConfiguration(t *testing.T) { SuppressFooter: BoolPtr(true), }, BrowserIsolation: &BrowserIsolation{ - UrlBrowserIsolationEnabled: true, - NonIdentityEnabled: true, + UrlBrowserIsolationEnabled: BoolPtr(true), + NonIdentityEnabled: BoolPtr(true), }, }) } From 378f3af50fcf877e60d342fd65c1eaba504411bf Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Tue, 24 Oct 2023 08:23:56 +1100 Subject: [PATCH 3/4] fix indentation --- teams_accounts_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teams_accounts_test.go b/teams_accounts_test.go index e68abc8a234..dfd236d3e6e 100644 --- a/teams_accounts_test.go +++ b/teams_accounts_test.go @@ -82,7 +82,7 @@ func TestTeamsAccountConfiguration(t *testing.T) { "browser_isolation": { "url_browser_isolation_enabled": true, "non_identity_enabled": true - } + }, "body_scanning": { "inspection_mode": "deep" } From f9d27f38925f524f25c675cbdf9e3d98dd438932 Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Tue, 24 Oct 2023 08:27:47 +1100 Subject: [PATCH 4/4] Update 1424.txt --- .changelog/1424.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.changelog/1424.txt b/.changelog/1424.txt index ef9e1b1e5a9..f4659f00bb8 100644 --- a/.changelog/1424.txt +++ b/.changelog/1424.txt @@ -1,3 +1,7 @@ ```release-note:enhancement teams: Add `non_identity_enabled` boolean in browser isolation settings ``` + +```release-note:breaking-change +teams: `BrowserIsolation.UrlBrowserIsolationEnabled` has changed from `bool` to `*bool` to meet the library conventions +```