Merge pull request #1205 from suhrit-cf/master

Add ExcludeOfficeIPs flag for policy

Author: jacobbednarz

.changelog/1205.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+devices_policy: Add new exclude_office_ips field to policy
+```

devices_policy.go

@@ -42,6 +42,7 @@ type DeviceSettingsPolicy struct {
 	Match               *string           `json:"match"`
 	Precedence          *int              `json:"precedence"`
 	Default             bool              `json:"default"`
+	ExcludeOfficeIps    *bool             `json:"exclude_office_ips"`
 }
 
 type DeviceSettingsPolicyResponse struct {
@@ -68,6 +69,7 @@ type DeviceSettingsPolicyRequest struct {
 	Name                *string        `json:"name,omitempty"`
 	Match               *string        `json:"match,omitempty"`
 	Enabled             *bool          `json:"enabled,omitempty"`
+	ExcludeOfficeIps    *bool          `json:"exclude_office_ips"`
 }
 
 // UpdateDeviceClientCertificates controls the zero trust zone used to provision client certificates.

devices_policy_test.go

@@ -27,20 +27,21 @@ var (
 			{Address: "10.0.0.0/8"},
 			{Address: "100.64.0.0/10"},
 		},
-		GatewayUniqueID: StringPtr("t1235"),
-		SupportURL:      StringPtr(""),
-		CaptivePortal:   IntPtr(180),
-		AllowModeSwitch: BoolPtr(false),
-		SwitchLocked:    BoolPtr(false),
-		AllowUpdates:    BoolPtr(false),
-		AutoConnect:     IntPtr(0),
-		AllowedToLeave:  BoolPtr(true),
-		Enabled:         BoolPtr(true),
-		PolicyID:        nil,
-		Name:            nil,
-		Match:           nil,
-		Precedence:      nil,
-		Default:         true,
+		GatewayUniqueID:  StringPtr("t1235"),
+		SupportURL:       StringPtr(""),
+		CaptivePortal:    IntPtr(180),
+		AllowModeSwitch:  BoolPtr(false),
+		SwitchLocked:     BoolPtr(false),
+		AllowUpdates:     BoolPtr(false),
+		AutoConnect:      IntPtr(0),
+		AllowedToLeave:   BoolPtr(true),
+		Enabled:          BoolPtr(true),
+		PolicyID:         nil,
+		Name:             nil,
+		Match:            nil,
+		Precedence:       nil,
+		Default:          true,
+		ExcludeOfficeIps: BoolPtr(false),
 	}
 
 	nonDefaultDeviceSettingsPolicy = DeviceSettingsPolicy{
@@ -56,20 +57,21 @@ var (
 			{Address: "10.0.0.0/8"},
 			{Address: "100.64.0.0/10"},
 		},
-		GatewayUniqueID: StringPtr("t1235"),
-		SupportURL:      StringPtr(""),
-		CaptivePortal:   IntPtr(180),
-		AllowModeSwitch: BoolPtr(false),
-		SwitchLocked:    BoolPtr(false),
-		AllowUpdates:    BoolPtr(false),
-		AutoConnect:     IntPtr(0),
-		AllowedToLeave:  BoolPtr(true),
-		PolicyID:        &deviceSettingsPolicyID,
-		Enabled:         BoolPtr(true),
-		Name:            StringPtr("test"),
-		Match:           &deviceSettingsPolicyMatch,
-		Precedence:      &deviceSettingsPolicyPrecedence,
-		Default:         false,
+		GatewayUniqueID:  StringPtr("t1235"),
+		SupportURL:       StringPtr(""),
+		CaptivePortal:    IntPtr(180),
+		AllowModeSwitch:  BoolPtr(false),
+		SwitchLocked:     BoolPtr(false),
+		AllowUpdates:     BoolPtr(false),
+		AutoConnect:      IntPtr(0),
+		AllowedToLeave:   BoolPtr(true),
+		PolicyID:         &deviceSettingsPolicyID,
+		Enabled:          BoolPtr(true),
+		Name:             StringPtr("test"),
+		Match:            &deviceSettingsPolicyMatch,
+		Precedence:       &deviceSettingsPolicyPrecedence,
+		Default:          false,
+		ExcludeOfficeIps: BoolPtr(true),
 	}
 
 	defaultDeviceSettingsPolicyJson = `{
@@ -102,7 +104,8 @@ var (
 		"auto_connect": 0,
 		"allowed_to_leave": true,
 		"enabled": true,
-		"default": true
+		"default": true,
+		"exclude_office_ips":false
 	}`
 
 	nonDefaultDeviceSettingsPolicyJson = fmt.Sprintf(`{
@@ -139,7 +142,8 @@ var (
 		"name": "test",
 		"match": %#v,
 		"precedence": 10,
-		"default": false
+		"default": false,
+		"exclude_office_ips":true
 	}`, deviceSettingsPolicyID, deviceSettingsPolicyMatch)
 )