Skip to content

Commit b15a73b

Browse files
pgaxattepgaxatte
committed
Fix according to review
1 parent 3220d7b commit b15a73b

5 files changed

+50
-29
lines changed

‎go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/terraform-providers/terraform-provider-ovh
33
require (
44
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
55
github.com/hashicorp/go-cleanhttp v0.5.1
6-
github.com/hashicorp/terraform v0.12.15
76
github.com/hashicorp/terraform-plugin-sdk v1.0.0
87
github.com/jtolds/gls v4.20.0+incompatible // indirect
98
github.com/mitchellh/go-homedir v1.1.0

‎go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@ github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI
183183
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
184184
github.com/hashicorp/memberlist v0.1.0/go.mod h1:ncdBp14cuox2iFOq3kDiquKU6fqsTBc3W6JvZwjxxsE=
185185
github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod h1:h/Ru6tmZazX7WO/GDmwdpS975F019L4t5ng5IgwbNrE=
186-
github.com/hashicorp/terraform v0.12.15 h1:6Ern5P4SC8TmstNMli42n+INODMTCa7/32If/pFezCM=
187-
github.com/hashicorp/terraform v0.12.15/go.mod h1:ioIvh3rGe99SnOVOvvyJ0lTMS1MiFbnMK7WjVCJZhqI=
188186
github.com/hashicorp/terraform-config-inspect v0.0.0-20190821133035-82a99dc22ef4 h1:fTkL0YwjohGyN7AqsDhz6bwcGBpT+xBqi3Qhpw58Juw=
189187
github.com/hashicorp/terraform-config-inspect v0.0.0-20190821133035-82a99dc22ef4/go.mod h1:JDmizlhaP5P0rYTTZB0reDMefAiJyfWPEtugV4in1oI=
190188
github.com/hashicorp/terraform-plugin-sdk v1.0.0 h1:3AjuuV1LJKs1NlG+heUgqWN6/QCSx2kDhyS6K7F0fTw=

‎ovh/data_source_ovh_me_ssh_key_test.go

+9-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,21 @@ import (
99
)
1010

1111
func TestAccMeSshKeyDataSource_basic(t *testing.T) {
12-
sshKey := acctest.RandomWithPrefix(test_prefix)
12+
sshKeyName := acctest.RandomWithPrefix(test_prefix)
13+
sshKey := "ssh-ed25519 AAAAC3NzaC1yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
14+
config := fmt.Sprintf(testAccMeSshKeyDatasourceConfig, sshKeyName, sshKey)
15+
1316
resource.Test(t, resource.TestCase{
1417
PreCheck: func() { testAccPreCheckCredentials(t) },
1518
Providers: testAccProviders,
1619
Steps: []resource.TestStep{
1720
{
18-
Config: fmt.Sprintf(testAccMeSshKeyDatasourceConfig, sshKey),
21+
Config: config,
1922
Check: resource.ComposeTestCheckFunc(
2023
resource.TestCheckResourceAttr(
21-
"data.ovh_me_ssh_key.key_1", "key_name", sshKey),
24+
"data.ovh_me_ssh_key.key_1", "key_name", sshKeyName),
25+
resource.TestCheckResourceAttr(
26+
"data.ovh_me_ssh_key.key_1", "key", sshKey),
2227
),
2328
},
2429
},
@@ -28,7 +33,7 @@ func TestAccMeSshKeyDataSource_basic(t *testing.T) {
2833
const testAccMeSshKeyDatasourceConfig = `
2934
resource "ovh_me_ssh_key" "key_1" {
3035
key_name = "%s"
31-
key = "ssh-ed25519 AAAAC3NzaC1yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
36+
key = "%s"
3237
}
3338
3439
data "ovh_me_ssh_key" "key_1" {

‎ovh/data_source_ovh_me_ssh_keys_test.go

+32-18
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,44 @@ import (
99
)
1010

1111
func TestAccMeSshKeysDataSource_basic(t *testing.T) {
12-
sshKey1 := acctest.RandomWithPrefix(test_prefix)
13-
sshKey2 := acctest.RandomWithPrefix(test_prefix)
12+
sshKey1Name := acctest.RandomWithPrefix(test_prefix)
13+
sshKey1 := "ssh-ed25519 AAAAC3NzaC1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
14+
sshKey2Name := acctest.RandomWithPrefix(test_prefix)
15+
sshKey2 := "ssh-ed25519 AAAAC3NzaC1yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
16+
17+
preSetup := fmt.Sprintf(
18+
testAccMeSshKeysDatasourceConfig_preSetup,
19+
sshKey1Name,
20+
sshKey1,
21+
sshKey2Name,
22+
sshKey2,
23+
)
24+
config := fmt.Sprintf(
25+
testAccMeSshKeysDatasourceConfig_keys,
26+
sshKey1Name,
27+
sshKey1,
28+
sshKey2Name,
29+
sshKey2,
30+
)
31+
1432
resource.Test(t, resource.TestCase{
1533
PreCheck: func() { testAccPreCheckCredentials(t) },
1634
Providers: testAccProviders,
1735
Steps: []resource.TestStep{
1836
{
19-
Config: fmt.Sprintf(
20-
testAccMeSshKeysDatasourceConfig_preSetup,
21-
sshKey1,
22-
sshKey2,
23-
),
37+
Config: preSetup,
2438
Check: resource.ComposeTestCheckFunc(
2539
resource.TestCheckResourceAttr(
26-
"ovh_me_ssh_key.key_1", "key_name", sshKey1),
40+
"ovh_me_ssh_key.key_1", "key_name", sshKey1Name),
2741
resource.TestCheckResourceAttr(
28-
"ovh_me_ssh_key.key_2", "key_name", sshKey2),
42+
"ovh_me_ssh_key.key_1", "key", sshKey1),
43+
resource.TestCheckResourceAttr(
44+
"ovh_me_ssh_key.key_2", "key_name", sshKey2Name),
45+
resource.TestCheckResourceAttr(
46+
"ovh_me_ssh_key.key_2", "key", sshKey2),
2947
),
3048
}, {
31-
Config: fmt.Sprintf(
32-
testAccMeSshKeysDatasourceConfig_keys,
33-
sshKey1,
34-
sshKey2,
35-
),
49+
Config: config,
3650
Check: resource.ComposeTestCheckFunc(
3751
resource.TestCheckOutput(
3852
"keys_present", "true"),
@@ -45,24 +59,24 @@ func TestAccMeSshKeysDataSource_basic(t *testing.T) {
4559
const testAccMeSshKeysDatasourceConfig_preSetup = `
4660
resource "ovh_me_ssh_key" "key_1" {
4761
key_name = "%s"
48-
key = "ssh-ed25519 AAAAC3NzaC1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
62+
key = "%s"
4963
}
5064
5165
resource "ovh_me_ssh_key" "key_2" {
5266
key_name = "%s"
53-
key = "ssh-ed25519 AAAAC3NzaC1yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
67+
key = "%s"
5468
}
5569
`
5670

5771
const testAccMeSshKeysDatasourceConfig_keys = `
5872
resource "ovh_me_ssh_key" "key_1" {
5973
key_name = "%s"
60-
key = "ssh-ed25519 AAAAC3NzaC1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
74+
key = "%s"
6175
}
6276
6377
resource "ovh_me_ssh_key" "key_2" {
6478
key_name = "%s"
65-
key = "ssh-ed25519 AAAAC3NzaC1yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
79+
key = "%s"
6680
}
6781
6882
data "ovh_me_ssh_keys" "keys" {}

‎ovh/resource_ovh_me_ssh_key_test.go

+9-4
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,21 @@ func testSweepMeSshKey(region string) error {
5858
}
5959

6060
func TestAccMeSshKey_basic(t *testing.T) {
61-
sshKey := acctest.RandomWithPrefix(test_prefix)
61+
sshKeyName := acctest.RandomWithPrefix(test_prefix)
62+
sshKey := "ssh-ed25519 AAAAC3NzaC1yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
63+
config := fmt.Sprintf(testAccMeSshKeyConfig, sshKeyName, sshKey)
64+
6265
resource.Test(t, resource.TestCase{
6366
PreCheck: func() { testAccPreCheckCredentials(t) },
6467
Providers: testAccProviders,
6568
Steps: []resource.TestStep{
6669
{
67-
Config: fmt.Sprintf(testAccMeSshKeyConfig, sshKey),
70+
Config: config,
6871
Check: resource.ComposeTestCheckFunc(
6972
resource.TestCheckResourceAttr(
70-
"ovh_me_ssh_key.key_1", "key_name", sshKey),
73+
"ovh_me_ssh_key.key_1", "key_name", sshKeyName),
74+
resource.TestCheckResourceAttr(
75+
"ovh_me_ssh_key.key_1", "key", sshKey),
7176
),
7277
},
7378
},
@@ -77,6 +82,6 @@ func TestAccMeSshKey_basic(t *testing.T) {
7782
const testAccMeSshKeyConfig = `
7883
resource "ovh_me_ssh_key" "key_1" {
7984
key_name = "%s"
80-
key = "ssh-ed25519 AAAAC3NzaC1yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
85+
key = "%s"
8186
}
8287
`

0 commit comments

Comments
 (0)