Skip to content

Commit c49f303

Browse files
committed
Support HAProxy Data Plane API v3 and fix unrelated build/crash bugs
Parameterize the Data Plane API version (api_version provider arg, default v3) instead of hardcoding /v2/ in every request URL — current dataplaneapi releases no longer serve /v2/ at all, which broke every operation out of the box. Also fixes two unrelated pre-existing bugs surfaced while testing: - main failed to build due to a grpc/google.golang.org/api version conflict from a prior dependency bump; bumped google.golang.org/api. - nil-pointer panics in ~33 resource/data-source Read/Create/Update/ Delete functions whenever the underlying transaction request failed (the most common trigger being the /v2/ 404s above), matching the crash reported in #3.
1 parent 745bb7a commit c49f303

79 files changed

Lines changed: 675 additions & 249 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ terraform {
4848
required_providers {
4949
haproxy = {
5050
source = "SepehrImanian/haproxy"
51-
version = "0.0.7"
51+
version = "0.0.8"
5252
}
5353
}
5454
}

deploy/config/haproxy.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ userlist haproxy-dataplaneapi
3636

3737
program api
3838
command /usr/bin/dataplaneapi --host 0.0.0.0 --port 5555 --haproxy-bin /usr/sbin/haproxy --config-file /usr/local/etc/haproxy/haproxy.cfg --reload-cmd "kill -SIGUSR2 1" --restart-cmd "kill -SIGUSR2 1" --reload-delay 5 --userlist haproxy-dataplaneapi
39-
no option start-on-reload
39+
no option start-on-reload

