Skip to content

Commit

Permalink
Merge pull request #4874 from cloudflare/swap-to-v4
Browse files Browse the repository at this point in the history 
swap v3 refs to v4
  • Loading branch information
@jacobbednarz
jacobbednarz authored Jan 10, 2025
2 parents b0e693d + 379d683 commit e15ee1e
Show file tree
Hide file tree
Showing 16 changed files with 28 additions and 31 deletions.
4 changes: 2 additions & 2 deletions internal/acctest/acctest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

cfv1 "github.com/cloudflare/cloudflare-go"
"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/option"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/option"
"github.com/cloudflare/terraform-provider-cloudflare/internal"
"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
"github.com/hashicorp/terraform-plugin-framework/providerserver"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/api_shield_operation/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

"github.com/cloudflare/cloudflare-go"
cfv3 "github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/api_gateway"
cfv3 "github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/api_gateway"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/dns_firewall/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"testing"

"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/dns_firewall"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/dns_firewall"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/dns_record/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"testing"

cfold "github.com/cloudflare/cloudflare-go"
cloudflare "github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/dns"
cloudflare "github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/dns"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/dns_zone_transfers_acl/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"testing"

"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/dns"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/dns"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
"github.com/hashicorp/terraform-plugin-log/tflog"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/dns_zone_transfers_incoming/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"testing"

"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/dns"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/dns"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
"github.com/hashicorp/terraform-plugin-log/tflog"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/dns_zone_transfers_outgoing/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"testing"

"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/dns"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/dns"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
"github.com/hashicorp/terraform-plugin-log/tflog"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/dns_zone_transfers_tsig/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"testing"

"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/dns"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/dns"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
"github.com/hashicorp/terraform-plugin-log/tflog"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/load_balancer/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

cfold "github.com/cloudflare/cloudflare-go"
"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/load_balancers"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/load_balancers"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/load_balancer_pool/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

cfold "github.com/cloudflare/cloudflare-go"
"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/load_balancers"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/load_balancers"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/page_rule/custom.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"encoding/json"

"github.com/cloudflare/cloudflare-go/v3/page_rules"
"github.com/cloudflare/cloudflare-go/v4/page_rules"
"github.com/cloudflare/terraform-provider-cloudflare/internal/apijson"
"github.com/cloudflare/terraform-provider-cloudflare/internal/customfield"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down
Binary file renamed internal/services/.DS_Store → internal/services/r2_bucket/.DS_Store
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions internal/services/workers_secret/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"testing"

"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/workers_for_platforms"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/workers_for_platforms"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/zero_trust_access_mtls_hostname_settings/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

cfv1 "github.com/cloudflare/cloudflare-go"
cfv2 "github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/zero_trust"
cfv2 "github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/zero_trust"
"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
Expand Down
6 changes: 3 additions & 3 deletions internal/services/zone_dnssec/custom.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package zone_dnssec
import (
"context"

"github.com/cloudflare/cloudflare-go/v3"
"github.com/cloudflare/cloudflare-go/v3/dns"
"github.com/cloudflare/cloudflare-go/v3/option"
"github.com/cloudflare/cloudflare-go/v4"
"github.com/cloudflare/cloudflare-go/v4/dns"
"github.com/cloudflare/cloudflare-go/v4/option"
"github.com/cloudflare/terraform-provider-cloudflare/internal/logging"
"github.com/hashicorp/terraform-plugin-framework/resource"
)
Expand Down
3 changes: 0 additions & 3 deletions scripts/bootstrap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,4 @@ fi

echo "==> Installing Go dependencies…"

# pull in cloudflare-go@next until we cut a fresh release
go get github.com/cloudflare/cloudflare-go/v3@next

go mod tidy

0 comments on commit e15ee1e

Please sign in to comment.