Skip to content

Commit 98a46a7

Browse files
authored
Merge pull request #3758 from rexscaria/rex/update-teams-docs
2 parents e0e1dcd + e11e6c1 commit 98a46a7

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.changelog/3758.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
teams_location: make location parameters optional
3+
```

teams_locations.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ type TeamsLocation struct {
3232
Ip string `json:"ip,omitempty"`
3333
Subdomain string `json:"doh_subdomain"`
3434
AnonymizedLogsEnabled bool `json:"anonymized_logs_enabled"`
35-
IPv4Destination string `json:"ipv4_destination"`
36-
IPv4DestinationBackup string `json:"ipv4_destination_backup"`
37-
DNSDestinationIPsID string `json:"dns_destination_ips_id"`
38-
DNSDestinationIPv6BlockID string `json:"dns_destination_ipv6_block_id"`
35+
IPv4Destination string `json:"ipv4_destination,omitempty"`
36+
IPv4DestinationBackup string `json:"ipv4_destination_backup,omitempty"`
37+
DNSDestinationIPsID *string `json:"dns_destination_ips_id,omitempty"`
38+
DNSDestinationIPv6BlockID *string `json:"dns_destination_ipv6_block_id,omitempty"`
3939
ClientDefault bool `json:"client_default"`
4040
ECSSupport *bool `json:"ecs_support,omitempty"`
4141
Endpoints *TeamsLocationEndpoints `json:"endpoints,omitempty"`
42-
43-
CreatedAt *time.Time `json:"created_at,omitempty"`
44-
UpdatedAt *time.Time `json:"updated_at,omitempty"`
42+
CreatedAt *time.Time `json:"created_at,omitempty"`
43+
UpdatedAt *time.Time `json:"updated_at,omitempty"`
4544
}
4645

4746
type TeamsLocationEndpoints struct {

teams_locations_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ func TestTeamsLocations(t *testing.T) {
5454
createdAt, _ := time.Parse(time.RFC3339, "2020-05-18T22:07:03Z")
5555
updatedAt, _ := time.Parse(time.RFC3339, "2020-05-18T22:07:05Z")
5656

57+
ipv4Id := "9da8e0c9-e9cc-4bbd-85c5-b351fc373354"
58+
ipv6Id := "8da8e0c9-e9cc-4bbd-85c5-b351fc373354"
5759
want := []TeamsLocation{{
5860
ID: "0f8185414dec4a5e9034f3d917c17890",
5961
Name: "home",
@@ -63,8 +65,8 @@ func TestTeamsLocations(t *testing.T) {
6365
AnonymizedLogsEnabled: false,
6466
IPv4Destination: "1.2.3.4",
6567
IPv4DestinationBackup: "1.2.3.5",
66-
DNSDestinationIPsID: "9da8e0c9-e9cc-4bbd-85c5-b351fc373354",
67-
DNSDestinationIPv6BlockID: "8da8e0c9-e9cc-4bbd-85c5-b351fc373354",
68+
DNSDestinationIPsID: &ipv4Id,
69+
DNSDestinationIPv6BlockID: &ipv6Id,
6870
ClientDefault: false,
6971
ECSSupport: BoolPtr(false),
7072
CreatedAt: &createdAt,

0 commit comments

Comments
 (0)