Merge branch 'master' into rkerns/AUTH-6000

cloudflare · Apr 18, 2024 · 7b0666a · 7b0666a
2 parents ebc41fc + 6afd3ff
commit 7b0666a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/.changelog/1811.txt b/.changelog/1811.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+teams_account: adds custom certificate setting to teams account configuration
+```
diff --git a/teams_accounts.go b/teams_accounts.go
@@ -46,6 +46,7 @@ type TeamsAccountSettings struct {
 	ProtocolDetection     *TeamsProtocolDetection     `json:"protocol_detection,omitempty"`
 	BodyScanning          *TeamsBodyScanning          `json:"body_scanning,omitempty"`
 	ExtendedEmailMatching *TeamsExtendedEmailMatching `json:"extended_email_matching,omitempty"`
+	CustomCertificate     *TeamsCustomCertificate     `json:"custom_certificate,omitempty"`
 }
 
 type BrowserIsolation struct {
@@ -103,6 +104,14 @@ type TeamsExtendedEmailMatching struct {
 	Enabled *bool `json:"enabled,omitempty"`
 }
 
+type TeamsCustomCertificate struct {
+	Enabled       *bool      `json:"enabled,omitempty"`
+	ID            string     `json:"id,omitempty"`
+	BindingStatus string     `json:"binding_status,omitempty"`
+	QsPackId      string     `json:"qs_pack_id,omitempty"`
+	UpdatedAt     *time.Time `json:"updated_at,omitempty"`
+}
+
 type TeamsRuleType = string
 
 const (

diff --git a/teams_accounts_test.go b/teams_accounts_test.go
@@ -169,6 +169,9 @@ func TestTeamsAccountUpdateConfiguration(t *testing.T) {
 					},
 					"extended_email_matching": {
 						"enabled": true
+					},
+					"custom_certificate": {
+						"enabled": true
 					}
 				}
 			}
@@ -184,6 +187,9 @@ func TestTeamsAccountUpdateConfiguration(t *testing.T) {
 		ExtendedEmailMatching: &TeamsExtendedEmailMatching{
 			Enabled: BoolPtr(true),
 		},
+		CustomCertificate: &TeamsCustomCertificate{
+			Enabled: BoolPtr(true),
+		},
 	}
 
 	mux.HandleFunc("/accounts/"+testAccountID+"/gateway/configuration", handler)