@@ -3,20 +3,14 @@ package ovh
3
3
import (
4
4
"fmt"
5
5
"log"
6
- "regexp"
7
- "strconv"
8
- "time"
9
6
10
- "github.com/hashicorp/terraform/helper/resource"
11
7
"github.com/hashicorp/terraform/helper/schema"
12
-
13
- "github.com/ovh/go-ovh/ovh"
14
8
)
15
9
16
10
func resourceMeSshKey () * schema.Resource {
17
11
return & schema.Resource {
18
12
Create : resourceMeSshKeyCreate ,
19
- Read : readeMeSshKey ,
13
+ Read : readMeSshKey ,
20
14
Update : resourceMeSshKeyUpdate ,
21
15
Delete : resourceMeSshKeyDelete ,
22
16
@@ -59,12 +53,12 @@ func readMeSshKey(d *schema.ResourceData, meta interface{}) error {
59
53
sshKey ,
60
54
)
61
55
if err != nil {
62
- return nil , fmt .Errorf ("Unable to find SSH key named %s:\n \t %q" , keyName , err )
56
+ return fmt .Errorf ("Unable to find SSH key named %s:\n \t %q" , keyName , err )
63
57
}
64
58
65
- d .Set ("key_name" , s .KeyName )
66
- d .Set ("key" , s .Key )
67
- d .Set ("default" , s .Default )
59
+ d .Set ("key_name" , sshKey .KeyName )
60
+ d .Set ("key" , sshKey .Key )
61
+ d .Set ("default" , sshKey .Default )
68
62
69
63
return nil
70
64
}
@@ -86,26 +80,27 @@ func resourceMeSshKeyCreate(d *schema.ResourceData, meta interface{}) error {
86
80
return fmt .Errorf ("Error creating SSH Key with params %s:\n \t %q" , params , err )
87
81
}
88
82
89
- return resourceMeSshKeyRead (d , meta )
83
+ return readMeSshKey (d , meta )
90
84
}
91
85
92
86
func resourceMeSshKeyUpdate (d * schema.ResourceData , meta interface {}) error {
93
87
config := meta .(* Config )
94
88
95
89
keyName := d .Get ("key_name" ).(string )
96
90
params := & MeSshKeyUpdateOpts {
97
- Default : d .Get ("default" ).(string ),
91
+ Default : d .Get ("default" ).(bool ),
98
92
}
99
93
err := config .OVHClient .Put (
100
94
fmt .Sprintf ("/me/sshKey/%s" , keyName ),
101
95
nil ,
96
+ params ,
102
97
)
103
98
if err != nil {
104
- return nil , fmt .Errorf ("Unable to update SSH key named %s:\n \t %q" , keyName , err )
99
+ return fmt .Errorf ("Unable to update SSH key named %s:\n \t %q" , keyName , err )
105
100
}
106
101
107
102
log .Printf ("[DEBUG] Updated SSH Key %s" , keyName )
108
- return resourceMeSshKeyRead (d , meta )
103
+ return readMeSshKey (d , meta )
109
104
}
110
105
111
106
func resourceMeSshKeyDelete (d * schema.ResourceData , meta interface {}) error {
@@ -117,7 +112,7 @@ func resourceMeSshKeyDelete(d *schema.ResourceData, meta interface{}) error {
117
112
nil ,
118
113
)
119
114
if err != nil {
120
- return nil , fmt .Errorf ("Unable to delete SSH key named %s:\n \t %q" , keyName , err )
115
+ return fmt .Errorf ("Unable to delete SSH key named %s:\n \t %q" , keyName , err )
121
116
}
122
117
123
118
log .Printf ("[DEBUG] Deleted SSH Key %s" , keyName )
0 commit comments