From edde9a58f3f1c59b891d016356c241daa561bb55 Mon Sep 17 00:00:00 2001 From: Lance726 <158132389@qq.com> Date: Wed, 8 Feb 2023 14:22:27 +0800 Subject: [PATCH 01/21] Fix typo --- stream.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stream.go b/stream.go index e12630495ae0..95edd6b5e7fa 100644 --- a/stream.go +++ b/stream.go @@ -101,7 +101,7 @@ type StreamUploadFromURLParameters struct { Creator string `json:"creator,omitempty"` ThumbnailTimestampPct float64 `json:"thumbnailTimestampPct,omitempty"` AllowedOrigins []string `json:"allowedOrigins,omitempty"` - RequiredSignedURLs bool `json:"requiredSignedURLs,omitempty"` + RequireSignedURLs bool `json:"requireSignedURLs,omitempty"` Watermark UploadVideoURLWatermark `json:"watermark,omitempty"` } @@ -113,7 +113,7 @@ type StreamCreateVideoParameters struct { Creator string `json:"creator,omitempty"` ThumbnailTimestampPct float64 `json:"thumbnailTimestampPct,omitempty"` AllowedOrigins []string `json:"allowedOrigins,omitempty"` - RequiredSignedURLs bool `json:"requiredSignedURLs,omitempty"` + RequireSignedURLs bool `json:"requireSignedURLs,omitempty"` Watermark UploadVideoURLWatermark `json:"watermark,omitempty"` } From 77e275bb755317a2ae323c76ed1136e8120cedf7 Mon Sep 17 00:00:00 2001 From: Lance726 <158132389@qq.com> Date: Wed, 8 Feb 2023 17:27:52 +0800 Subject: [PATCH 02/21] Add changelog --- .changelog/1202.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/1202.txt diff --git a/.changelog/1202.txt b/.changelog/1202.txt new file mode 100644 index 000000000000..5ca3187ae789 --- /dev/null +++ b/.changelog/1202.txt @@ -0,0 +1,3 @@ +```release-note:bug +stream: fixed the RequiredSignedURLs field name errors +``` From 112468accaa2aae0e08f2fdbfaf6810116dd435c Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Fri, 10 Feb 2023 11:01:51 -0800 Subject: [PATCH 03/21] Add support for Pagination in Tunnels API Signed-off-by: Haytham Abuelfutuh --- tunnel.go | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tunnel.go b/tunnel.go index d933eedfc88f..4fe68ac78aae 100644 --- a/tunnel.go +++ b/tunnel.go @@ -5,7 +5,9 @@ import ( "encoding/json" "errors" "fmt" + "github.com/google/go-querystring/query" "net/http" + "strconv" "time" ) @@ -176,14 +178,28 @@ type TunnelListParams struct { // Tunnels lists all tunnels. // // API reference: https://api.cloudflare.com/#cloudflare-tunnel-list-cloudflare-tunnels -func (api *API) Tunnels(ctx context.Context, rc *ResourceContainer, params TunnelListParams) ([]Tunnel, error) { +func (api *API) Tunnels(ctx context.Context, rc *ResourceContainer, params TunnelListParams, opts ...ReqOption) ([]Tunnel, error) { if rc.Identifier == "" { return []Tunnel{}, ErrMissingAccountID } - uri := buildURI(fmt.Sprintf("/accounts/%s/cfd_tunnel", rc.Identifier), params) + v, _ := query.Values(params) + opt := reqOption{ + params: v, + } - res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil) + for _, of := range opts { + of(&opt) + } + + if opt.params.Get("page") != "" || opt.params.Get("per_page") != "" { + return []Tunnel{}, errors.New(errManualPagination) + } + + opt.params.Add("per_page", strconv.Itoa(listZonesPerPage)) + + res, err := api.makeRequestContext(ctx, http.MethodGet, + fmt.Sprintf("/accounts/%s/cfd_tunnel?%s", rc.Identifier, opt.params.Encode()), nil) if err != nil { return []Tunnel{}, err } From 47bccdb6e18d2cecefcb2cc5236d1dc26279bb5c Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Fri, 10 Feb 2023 11:11:24 -0800 Subject: [PATCH 04/21] Add log Signed-off-by: Haytham Abuelfutuh --- tunnel.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tunnel.go b/tunnel.go index 4fe68ac78aae..a955e40f3025 100644 --- a/tunnel.go +++ b/tunnel.go @@ -198,8 +198,11 @@ func (api *API) Tunnels(ctx context.Context, rc *ResourceContainer, params Tunne opt.params.Add("per_page", strconv.Itoa(listZonesPerPage)) + paramsStr := opt.params.Encode() + fmt.Printf("Issuing a cfd_tunnel query with params [%v]", paramsStr) + res, err := api.makeRequestContext(ctx, http.MethodGet, - fmt.Sprintf("/accounts/%s/cfd_tunnel?%s", rc.Identifier, opt.params.Encode()), nil) + fmt.Sprintf("/accounts/%s/cfd_tunnel?%s", rc.Identifier, paramsStr), nil) if err != nil { return []Tunnel{}, err } From 5c6a65b1a4ce05b44ae7f1877187ba8ade8c702a Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Fri, 10 Feb 2023 11:24:41 -0800 Subject: [PATCH 05/21] Allow Tunnels() api to specify pagination options Signed-off-by: Haytham Abuelfutuh --- tunnel.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tunnel.go b/tunnel.go index a955e40f3025..324749b552d0 100644 --- a/tunnel.go +++ b/tunnel.go @@ -7,7 +7,6 @@ import ( "fmt" "github.com/google/go-querystring/query" "net/http" - "strconv" "time" ) @@ -192,17 +191,8 @@ func (api *API) Tunnels(ctx context.Context, rc *ResourceContainer, params Tunne of(&opt) } - if opt.params.Get("page") != "" || opt.params.Get("per_page") != "" { - return []Tunnel{}, errors.New(errManualPagination) - } - - opt.params.Add("per_page", strconv.Itoa(listZonesPerPage)) - - paramsStr := opt.params.Encode() - fmt.Printf("Issuing a cfd_tunnel query with params [%v]", paramsStr) - res, err := api.makeRequestContext(ctx, http.MethodGet, - fmt.Sprintf("/accounts/%s/cfd_tunnel?%s", rc.Identifier, paramsStr), nil) + fmt.Sprintf("/accounts/%s/cfd_tunnel?%s", rc.Identifier, opt.params.Encode()), nil) if err != nil { return []Tunnel{}, err } From 21e905bc3f0b9ffad51e92b647c3f78449edc04d Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Fri, 10 Feb 2023 14:18:56 -0800 Subject: [PATCH 06/21] add a unit test Signed-off-by: Haytham Abuelfutuh --- tunnel_test.go | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tunnel_test.go b/tunnel_test.go index 48f8f386c60f..612fee03051c 100644 --- a/tunnel_test.go +++ b/tunnel_test.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "net/http" + "net/url" "testing" "time" @@ -47,6 +48,52 @@ func TestTunnels(t *testing.T) { } } +func TestTunnelsPagination(t *testing.T) { + setup() + defer teardown() + + handler := func(w http.ResponseWriter, r *http.Request) { + assert.Equal(t, http.MethodGet, r.Method, "Expected method 'GET', got %s", r.Method) + w.Header().Set("content-type", "application/json") + qry, _ := url.Parse(r.RequestURI) + assert.Equal(t, "blog", qry.Query().Get("name")) + assert.Equal(t, "2", qry.Query().Get("page")) + assert.Equal(t, "1", qry.Query().Get("per_page")) + fmt.Fprint(w, loadFixture("tunnel", "multiple_full")) + } + + mux.HandleFunc("/accounts/"+testAccountID+"/cfd_tunnel", handler) + + createdAt, _ := time.Parse(time.RFC3339, "2009-11-10T23:00:00Z") + deletedAt, _ := time.Parse(time.RFC3339, "2009-11-10T23:00:00Z") + want := []Tunnel{ + { + ID: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", + Name: "blog", + CreatedAt: &createdAt, + DeletedAt: &deletedAt, + Connections: []TunnelConnection{{ + ColoName: "DFW", + ID: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415", + IsPendingReconnect: false, + ClientID: "dc6472cc-f1ae-44a0-b795-6b8a0ce29f90", + ClientVersion: "2022.2.0", + OpenedAt: "2021-01-25T18:22:34.317854Z", + OriginIP: "198.51.100.1", + }}, + }, + } + + actual, err := client.Tunnels(context.Background(), AccountIdentifier(testAccountID), + TunnelListParams{ + Name: "blog", + }, WithPagination(PaginationOptions{PerPage: 1, Page: 2})) + + if assert.NoError(t, err) { + assert.Equal(t, want, actual) + } +} + func TestTunnel(t *testing.T) { setup() defer teardown() From 31b23d3fce29e34eb7a18baa810e146300579971 Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Fri, 10 Feb 2023 14:28:14 -0800 Subject: [PATCH 07/21] Add changelog file Signed-off-by: Haytham Abuelfutuh --- .changelog/1206.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/1206.txt diff --git a/.changelog/1206.txt b/.changelog/1206.txt new file mode 100644 index 000000000000..fac539f06802 --- /dev/null +++ b/.changelog/1206.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +tunnels: Added Pagination (through `WithPagination`) support to `Tunnels` API. +``` From 3d94d85220af478138b1c91f01c1ac018905663b Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Fri, 10 Feb 2023 14:29:56 -0800 Subject: [PATCH 08/21] goimports Signed-off-by: Haytham Abuelfutuh --- tunnel.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tunnel.go b/tunnel.go index 324749b552d0..0820a11a602f 100644 --- a/tunnel.go +++ b/tunnel.go @@ -5,9 +5,10 @@ import ( "encoding/json" "errors" "fmt" - "github.com/google/go-querystring/query" "net/http" "time" + + "github.com/google/go-querystring/query" ) // ErrMissingTunnelID is for when a required tunnel ID is missing from the From b4affeda9bb066846660b3e5bcc1c27ad236f779 Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Mon, 13 Feb 2023 07:17:44 -0800 Subject: [PATCH 09/21] Comply with next-gen-client doc style Signed-off-by: Haytham Abuelfutuh --- tunnel.go | 55 +++++++++++++++++++++++++++++++++----------------- tunnel_test.go | 10 ++++++--- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/tunnel.go b/tunnel.go index 0820a11a602f..4085958eadec 100644 --- a/tunnel.go +++ b/tunnel.go @@ -7,8 +7,6 @@ import ( "fmt" "net/http" "time" - - "github.com/google/go-querystring/query" ) // ErrMissingTunnelID is for when a required tunnel ID is missing from the @@ -53,8 +51,12 @@ type TunnelConnection struct { type TunnelsDetailResponse struct { Result []Tunnel `json:"result"` Response + ResultInfo } +// listTunnelsDefaultPageSize represents the default per_page size of the API. +var listTunnelsDefaultPageSize int = 100 + // TunnelDetailResponse is used for representing the API response payload for // a single tunnel. type TunnelDetailResponse struct { @@ -173,37 +175,54 @@ type TunnelListParams struct { UUID string `url:"uuid,omitempty"` // the tunnel ID IsDeleted *bool `url:"is_deleted,omitempty"` ExistedAt *time.Time `url:"existed_at,omitempty"` + + ResultInfo } // Tunnels lists all tunnels. // // API reference: https://api.cloudflare.com/#cloudflare-tunnel-list-cloudflare-tunnels -func (api *API) Tunnels(ctx context.Context, rc *ResourceContainer, params TunnelListParams, opts ...ReqOption) ([]Tunnel, error) { +func (api *API) Tunnels(ctx context.Context, rc *ResourceContainer, params TunnelListParams) ([]Tunnel, *ResultInfo, error) { if rc.Identifier == "" { - return []Tunnel{}, ErrMissingAccountID + return []Tunnel{}, &ResultInfo{}, ErrMissingAccountID } - v, _ := query.Values(params) - opt := reqOption{ - params: v, + autoPaginate := true + if params.PerPage >= 1 || params.Page >= 1 { + autoPaginate = false } - for _, of := range opts { - of(&opt) + if params.PerPage < 1 { + params.PerPage = listTunnelsDefaultPageSize } - res, err := api.makeRequestContext(ctx, http.MethodGet, - fmt.Sprintf("/accounts/%s/cfd_tunnel?%s", rc.Identifier, opt.params.Encode()), nil) - if err != nil { - return []Tunnel{}, err + if params.Page < 1 { + params.Page = 1 } - var argoDetailsResponse TunnelsDetailResponse - err = json.Unmarshal(res, &argoDetailsResponse) - if err != nil { - return []Tunnel{}, fmt.Errorf("%s: %w", errUnmarshalError, err) + var records []Tunnel + var listResponse TunnelsDetailResponse + + for { + uri := buildURI(fmt.Sprintf("/accounts/%s/cfd_tunnel", rc.Identifier), params) + res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil) + if err != nil { + return []Tunnel{}, &ResultInfo{}, err + } + + err = json.Unmarshal(res, &listResponse) + if err != nil { + return []Tunnel{}, &ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err) + } + + records = append(records, listResponse.Result...) + params.ResultInfo = listResponse.ResultInfo.Next() + if params.ResultInfo.Done() || !autoPaginate { + break + } } - return argoDetailsResponse.Result, nil + + return records, &listResponse.ResultInfo, nil } // Tunnel returns a single Argo tunnel. diff --git a/tunnel_test.go b/tunnel_test.go index 612fee03051c..5e6291047166 100644 --- a/tunnel_test.go +++ b/tunnel_test.go @@ -41,7 +41,7 @@ func TestTunnels(t *testing.T) { }}, }} - actual, err := client.Tunnels(context.Background(), AccountIdentifier(testAccountID), TunnelListParams{UUID: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415"}) + actual, _, err := client.Tunnels(context.Background(), AccountIdentifier(testAccountID), TunnelListParams{UUID: "f174e90a-fafe-4643-bbbc-4a0ed4fc8415"}) if assert.NoError(t, err) { assert.Equal(t, want, actual) @@ -84,10 +84,14 @@ func TestTunnelsPagination(t *testing.T) { }, } - actual, err := client.Tunnels(context.Background(), AccountIdentifier(testAccountID), + actual, _, err := client.Tunnels(context.Background(), AccountIdentifier(testAccountID), TunnelListParams{ Name: "blog", - }, WithPagination(PaginationOptions{PerPage: 1, Page: 2})) + ResultInfo: ResultInfo{ + Page: 2, + PerPage: 1, + }, + }) if assert.NoError(t, err) { assert.Equal(t, want, actual) From 0a96951570843c9104cf842213e600b8e7770f68 Mon Sep 17 00:00:00 2001 From: Suhrit Rimal Date: Mon, 13 Feb 2023 12:19:50 -0500 Subject: [PATCH 10/21] Support root_certificate_installation_enabled flag --- .changelog/1208.txt | 3 +++ teams_accounts.go | 5 +++-- teams_accounts_test.go | 19 +++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 .changelog/1208.txt diff --git a/.changelog/1208.txt b/.changelog/1208.txt new file mode 100644 index 000000000000..8075ecc7939f --- /dev/null +++ b/.changelog/1208.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +teams_accounts: Add new root_certificate_installation_enabled field +``` diff --git a/teams_accounts.go b/teams_accounts.go index f90707147cfc..7667a155bebf 100644 --- a/teams_accounts.go +++ b/teams_accounts.go @@ -97,8 +97,9 @@ type TeamsLoggingSettings struct { } type TeamsDeviceSettings struct { - GatewayProxyEnabled bool `json:"gateway_proxy_enabled"` - GatewayProxyUDPEnabled bool `json:"gateway_udp_proxy_enabled"` + GatewayProxyEnabled bool `json:"gateway_proxy_enabled"` + GatewayProxyUDPEnabled bool `json:"gateway_udp_proxy_enabled"` + RootCertificateInstallationEnabled bool `json:"root_certificate_installation_enabled"` } type TeamsDeviceSettingsResponse struct { diff --git a/teams_accounts_test.go b/teams_accounts_test.go index a9535528bfc7..1741217355e3 100644 --- a/teams_accounts_test.go +++ b/teams_accounts_test.go @@ -239,7 +239,7 @@ func TestTeamsAccountGetDeviceConfiguration(t *testing.T) { "success": true, "errors": [], "messages": [], - "result": {"gateway_proxy_enabled": true,"gateway_udp_proxy_enabled":false} + "result": {"gateway_proxy_enabled": true,"gateway_udp_proxy_enabled":false, "root_certificate_installation_enabled":true} }`) } @@ -249,8 +249,9 @@ func TestTeamsAccountGetDeviceConfiguration(t *testing.T) { if assert.NoError(t, err) { assert.Equal(t, actual, TeamsDeviceSettings{ - GatewayProxyEnabled: true, - GatewayProxyUDPEnabled: false, + GatewayProxyEnabled: true, + GatewayProxyUDPEnabled: false, + RootCertificateInstallationEnabled: true, }) } } @@ -266,21 +267,23 @@ func TestTeamsAccountUpdateDeviceConfiguration(t *testing.T) { "success": true, "errors": [], "messages": [], - "result": {"gateway_proxy_enabled": true,"gateway_udp_proxy_enabled":true} + "result": {"gateway_proxy_enabled": true,"gateway_udp_proxy_enabled":true, "root_certificate_installation_enabled":true} }`) } mux.HandleFunc("/accounts/"+testAccountID+"/devices/settings", handler) actual, err := client.TeamsAccountDeviceUpdateConfiguration(context.Background(), testAccountID, TeamsDeviceSettings{ - GatewayProxyUDPEnabled: true, - GatewayProxyEnabled: true, + GatewayProxyUDPEnabled: true, + GatewayProxyEnabled: true, + RootCertificateInstallationEnabled: true, }) if assert.NoError(t, err) { assert.Equal(t, actual, TeamsDeviceSettings{ - GatewayProxyEnabled: true, - GatewayProxyUDPEnabled: true, + GatewayProxyEnabled: true, + GatewayProxyUDPEnabled: true, + RootCertificateInstallationEnabled: true, }) } } From b50c21a003bee8cbc3a1501c97979144698d30cb Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Wed, 15 Feb 2023 15:37:53 +1100 Subject: [PATCH 11/21] update changelog --- .changelog/1202.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/1202.txt b/.changelog/1202.txt index 5ca3187ae789..58c21d62c2b4 100644 --- a/.changelog/1202.txt +++ b/.changelog/1202.txt @@ -1,3 +1,3 @@ ```release-note:bug -stream: fixed the RequiredSignedURLs field name errors +stream: renamed `RequiredSignedURLs` to `RequireSignedURLs` ``` From a83da12e605a33a7f7d8e219e0b0ca16dd74e123 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Wed, 15 Feb 2023 04:42:42 +0000 Subject: [PATCH 12/21] Update CHANGELOG.md for #1202 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8286a86bb4d0..531d69a481ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ENHANCEMENTS: BUG FIXES: * dns: always send `tags` to allow clearing ([#1196](https://github.com/cloudflare/cloudflare-go/issues/1196)) +* stream: renamed `RequiredSignedURLs` to `RequireSignedURLs` ([#1202](https://github.com/cloudflare/cloudflare-go/issues/1202)) DEPENDENCIES: From 635d95a8ac1dd5b6c5ef8db53148c18b2264dfeb Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Wed, 15 Feb 2023 15:43:37 +1100 Subject: [PATCH 13/21] Update CHANGELOG.md --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 531d69a481ff..284b44c97f2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -## 0.61.0 (Unreleased) +## 0.62.0 (Unreleased) + +## 0.61.0 (15th February, 2023) ENHANCEMENTS: From 0f2cd6570672e5b618bad2abe06ae4534f626205 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 16 Feb 2023 02:22:27 +0000 Subject: [PATCH 14/21] Update CHANGELOG.md for #1208 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 284b44c97f2c..b580146cc156 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## 0.62.0 (Unreleased) +ENHANCEMENTS: + +* teams_accounts: Add new root_certificate_installation_enabled field ([#1208](https://github.com/cloudflare/cloudflare-go/issues/1208)) + ## 0.61.0 (15th February, 2023) ENHANCEMENTS: From 5bc3303eb1757538925e1a109ede0f5575c006e0 Mon Sep 17 00:00:00 2001 From: Haytham Abuelfutuh Date: Thu, 16 Feb 2023 07:27:50 -0800 Subject: [PATCH 15/21] Fix response object and testData response to have correct sample Signed-off-by: Haytham Abuelfutuh --- testdata/fixtures/tunnel/multiple_full.json | 8 +++++++- tunnel.go | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/testdata/fixtures/tunnel/multiple_full.json b/testdata/fixtures/tunnel/multiple_full.json index 409911a8f2b3..586dd9003a74 100644 --- a/testdata/fixtures/tunnel/multiple_full.json +++ b/testdata/fixtures/tunnel/multiple_full.json @@ -20,5 +20,11 @@ } ] } - ] + ], + "result_info": { + "count": 1, + "page": 1, + "per_page": 20, + "total_count": 1 + } } diff --git a/tunnel.go b/tunnel.go index 4085958eadec..8ae91d391d08 100644 --- a/tunnel.go +++ b/tunnel.go @@ -51,7 +51,7 @@ type TunnelConnection struct { type TunnelsDetailResponse struct { Result []Tunnel `json:"result"` Response - ResultInfo + ResultInfo `json:"result_info"` } // listTunnelsDefaultPageSize represents the default per_page size of the API. From bdc379e766dc94ffe8460e1dac6e2c223e2844a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 16:56:59 +0000 Subject: [PATCH 16/21] build(deps): bump github.com/urfave/cli/v2 from 2.24.3 to 2.24.4 Bumps [github.com/urfave/cli/v2](https://github.com/urfave/cli) from 2.24.3 to 2.24.4. - [Release notes](https://github.com/urfave/cli/releases) - [Changelog](https://github.com/urfave/cli/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/urfave/cli/compare/v2.24.3...v2.24.4) --- updated-dependencies: - dependency-name: github.com/urfave/cli/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 44c3b974d678..4731b3bea1f5 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/hashicorp/go-retryablehttp v0.7.2 github.com/olekukonko/tablewriter v0.0.5 github.com/stretchr/testify v1.8.1 - github.com/urfave/cli/v2 v2.24.3 + github.com/urfave/cli/v2 v2.24.4 golang.org/x/net v0.0.0-20220722155237-a158d28d115b golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 ) diff --git a/go.sum b/go.sum index 5cc537c34fe4..dd22cce7c2ad 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/urfave/cli/v2 v2.24.3 h1:7Q1w8VN8yE0MJEHP06bv89PjYsN4IHWED2s1v/Zlfm0= -github.com/urfave/cli/v2 v2.24.3/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= +github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU= +github.com/urfave/cli/v2 v2.24.4/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= From 119b749bd47ba7803feaf3075b20a924166c5d56 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 16 Feb 2023 16:57:17 +0000 Subject: [PATCH 17/21] add CHANGELOG for #1210 --- .changelog/1210.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/1210.txt diff --git a/.changelog/1210.txt b/.changelog/1210.txt new file mode 100644 index 000000000000..a05f5531d170 --- /dev/null +++ b/.changelog/1210.txt @@ -0,0 +1,3 @@ +```release-note:dependency +deps: bumps github.com/urfave/cli/v2 from 2.24.3 to 2.24.4 +``` From 57d9aea2885c4cd3ba2507f2dbeb97e654388833 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 16 Feb 2023 21:01:20 +0000 Subject: [PATCH 18/21] Update CHANGELOG.md for #1210 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b580146cc156..504996e2c9aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ENHANCEMENTS: * teams_accounts: Add new root_certificate_installation_enabled field ([#1208](https://github.com/cloudflare/cloudflare-go/issues/1208)) +DEPENDENCIES: + +* deps: bumps github.com/urfave/cli/v2 from 2.24.3 to 2.24.4 ([#1210](https://github.com/cloudflare/cloudflare-go/issues/1210)) + ## 0.61.0 (15th February, 2023) ENHANCEMENTS: From 1856cd47677090e29dbe9cf816cc9420e0b0bc46 Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 16 Feb 2023 23:51:19 +0000 Subject: [PATCH 19/21] Update CHANGELOG.md for #1209 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 504996e2c9aa..ef907c98c51c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ENHANCEMENTS: +* dex_test: add CRUD functionality for DEX test configurations ([#1209](https://github.com/cloudflare/cloudflare-go/issues/1209)) * teams_accounts: Add new root_certificate_installation_enabled field ([#1208](https://github.com/cloudflare/cloudflare-go/issues/1208)) DEPENDENCIES: From 6b5ab567dc35cb66b1dd60915e92aa79b6c02f0b Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Fri, 17 Feb 2023 10:51:51 +1100 Subject: [PATCH 20/21] update changelog --- .changelog/1206.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/1206.txt b/.changelog/1206.txt index fac539f06802..fb12a08ebe02 100644 --- a/.changelog/1206.txt +++ b/.changelog/1206.txt @@ -1,3 +1,3 @@ ```release-note:enhancement -tunnels: Added Pagination (through `WithPagination`) support to `Tunnels` API. +tunnels: automatically paginate `ListTunnels` ``` From 44062f11f38476ed3432cf2fdaceeb0cef5d5c9c Mon Sep 17 00:00:00 2001 From: changelogbot Date: Thu, 16 Feb 2023 23:56:05 +0000 Subject: [PATCH 21/21] Update CHANGELOG.md for #1206 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef907c98c51c..792686e249fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ENHANCEMENTS: * dex_test: add CRUD functionality for DEX test configurations ([#1209](https://github.com/cloudflare/cloudflare-go/issues/1209)) * teams_accounts: Add new root_certificate_installation_enabled field ([#1208](https://github.com/cloudflare/cloudflare-go/issues/1208)) +* tunnels: automatically paginate `ListTunnels` ([#1206](https://github.com/cloudflare/cloudflare-go/issues/1206)) DEPENDENCIES: