Skip to content

Commit

Permalink
fix(deps)!: Update module github.com/cloudflare/cloudflare-go to v0.5…
Browse files Browse the repository at this point in the history
…7.1 (#6186)

BEGIN_COMMIT_OVERRIDE
fix(deps): Update module github.com/cloudflare/cloudflare-go to v0.57.1

BREAKING-CHANGE: The deprecated `enabled` column was removed for the `cloudflare_worker_routes` table. See more in https://github.com/cloudflare/cloudflare-go/blob/677a9006b5bf5692981c5a45433315358de9437e/workers.go#L45

END_COMMIT_OVERRIDE

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/cloudflare/cloudflare-go](https://togithub.com/cloudflare/cloudflare-go) | require | minor | `v0.55.0` -> `v0.57.1` |

---

### Release Notes

<details>
<summary>cloudflare/cloudflare-go</summary>

### [`v0.57.1`](https://togithub.com/cloudflare/cloudflare-go/releases/tag/v0.57.1)

[Compare Source](https://togithub.com/cloudflare/cloudflare-go/compare/v0.57.0...v0.57.1)

ENHANCEMENTS:

-   tiered_cache: Add support for Tiered Caching interactions for setting Smart and Generic topologies ([#&#8203;1149](https://togithub.com/cloudflare/cloudflare-go/issues/1149))

BUG FIXES:

-   workers: correctly set `body` value for non-ES module uploads ([#&#8203;1155](https://togithub.com/cloudflare/cloudflare-go/issues/1155))

### [`v0.57.0`](https://togithub.com/cloudflare/cloudflare-go/releases/tag/v0.57.0)

[Compare Source](https://togithub.com/cloudflare/cloudflare-go/compare/v0.56.0...v0.57.0)

REAKING CHANGES:

-   workers: API operations now target account level resources instead of older zone level resources (these are a 1:1 now) ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))
-   workers: method signatures have been updated to align with the upcoming client conventions ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))
-   workers_bindings: method signatures have been updated to align with the upcoming client conventions ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))
-   workers_cron_triggers: method signatures have been updated to align with the upcoming client conventions ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))
-   workers_kv: method signatures have been updated to align with the upcoming client conventions ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))
-   workers_routes: method signatures have been updated to align with the upcoming client conventions ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))
-   workers_secrets: method signatures have been updated to align with the upcoming client conventions ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))
-   workers_tails: method signatures have been updated to align with the upcoming client conventions ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))

NOTES:

-   workers: all worker methods have been split into product ownership(-ish) files ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))
-   workers: all worker methods now require an explicit `ResourceContainer` for endpoints instead of relying on the globally defined `api.AccountID` ([#&#8203;1137](https://togithub.com/cloudflare/cloudflare-go/issues/1137))

ENHANCEMENTS:

-   managed_networks: add CRUD functionality for managednetworks ([#&#8203;1148](https://togithub.com/cloudflare/cloudflare-go/issues/1148))

DEPENDENCIES:

-   deps: bumps goreleaser/goreleaser-action from 3.2.0 to 4.1.0 ([#&#8203;1146](https://togithub.com/cloudflare/cloudflare-go/issues/1146))

### [`v0.56.0`](https://togithub.com/cloudflare/cloudflare-go/releases/tag/v0.56.0)

[Compare Source](https://togithub.com/cloudflare/cloudflare-go/compare/v0.55.0...v0.56.0)

BREAKING CHANGES:

-   pages: Changed the type of EnvVars in PagesProjectDeploymentConfigEnvironment & PagesProjectDeployment in order to properly support secrets. ([cloudflare/cloudflare-go#1136)

ENHANCEMENTS:

-   cache_rules: add ignore option to query string struct ([cloudflare/cloudflare-go#1140)
-   pages: Updates bindings and other Functions related propreties. Service bindings, secrets, fail open/close and usage model are all now supported. ([cloudflare/cloudflare-go#1136)
-   workers: Support for Workers Analytics Engine bindings ([cloudflare/cloudflare-go#1133)

DEPENDENCIES:

-   deps: bumps github.com/urfave/cli/v2 from 2.23.5 to 2.23.6 ([cloudflare/cloudflare-go#1139)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 3am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC40Mi4wIiwidXBkYXRlZEluVmVyIjoiMzQuNDIuMCJ9-->
  • Loading branch information
cq-bot committed Jan 1, 2023
1 parent 53b2415 commit 14a7ae0
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 56 deletions.
4 changes: 2 additions & 2 deletions plugins/source/cloudflare/Makefile
@@ -1,6 +1,6 @@
# Generate mocks for mock/unit testing
.PHONY: gen-mocks
gen-mocks:
gen-mocks: install-tools
go generate ./client/...

# Test unit
Expand Down Expand Up @@ -31,4 +31,4 @@ gen-code:

# All gen targets
.PHONY: gen
gen: gen-code gen-docs
gen: gen-code gen-mocks gen-docs
35 changes: 18 additions & 17 deletions plugins/source/cloudflare/client/mocks/mock_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions plugins/source/cloudflare/client/services.go
Expand Up @@ -19,10 +19,10 @@ type Api interface {
ListWAFGroups(ctx context.Context, zoneID, packageID string) ([]cloudflare.WAFGroup, error)
ListWAFRules(ctx context.Context, zoneID, packageID string) ([]cloudflare.WAFRule, error)

ListWorkerScripts(ctx context.Context) (cloudflare.WorkerListResponse, error)
ListWorkerRoutes(ctx context.Context, zoneID string) (cloudflare.WorkerRoutesResponse, error)
ListWorkerCronTriggers(ctx context.Context, accountID, scriptName string) ([]cloudflare.WorkerCronTrigger, error)
ListWorkersSecrets(ctx context.Context, script string) (cloudflare.WorkersListSecretsResponse, error)
ListWorkers(ctx context.Context, rc *cloudflare.ResourceContainer, params cloudflare.ListWorkersParams) (cloudflare.WorkerListResponse, *cloudflare.ResultInfo, error)
ListWorkerRoutes(ctx context.Context, rc *cloudflare.ResourceContainer, params cloudflare.ListWorkerRoutesParams) (cloudflare.WorkerRoutesResponse, error)
ListWorkerCronTriggers(ctx context.Context, rc *cloudflare.ResourceContainer, params cloudflare.ListWorkerCronTriggersParams) ([]cloudflare.WorkerCronTrigger, error)
ListWorkersSecrets(ctx context.Context, rc *cloudflare.ResourceContainer, params cloudflare.ListWorkersSecretsParams) (cloudflare.WorkersListSecretsResponse, error)

ListCertificatePacks(ctx context.Context, zoneID string) ([]cloudflare.CertificatePack, error)

Expand Down
Expand Up @@ -14,5 +14,4 @@ The primary key for this table is **id**.
|zone_id|String|
|id (PK)|String|
|pattern|String|
|enabled|Bool|
|script|String|
2 changes: 1 addition & 1 deletion plugins/source/cloudflare/go.mod
Expand Up @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/cloudflare
go 1.19

require (
github.com/cloudflare/cloudflare-go v0.55.0
github.com/cloudflare/cloudflare-go v0.57.1
github.com/cloudquery/plugin-sdk v1.16.1
github.com/gertd/go-pluralize v0.2.1
github.com/golang/mock v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions plugins/source/cloudflare/go.sum
Expand Up @@ -40,8 +40,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cloudflare/cloudflare-go v0.55.0 h1:r/+AC9WX7+/G3K7DH5l58Mmnc8dIF5kyQsKW7NmNlX8=
github.com/cloudflare/cloudflare-go v0.55.0/go.mod h1:2N8L4vv3eobUgkB41tSiIJWRK4u/jJsK3IQz3EgFS+8=
github.com/cloudflare/cloudflare-go v0.57.1 h1:c9OhL/WusagBirP+CIJeCqS7OjT9kiWjtJv4lwxp3ZM=
github.com/cloudflare/cloudflare-go v0.57.1/go.mod h1:cD8AqNMMaL1A0Sj9XKo3Xu9ZVHwHqgXJofb1ya210GQ=
github.com/cloudquery/plugin-sdk v1.16.1 h1:FstBNQkdAFZRh5F3Y0ugL/pLTg/tPAzljxnpjNda4po=
github.com/cloudquery/plugin-sdk v1.16.1/go.mod h1:teMPyCON3uPdMsHvzpSiOg+IK2sOR5Tf9dYLreoURzI=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
Expand Down
Expand Up @@ -11,7 +11,9 @@ import (
func fetchWorkerMetaData(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
svc := meta.(*client.Client)

resp, err := svc.ClientApi.ListWorkerScripts(ctx)
rc := cloudflare.AccountIdentifier(svc.AccountId)
params := cloudflare.ListWorkersParams{}
resp, _, err := svc.ClientApi.ListWorkers(ctx, rc, params)
if err != nil {
return err
}
Expand All @@ -24,7 +26,9 @@ func fetchWorkerCronTriggers(ctx context.Context, meta schema.ClientMeta, parent
accountId := svc.AccountId
script := parent.Item.(cloudflare.WorkerMetaData)

resp, err := svc.ClientApi.ListWorkerCronTriggers(ctx, accountId, script.ID)
rc := cloudflare.AccountIdentifier(accountId)
params := cloudflare.ListWorkerCronTriggersParams{ScriptName: script.ID}
resp, err := svc.ClientApi.ListWorkerCronTriggers(ctx, rc, params)
if err != nil {
return err
}
Expand All @@ -36,7 +40,9 @@ func fetchWorkersSecrets(ctx context.Context, meta schema.ClientMeta, parent *sc
svc := meta.(*client.Client)
script := parent.Item.(cloudflare.WorkerMetaData)

resp, err := svc.ClientApi.ListWorkersSecrets(ctx, script.ID)
rc := cloudflare.AccountIdentifier(svc.AccountId)
params := cloudflare.ListWorkersSecretsParams{ScriptName: script.ID}
resp, err := svc.ClientApi.ListWorkersSecrets(ctx, rc, params)
if err != nil {
return err
}
Expand Down
Expand Up @@ -17,24 +17,20 @@ func buildWorkerMetaData(t *testing.T, ctrl *gomock.Controller) client.Clients {
if err := faker.FakeObject(&workerScript); err != nil {
t.Fatal(err)
}
mock.EXPECT().ListWorkerScripts(
gomock.Any(),
).Return(
cloudflare.WorkerListResponse{
WorkerList: []cloudflare.WorkerMetaData{workerScript},
},
response := cloudflare.WorkerListResponse{
WorkerList: []cloudflare.WorkerMetaData{workerScript},
}
mock.EXPECT().ListWorkers(gomock.Any(), cloudflare.AccountIdentifier(client.TestAccountID), cloudflare.ListWorkersParams{}).Return(
response,
&response.ResultInfo,
nil,
)

var workerCronTrigger cloudflare.WorkerCronTrigger
if err := faker.FakeObject(&workerCronTrigger); err != nil {
t.Fatal(err)
}
mock.EXPECT().ListWorkerCronTriggers(
gomock.Any(),
client.TestAccountID,
workerScript.ID,
).Return(
mock.EXPECT().ListWorkerCronTriggers(gomock.Any(), cloudflare.AccountIdentifier(client.TestAccountID), cloudflare.ListWorkerCronTriggersParams{ScriptName: workerScript.ID}).Return(
[]cloudflare.WorkerCronTrigger{workerCronTrigger},
nil,
)
Expand All @@ -43,10 +39,7 @@ func buildWorkerMetaData(t *testing.T, ctrl *gomock.Controller) client.Clients {
if err := faker.FakeObject(&workerSecret); err != nil {
t.Fatal(err)
}
mock.EXPECT().ListWorkersSecrets(
gomock.Any(),
workerScript.ID,
).Return(
mock.EXPECT().ListWorkersSecrets(gomock.Any(), cloudflare.AccountIdentifier(client.TestAccountID), cloudflare.ListWorkersSecretsParams{ScriptName: workerScript.ID}).Return(
cloudflare.WorkersListSecretsResponse{
Result: []cloudflare.WorkersSecret{workerSecret},
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -3,6 +3,7 @@ package worker_routes
import (
"context"

"github.com/cloudflare/cloudflare-go"
"github.com/cloudquery/cloudquery/plugins/source/cloudflare/client"
"github.com/cloudquery/plugin-sdk/schema"
)
Expand All @@ -11,7 +12,9 @@ func fetchWorkerRoutes(ctx context.Context, meta schema.ClientMeta, parent *sche
svc := meta.(*client.Client)
zoneId := svc.ZoneId

resp, err := svc.ClientApi.ListWorkerRoutes(ctx, zoneId)
rc := cloudflare.ZoneIdentifier(zoneId)
params := cloudflare.ListWorkerRoutesParams{}
resp, err := svc.ClientApi.ListWorkerRoutes(ctx, rc, params)
if err != nil {
return err
}
Expand Down
Expand Up @@ -17,10 +17,7 @@ func buildWorkerRoutes(t *testing.T, ctrl *gomock.Controller) client.Clients {
if err := faker.FakeObject(&workerRoute); err != nil {
t.Fatal(err)
}
mock.EXPECT().ListWorkerRoutes(
gomock.Any(),
client.TestZoneID,
).Return(
mock.EXPECT().ListWorkerRoutes(gomock.Any(), cloudflare.ZoneIdentifier(client.TestZoneID), cloudflare.ListWorkerRoutesParams{}).Return(
cloudflare.WorkerRoutesResponse{
Routes: []cloudflare.WorkerRoute{workerRoute},
},
Expand Down

0 comments on commit 14a7ae0

Please sign in to comment.