Skip to content

Commit

Permalink
Merge pull request #1561 from cloudflare/release-please--branches--v2…
Browse files Browse the repository at this point in the history
…--changes--next

release: 2.0.0-beta.6
  • Loading branch information
jacobbednarz committed Mar 14, 2024
2 parents d929b51 + e058296 commit 7acfc48
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "2.0.0-beta.5"
".": "2.0.0-beta.6"
}
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 2.0.0-beta.6 (2024-03-14)

Full Changelog: [v2.0.0-beta.5...v2.0.0-beta.6](https://github.com/cloudflare/cloudflare-go/compare/v2.0.0-beta.5...v2.0.0-beta.6)

### Features

* update via SDK Studio ([#1560](https://github.com/cloudflare/cloudflare-go/issues/1560)) ([f416888](https://github.com/cloudflare/cloudflare-go/commit/f416888fac2444dc741a8273e5589cc768247f6c))

## 2.0.0-beta.5 (2024-03-13)

Full Changelog: [v2.0.0-beta.4...v2.0.0-beta.5](https://github.com/cloudflare/cloudflare-go/compare/v2.0.0-beta.4...v2.0.0-beta.5)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Or to pin the version:
<!-- x-release-please-start-version -->

```sh
go get -u 'github.com/cloudflare/cloudflare-go/v2@v2.0.0-beta.5'
go get -u 'github.com/cloudflare/cloudflare-go/v2@v2.0.0-beta.6'
```

<!-- x-release-please-end -->
Expand Down
2 changes: 1 addition & 1 deletion api.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Methods:
Response Types:

- <a href="https://pkg.go.dev/github.com/cloudflare/cloudflare-go/v2/ips">ips</a>.<a href="https://pkg.go.dev/github.com/cloudflare/cloudflare-go/v2/ips#IPs">IPs</a>
- <a href="https://pkg.go.dev/github.com/cloudflare/cloudflare-go/v2/ips">ips</a>.<a href="https://pkg.go.dev/github.com/cloudflare/cloudflare-go/v2/ips#JdcloudIPs">JdcloudIPs</a>
- <a href="https://pkg.go.dev/github.com/cloudflare/cloudflare-go/v2/ips">ips</a>.<a href="https://pkg.go.dev/github.com/cloudflare/cloudflare-go/v2/ips#JDCloudIPs">JDCloudIPs</a>
- <a href="https://pkg.go.dev/github.com/cloudflare/cloudflare-go/v2/ips">ips</a>.<a href="https://pkg.go.dev/github.com/cloudflare/cloudflare-go/v2/ips#IPListResponse">IPListResponse</a>

Methods:
Expand Down
2 changes: 1 addition & 1 deletion internal/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

package internal

const PackageVersion = "2.0.0-beta.5" // x-release-please-version
const PackageVersion = "2.0.0-beta.6" // x-release-please-version
22 changes: 11 additions & 11 deletions ips/ip.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,39 +78,39 @@ func (r ipsJSON) RawJSON() string {

func (r IPs) implementsIPsIPListResponse() {}

type JdcloudIPs struct {
type JDCloudIPs struct {
// A digest of the IP data. Useful for determining if the data has changed.
Etag string `json:"etag"`
// List of Cloudflare IPv4 CIDR addresses.
IPV4CIDRs []string `json:"ipv4_cidrs"`
// List of Cloudflare IPv6 CIDR addresses.
IPV6CIDRs []string `json:"ipv6_cidrs"`
// List IPv4 and IPv6 CIDRs, only populated if `?networks=jdcloud` is used.
JdcloudCIDRs []string `json:"jdcloud_cidrs"`
JSON jdcloudIPsJSON `json:"-"`
JDCloudCIDRs []string `json:"jdcloud_cidrs"`
JSON JDCloudIPsJSON `json:"-"`
}

// jdcloudIPsJSON contains the JSON metadata for the struct [JdcloudIPs]
type jdcloudIPsJSON struct {
// JDCloudIPsJSON contains the JSON metadata for the struct [JDCloudIPs]
type JDCloudIPsJSON struct {
Etag apijson.Field
IPV4CIDRs apijson.Field
IPV6CIDRs apijson.Field
JdcloudCIDRs apijson.Field
JDCloudCIDRs apijson.Field
raw string
ExtraFields map[string]apijson.Field
}

func (r *JdcloudIPs) UnmarshalJSON(data []byte) (err error) {
func (r *JDCloudIPs) UnmarshalJSON(data []byte) (err error) {
return apijson.UnmarshalRoot(data, r)
}

func (r jdcloudIPsJSON) RawJSON() string {
func (r JDCloudIPsJSON) RawJSON() string {
return r.raw
}

func (r JdcloudIPs) implementsIPsIPListResponse() {}
func (r JDCloudIPs) implementsIPsIPListResponse() {}

// Union satisfied by [ips.IPs] or [ips.JdcloudIPs].
// Union satisfied by [ips.IPs] or [ips.JDCloudIPs].
type IPListResponse interface {
implementsIPsIPListResponse()
}
Expand All @@ -125,7 +125,7 @@ func init() {
},
apijson.UnionVariant{
TypeFilter: gjson.JSON,
Type: reflect.TypeOf(JdcloudIPs{}),
Type: reflect.TypeOf(JDCloudIPs{}),
},
)
}
Expand Down

0 comments on commit 7acfc48

Please sign in to comment.