docs/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ terraform {
1717
required_providers {
1818
haproxy = {
1919
source = "SepehrImanian/haproxy"
20-
version = "0.0.7"
20+
version = "0.0.8"
2121
}
2222
}
2323
}
@@ -40,4 +40,5 @@ provider "haproxy" {
4040

4141
### Optional
4242

43+
- `api_version` (String) Haproxy Data Plane API version to use, "v2" or "v3" (default: v3)
4344
- `insecure` (Boolean) Disable SSL certificate verification (default: false)

go.mod

Lines changed: 52 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
module terraform-provider-haproxy
22

3-
go 1.24.0
3+
go 1.25.8
44

55
require (
66
github.com/hashicorp/terraform-plugin-docs v0.16.0
77
github.com/hashicorp/terraform-plugin-sdk v1.17.2
8-
github.com/stretchr/testify v1.8.1
8+
github.com/stretchr/testify v1.11.1
99
)
1010

1111
require (
12-
cloud.google.com/go v0.110.0 // indirect
12+
cel.dev/expr v0.25.1 // indirect
13+
cloud.google.com/go v0.121.6 // indirect
14+
cloud.google.com/go/auth v0.20.0 // indirect
15+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
1316
cloud.google.com/go/compute/metadata v0.9.0 // indirect
14-
cloud.google.com/go/iam v0.13.0 // indirect
15-
cloud.google.com/go/storage v1.28.1 // indirect
17+
cloud.google.com/go/iam v1.5.3 // indirect
18+
cloud.google.com/go/monitoring v1.24.3 // indirect
19+
cloud.google.com/go/storage v1.56.0 // indirect
20+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 // indirect
21+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
22+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
1623
github.com/Masterminds/goutils v1.1.1 // indirect
1724
github.com/Masterminds/semver/v3 v3.1.1 // indirect
1825
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
@@ -24,15 +31,23 @@ require (
2431
github.com/aws/aws-sdk-go v1.44.122 // indirect
2532
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2633
github.com/bgentry/speakeasy v0.1.0 // indirect
34+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2735
github.com/cloudflare/circl v1.3.7 // indirect
28-
github.com/davecgh/go-spew v1.1.1 // indirect
36+
github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 // indirect
37+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
38+
github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect
39+
github.com/envoyproxy/protoc-gen-validate v1.3.3 // indirect
2940
github.com/fatih/color v1.13.0 // indirect
30-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
41+
github.com/felixge/httpsnoop v1.0.4 // indirect
42+
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
43+
github.com/go-logr/logr v1.4.3 // indirect
44+
github.com/go-logr/stdr v1.2.2 // indirect
3145
github.com/golang/protobuf v1.5.4 // indirect
3246
github.com/google/go-cmp v0.7.0 // indirect
47+
github.com/google/s2a-go v0.1.9 // indirect
3348
github.com/google/uuid v1.6.0 // indirect
34-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
35-
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
49+
github.com/googleapis/enterprise-certificate-proxy v0.3.16 // indirect
50+
github.com/googleapis/gax-go/v2 v2.22.0 // indirect
3651
github.com/hashicorp/errwrap v1.1.0 // indirect
3752
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
3853
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -63,32 +78,43 @@ require (
6378
github.com/mitchellh/mapstructure v1.5.0 // indirect
6479
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6580
github.com/oklog/run v1.0.0 // indirect
66-
github.com/pmezard/go-difflib v1.0.0 // indirect
81+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
82+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6783
github.com/posener/complete v1.2.3 // indirect
6884
github.com/russross/blackfriday v1.6.0 // indirect
6985
github.com/shopspring/decimal v1.3.1 // indirect
70-
github.com/spf13/afero v1.2.2 // indirect
86+
github.com/spf13/afero v1.15.0 // indirect
7187
github.com/spf13/cast v1.5.0 // indirect
72-
github.com/stretchr/objx v0.5.0 // indirect
88+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
89+
github.com/stretchr/objx v0.5.2 // indirect
7390
github.com/ulikunitz/xz v0.5.10 // indirect
7491
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
7592
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
7693
github.com/zclconf/go-cty v1.13.2 // indirect
7794
github.com/zclconf/go-cty-yaml v1.0.2 // indirect
78-
go.opencensus.io v0.24.0 // indirect
79-
golang.org/x/crypto v0.46.0 // indirect
95+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
96+
go.opentelemetry.io/contrib/detectors/gcp v1.42.0 // indirect
97+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
98+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
99+
go.opentelemetry.io/otel v1.43.0 // indirect
100+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
101+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
102+
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
103+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
104+
golang.org/x/crypto v0.53.0 // indirect
80105
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
81-
golang.org/x/mod v0.30.0 // indirect
82-
golang.org/x/net v0.48.0 // indirect
83-
golang.org/x/oauth2 v0.34.0 // indirect
84-
golang.org/x/sync v0.19.0 // indirect
85-
golang.org/x/sys v0.39.0 // indirect
86-
golang.org/x/text v0.32.0 // indirect
87-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
88-
google.golang.org/api v0.114.0 // indirect
89-
google.golang.org/appengine v1.6.7 // indirect
90-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
91-
google.golang.org/grpc v1.79.3 // indirect
92-
google.golang.org/protobuf v1.36.10 // indirect
106+
golang.org/x/mod v0.36.0 // indirect
107+
golang.org/x/net v0.56.0 // indirect
108+
golang.org/x/oauth2 v0.36.0 // indirect
109+
golang.org/x/sync v0.21.0 // indirect
110+
golang.org/x/sys v0.46.0 // indirect
111+
golang.org/x/text v0.38.0 // indirect
112+
golang.org/x/time v0.15.0 // indirect
113+
google.golang.org/api v0.285.0 // indirect
114+
google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
115+
google.golang.org/genproto/googleapis/api v0.0.0-20260319201613-d00831a3d3e7 // indirect
116+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad // indirect
117+
google.golang.org/grpc v1.81.1 // indirect
118+
google.golang.org/protobuf v1.36.11 // indirect
93119
gopkg.in/yaml.v3 v3.0.1 // indirect
94120
)

0 commit comments

Comments
 (0)