Skip to content

Commit f8020c2

Browse files
authoredOct 1, 2024
Merge pull request #733 from beluc/resource_iploadbalancing_ssl
fix definition of ovh_iploadbalancing_ssl
2 parents 361e2f0 + c40d426 commit f8020c2

File tree

3 files changed

+175
-21
lines changed

3 files changed

+175
-21
lines changed
 

‎ovh/resource_iploadbalancing_ssl_gen.go

+90-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ovh/resource_iploadbalancing_ssl_test.go

+80-11
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/hashicorp/terraform-plugin-testing/terraform"
1010
)
1111

12-
const certificate = `
12+
const crt1 = `
1313
-----BEGIN CERTIFICATE-----
1414
MIIDnzCCAoegAwIBAgIUchdtmNBNsdO0rJFBZEr14/5zAe4wDQYJKoZIhvcNAQEL
1515
BQAwXzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
@@ -34,7 +34,7 @@ TOP9quQjYN/Q8Q+sMud9sDFeKA==
3434
-----END CERTIFICATE-----
3535
`
3636

37-
const key = `
37+
const key1 = `
3838
-----BEGIN PRIVATE KEY-----
3939
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDYw2EmScl7ra9R
4040
6Fi7NxEVQLdeHcvi3kfZmoPFaWgHpJSnMiECZe2OYC93BN90Hw17n6lo6OSLX/0d
@@ -65,6 +65,62 @@ s9niPsoEYo3+0dm/OhJymKKD
6565
-----END PRIVATE KEY-----
6666
`
6767

