GATE-2448: Adds support for proxy endpoints #1517

Michael9127 · 2022-03-17T16:51:55Z

No description provided.

github-actions · 2022-03-17T16:53:16Z

Oops! It looks like no changelog entry is attached to this PR. Please include a release note as described in https://github.com/cloudflare/terraform-provider-cloudflare/blob/master/docs/changelog-process.md.

Example:

```release-note:TYPE
Release note
```

If you do not require a release note to be included, please add the workflow/skip-changelog-entry label.

jacobbednarz · 2022-03-17T23:52:34Z

CHANGELOG.md

@@ -3,6 +3,7 @@
 FEATURES:

 * **New Resource:** `cloudflare_waiting_room_event` ([#1509](https://github.com/cloudflare/terraform-provider-cloudflare/issues/1509))
+* **New Resource:** `cloudflare_teams_proxy_endpoint`


this file is automatically generated, check out https://github.com/cloudflare/terraform-provider-cloudflare/blob/master/docs/changelog-process.md to add a changelog entry.

jacobbednarz

solid start! to get this over the line we need:

a CHANGELOG entry; and
website documentation. check out Adds Website docs for cloudflare_static_route #1113 for a good example.

cloudflare/resource_cloudflare_teams_proxy_endpoints.go

jacobbednarz · 2022-03-17T23:55:53Z

cloudflare/resource_cloudflare_teams_proxy_endpoints_test.go

+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(name, "account_id", accountID),
+					resource.TestCheckResourceAttr(name, "name", rnd),
+					resource.TestCheckResourceAttr(name, "ips.0", "1.2.3.4/32"),


let's use IP ranges from RFC5737 for our tests/documentation.

ah right, I forget every time. Fixed!

jacobbednarz · 2022-03-17T23:56:19Z

cloudflare/schema_cloudflare_teams_proxy_endpoints.go

+			Computed: true,
+		},
+		"ips": {
+			Type:     schema.TypeList,


do you care about order? if not, you probably want TypeSet.

jacobbednarz · 2022-03-21T23:06:39Z

cloudflare/resource_cloudflare_teams_proxy_endpoints.go

+	updatedProxyEndpoint := cloudflare.TeamsProxyEndpoint{
+		ID:   d.Id(),
+		Name: d.Get("name").(string),
+		IPs:  inflateProxyEndpointIPs(d.Get("ips").([]interface{})),


Suggested change

IPs: inflateProxyEndpointIPs(d.Get("ips").([]interface{})),

IPs: expandInterfaceToStringList(d.Get("ips").([]interface{})),

jacobbednarz · 2022-03-21T23:06:58Z

cloudflare/resource_cloudflare_teams_proxy_endpoints.go

+func inflateProxyEndpointIPs(ips []interface{}) []string {
+	i := make([]string, len(ips))
+	for x, ip := range ips {
+		i[x] = ip.(string)
+	}
+	return i
+}


duplicates expandInterfaceToStringList

Suggested change

func inflateProxyEndpointIPs(ips []interface{}) []string {

i := make([]string, len(ips))

for x, ip := range ips {

i[x] = ip.(string)

}

return i

}

jacobbednarz · 2022-03-21T23:14:14Z

acceptance tests are passing

TF_ACC=1 go test $(go list ./...) -v -run "^TestAccCloudflareTeamsProxyEndpoint_" -count 1 -parallel 1 -timeout 120m -parallel 1
?   	github.com/cloudflare/terraform-provider-cloudflare	[no test files]
=== RUN   TestAccCloudflareTeamsProxyEndpoint_Basic
--- PASS: TestAccCloudflareTeamsProxyEndpoint_Basic (10.54s)
PASS
ok  	github.com/cloudflare/terraform-provider-cloudflare/cloudflare	11.092s
?   	github.com/cloudflare/terraform-provider-cloudflare/tools/cmd/changelog-check	[no test files]
?   	github.com/cloudflare/terraform-provider-cloudflare/tools/cmd/maintainer-only-file-check	[no test files]
?   	github.com/cloudflare/terraform-provider-cloudflare/tools/cmd/tf-log-check	[no test files]
?   	github.com/cloudflare/terraform-provider-cloudflare/version	[no test files]

jacobbednarz · 2022-03-21T23:21:50Z

thank you @Michael9127 👏

Michael9127 force-pushed the mike/GATE-2448-add-proxy-endpoint-support branch from b83b13d to 70f731a Compare March 17, 2022 16:59

jacobbednarz reviewed Mar 17, 2022

View reviewed changes

jacobbednarz requested changes Mar 17, 2022

View reviewed changes

Michael9127 force-pushed the mike/GATE-2448-add-proxy-endpoint-support branch 2 times, most recently from 854cb7c to ca3fb3a Compare March 21, 2022 15:53

GATE-2448: Adds support for proxy endpoints

b955125

Michael9127 force-pushed the mike/GATE-2448-add-proxy-endpoint-support branch from ca3fb3a to b955125 Compare March 21, 2022 15:59

GATE-2448: Adds website documentation for proxy endpoints

c3ab0ba

Michael9127 requested a review from jacobbednarz March 21, 2022 16:40

jacobbednarz reviewed Mar 21, 2022

View reviewed changes

jacobbednarz added 4 commits March 22, 2022 10:07

remove manual CHANGELOG entry

9c51a98

use expandInterfaceToStringList instead of custom method

a3dcb5a

these are actually schema.Set

2fe0a01

need to use resolvable IP ranges

001bfbf

jacobbednarz merged commit df3f6f4 into cloudflare:master Mar 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GATE-2448: Adds support for proxy endpoints #1517

GATE-2448: Adds support for proxy endpoints #1517

Michael9127 commented Mar 17, 2022

github-actions bot commented Mar 17, 2022

jacobbednarz Mar 17, 2022

Michael9127 Mar 21, 2022

jacobbednarz left a comment

jacobbednarz Mar 17, 2022

Michael9127 Mar 21, 2022

jacobbednarz Mar 17, 2022

Michael9127 Mar 21, 2022

jacobbednarz Mar 21, 2022

jacobbednarz Mar 21, 2022

jacobbednarz commented Mar 21, 2022

jacobbednarz commented Mar 21, 2022

	IPs: inflateProxyEndpointIPs(d.Get("ips").([]interface{})),
	IPs: expandInterfaceToStringList(d.Get("ips").([]interface{})),

GATE-2448: Adds support for proxy endpoints #1517

GATE-2448: Adds support for proxy endpoints #1517

Conversation

Michael9127 commented Mar 17, 2022

github-actions bot commented Mar 17, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jacobbednarz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jacobbednarz commented Mar 21, 2022

jacobbednarz commented Mar 21, 2022