68+
const crt2 = `
69+
-----BEGIN CERTIFICATE-----
70+
MIIDnzCCAoegAwIBAgIUfFQedAHR39RYsu38ubdwgQFVYpEwDQYJKoZIhvcNAQEL
71+
BQAwXzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
72+
GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEYMBYGA1UEAwwPd3d3LmV4YW1wbGUu
73+
Y29tMB4XDTI0MDkyNzA5MDY1MVoXDTI1MDkyNzA5MDY1MVowXzELMAkGA1UEBhMC
74+
QVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdp
75+
dHMgUHR5IEx0ZDEYMBYGA1UEAwwPd3d3LmV4YW1wbGUuY29tMIIBIjANBgkqhkiG
76+
9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwWKsvwGKSMLYBU0MDPN+I7lUcFZowMh7XL2Y
77+
fYKypDt23bzBcBzY0vgJJFYA74WG28Djv2VRTTOpho0eYJ1vt2ap6A3uID8xyQc8
78+
Bocwaaws0b24cn0KShagW71XW2ZXI1gZIwRvaJK18hxqkdS5+Nv/CfE46+wrW9GG
79+
9RAF1E/C3+mJq79hjH0bdHDwic91x/cEw8K+CQlZXbtQyPdl9SV398ccfcQ602iv
80+
VcXIOs5OD0YAXkyoeJKpe182Z6BrsqNJanEa0kMXSgyCcGHIaB5HUpCrRW9v4Xgy
81+
vQwoim1iyOonpqUWFtXKM06OiwypJaj6HJAZTvYvbkO9ibURFQIDAQABo1MwUTAd
82+
BgNVHQ4EFgQUvQQRWOJazR1pWoIQZnPPe7o7d+IwHwYDVR0jBBgwFoAUvQQRWOJa
83+
zR1pWoIQZnPPe7o7d+IwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
84+
AQEAJ9Uf31Ttcfw7GfsZunYRwt3hMROqp5PFJ/RfYfQ4jUfhuvRG/Dl3OUuiDhCc
85+
ny+jtcitJvghNBwtWRZCLIozsjYz/Ve6khgzU/s4OeR0dxtQAOMynxp6j6ENFjmW
86+
35lelGHT70ClCvksRpZsIIaVIxahPi3T8FAUuyOZhfLSzAQXvLXH8xz1KmllzDew
87+
H9lNBcmUPM7NwFCsBbH5JkbghCiD7cWPltMgZG3fCvDjAvhTkbpieeElrUD1t0CZ
88+
vnmJN5F9yb1QPeeOCsRYVffnAvFuh88x9Xbe/h+G8S1KW+AR8PM64U/V7GiXKcsW
89+
jeTEd26AdLKSb9blbQRooXK8+A==
90+
-----END CERTIFICATE-----
91+
`
92+
93+
const key2 = `
94+
-----BEGIN PRIVATE KEY-----
95+
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDBYqy/AYpIwtgF
96+
TQwM834juVRwVmjAyHtcvZh9grKkO3bdvMFwHNjS+AkkVgDvhYbbwOO/ZVFNM6mG
97+
jR5gnW+3ZqnoDe4gPzHJBzwGhzBprCzRvbhyfQpKFqBbvVdbZlcjWBkjBG9okrXy
98+
HGqR1Ln42/8J8Tjr7Ctb0Yb1EAXUT8Lf6Ymrv2GMfRt0cPCJz3XH9wTDwr4JCVld
99+
u1DI92X1JXf3xxx9xDrTaK9Vxcg6zk4PRgBeTKh4kql7XzZnoGuyo0lqcRrSQxdK
100+
DIJwYchoHkdSkKtFb2/heDK9DCiKbWLI6iempRYW1cozTo6LDKklqPockBlO9i9u
101+
Q72JtREVAgMBAAECggEAUaLoLdHmoISwULyPw7/elhIclTfFDO0VNrdK8mEELNR1
102+
f3G5byyeU6ElqtMrnfGOVqJ9AkUxJxgSDpzwH/UWPiP2weFvjuleiPCm5FKZm2J1
103+
oS0n+hzTBSe8Fj497HWtf1wncGLk7Q5SBJz+WAWnZGjqpzXPw7h1LVOsVzOmYlN1
104+
OIYiN9TJx69GjQZ7q8mPhxmbQGznX3yMKHzpeVJrKs6GaOkFJPsJpNXaqnw/ukZB
105+
IOmkX3Lh89RHZtWOl2J2TZO75d5Eo0UptX+xanDSWSiHGFiFltl//EPIF61gaOUb
106+
6zv5MdPLGBz2DEIKPt9DHL+Y6pO42d5yDyZVIaSCmQKBgQDt0tLCzLyPQsj9pnuq
107+
+XRmT5X5uosKZBm9j6JcH6AN/uA0OffbMnkU2mM8W18bboU5N02G3UlIegyciFIu
108+
7Q56CqtizU8WEkbVNMT9x0njE08o6b13VfJpe317kiJkxDpaarDG35rlBLn5NbMX
109+
Lz2+Pvi93Ghq5MlnFBtF6KkuOwKBgQDQKmQEF0LptnTSdj8RsBB8VnI7fFOOS2vA
110+
2G7FQ6YtOB6TKG4+Xr3+Y3mjKnQzhS8MYBjZW30r7c9mGnE6gsu0nxW89ZxcMoFY
111+
/O4t07FrDyk+Mgylxk0o11CsvCgmNSZsGKQLnNFB22JvgXvMCSm14UcoodOE6JSk
112+
P/MEnJI47wKBgQDjms3scsbPEKqM3sUiV0UIGYi+DMK+uhhMa+eF5Rpn6pKmSQgl
113+
twNcarlobUXzWe2UWZIPzT4yZ+Qj9u84S9V8BTQLBdR3mhxCNhOFkTHsaXFsBW83
114+
g4DRZMct+SiDaa0zFUKDwkJahhB6KeNw/9xGc7vY8NTZ4IXD6eFEIauwOwKBgQC7
115+
8Snvz5ioLgV3Zy82JwIbYGkub+d4l3un10DbdWJ5fSuNrXkrcpqTLPjLai8TvPFn
116+
ePO2erWejc0s4D7OlvyYDPGxcwdC7o59646XbYPHpx6TetiUa1+KuiuqaQ7OwDn6
117+
apzhpyn/DbXn+r3sz3ELN2PpuYGhg+OAEAS3ay1RnQKBgGpx5KLTpbbv4OKSStkA
118+
JgoHXUxZ8ZkDKHd/HikI8q5inplE1v6hjxzdbOLfNCZmsmLN3Lr7zY3V2+KrVNJw
119+
W81qUpgbMTA6TozkgsaS6EuXqPG/iaS6iAu3KBqthzDXeTJqH6kkDFuYuzQK6Egg
120+
AvulFF6dizi0pVFg/H84rN2n
121+
-----END PRIVATE KEY-----
122+
`
123+
68124
const testAccCheckOvhIpLoadbalancingSslConfig = `
69125
resource "ovh_iploadbalancing_ssl" "testssl" {
70126
service_name = "%s"
@@ -89,29 +145,42 @@ func TestAccIpLoadbalancingSsl_basic(t *testing.T) {
89145
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
90146
Steps: []resource.TestStep{
91147
{
92-
Config: fmt.Sprintf(testAccCheckOvhIpLoadbalancingSslConfig, iplb, "aaa", certificate, key, certificate),
148+
Config: fmt.Sprintf(testAccCheckOvhIpLoadbalancingSslConfig, iplb, "aaa", crt1, key1, crt1),
93149
Check: resource.ComposeTestCheckFunc(
94150
resource.TestCheckResourceAttr(
95151
"ovh_iploadbalancing_ssl.testssl", "display_name", "aaa"),
96152
resource.TestCheckResourceAttr(
97-
"ovh_iploadbalancing_ssl.testssl", "certificate", fmt.Sprintf("%s\n", certificate)),
153+
"ovh_iploadbalancing_ssl.testssl", "certificate", fmt.Sprintf("%s\n", crt1)),
98154
resource.TestCheckResourceAttr(
99-
"ovh_iploadbalancing_ssl.testssl", "key", fmt.Sprintf("%s\n", key)),
155+
"ovh_iploadbalancing_ssl.testssl", "key", fmt.Sprintf("%s\n", key1)),
100156
resource.TestCheckResourceAttr(
101-
"ovh_iploadbalancing_ssl.testssl", "chain", fmt.Sprintf("%s\n", certificate)),
157+
"ovh_iploadbalancing_ssl.testssl", "chain", fmt.Sprintf("%s\n", crt1)),
102158
),
103159
},
104160
{
105-
Config: fmt.Sprintf(testAccCheckOvhIpLoadbalancingSslConfig, iplb, "bbb", certificate, key, certificate),
161+
Config: fmt.Sprintf(testAccCheckOvhIpLoadbalancingSslConfig, iplb, "bbb", crt1, key1, crt1),
106162
Check: resource.ComposeTestCheckFunc(
107163
resource.TestCheckResourceAttr(
108164
"ovh_iploadbalancing_ssl.testssl", "display_name", "bbb"),
109165
resource.TestCheckResourceAttr(
110-
"ovh_iploadbalancing_ssl.testssl", "certificate", fmt.Sprintf("%s\n", certificate)),
166+
"ovh_iploadbalancing_ssl.testssl", "certificate", fmt.Sprintf("%s\n", crt1)),
167+
resource.TestCheckResourceAttr(
168+
"ovh_iploadbalancing_ssl.testssl", "key", fmt.Sprintf("%s\n", key1)),
169+
resource.TestCheckResourceAttr(
170+
"ovh_iploadbalancing_ssl.testssl", "chain", fmt.Sprintf("%s\n", crt1)),
171+
),
172+
},
173+
{
174+
Config: fmt.Sprintf(testAccCheckOvhIpLoadbalancingSslConfig, iplb, "ccc", crt2, key2, crt2),
175+
Check: resource.ComposeTestCheckFunc(
176+
resource.TestCheckResourceAttr(
177+
"ovh_iploadbalancing_ssl.testssl", "display_name", "ccc"),
178+
resource.TestCheckResourceAttr(
179+
"ovh_iploadbalancing_ssl.testssl", "certificate", fmt.Sprintf("%s\n", crt2)),
111180
resource.TestCheckResourceAttr(
112-
"ovh_iploadbalancing_ssl.testssl", "key", fmt.Sprintf("%s\n", key)),
181+
"ovh_iploadbalancing_ssl.testssl", "key", fmt.Sprintf("%s\n", key2)),
113182
resource.TestCheckResourceAttr(
114-
"ovh_iploadbalancing_ssl.testssl", "chain", fmt.Sprintf("%s\n", certificate)),
183+
"ovh_iploadbalancing_ssl.testssl", "chain", fmt.Sprintf("%s\n", crt2)),
115184
),
116185
},
117186
},
@@ -126,7 +195,7 @@ func TestAccIpLoadbalancingSsl_importBasic(t *testing.T) {
126195
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
127196
Steps: []resource.TestStep{
128197
{
129-
Config: fmt.Sprintf(testAccCheckOvhIpLoadbalancingSslConfig, iplb, "aaa", certificate, key, certificate),
198+
Config: fmt.Sprintf(testAccCheckOvhIpLoadbalancingSslConfig, iplb, "aaa", crt1, key1, crt1),
130199
},
131200
{
132201
ResourceName: "ovh_iploadbalancing_ssl.testssl",

‎website/docs/r/iploadbalancing_ssl.html.markdown

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ resource "ovh_iploadbalancing_ssl" "sslname" {
2020
certificate = "..."
2121
key = "..."
2222
chain = "..."
23+
24+
# use this if ssl is configured as frontend default_ssl
25+
lifecycle {
26+
create_before_destroy = true
27+
}
2328
}
2429
```
2530

0 commit comments

Comments
 (0)
Please sign in to comment.