@@ -2,8 +2,10 @@ package provision
22
33import (
44 "context"
5+ "encoding/base64"
56 "fmt"
6- "github.com/vultr/govultr"
7+ "github.com/vultr/govultr/v2"
8+ "golang.org/x/oauth2"
79 "strconv"
810 "strings"
911)
@@ -16,24 +18,20 @@ type VultrProvisioner struct {
1618}
1719
1820func NewVultrProvisioner (accessKey string ) (* VultrProvisioner , error ) {
21+ config := & oauth2.Config {}
22+ ts := config .TokenSource (context .Background (), & oauth2.Token {AccessToken : accessKey })
23+ vultrClient := govultr .NewClient (oauth2 .NewClient (context .Background (), ts ))
1924 return & VultrProvisioner {
20- client : govultr . NewClient ( nil , accessKey ) ,
25+ client : vultrClient ,
2126 }, nil
2227}
2328
2429func (v * VultrProvisioner ) Provision (host BasicHost ) (* ProvisionedHost , error ) {
25-
26- script , err := v .client .StartupScript .Create (context .Background (), host .Name , host .UserData , "boot" )
27- if err != nil {
28- return nil , err
29- }
30-
31- region , err := v .lookupRegion (host .Region )
32- if err != nil {
33- return nil , err
34- }
35-
36- plan , err := strconv .Atoi (host .Plan )
30+ script , err := v .client .StartupScript .Create (context .Background (), & govultr.StartupScriptReq {
31+ Script : base64 .StdEncoding .EncodeToString ([]byte (host .UserData )),
32+ Name : host .Name ,
33+ Type : "boot" ,
34+ })
3735 if err != nil {
3836 return nil , err
3937 }
@@ -43,39 +41,42 @@ func (v *VultrProvisioner) Provision(host BasicHost) (*ProvisionedHost, error) {
4341 return nil , err
4442 }
4543
46- opts := & govultr.ServerOptions {
47- ScriptID : script .ScriptID ,
44+ opts := & govultr.InstanceCreateReq {
45+ ScriptID : script .ID ,
46+ Region : host .Region ,
47+ Plan : host .Plan ,
48+ OsID : os ,
4849 Hostname : host .Name ,
4950 Label : host .Name ,
5051 Tag : exiteNodeTag ,
5152 }
5253
53- result , err := v .client .Server .Create (context .Background (), * region , plan , os , opts )
54+ result , err := v .client .Instance .Create (context .Background (), opts )
5455 if err != nil {
5556 return nil , err
5657 }
5758
5859 return & ProvisionedHost {
5960 IP : result .MainIP ,
60- ID : result .InstanceID ,
61- Status : result .ServerState ,
61+ ID : result .ID ,
62+ Status : result .ServerStatus ,
6263 }, nil
6364}
6465
6566func (v * VultrProvisioner ) Status (id string ) (* ProvisionedHost , error ) {
66- server , err := v .client .Server . GetServer (context .Background (), id )
67+ server , err := v .client .Instance . Get (context .Background (), id )
6768 if err != nil {
6869 return nil , err
6970 }
7071
71- status := server .ServerState
72- if status == "ok" {
72+ status := server .ServerStatus
73+ if status == vultrHostRunning {
7374 status = ActiveStatus
7475 }
7576
7677 return & ProvisionedHost {
7778 IP : server .MainIP ,
78- ID : server .InstanceID ,
79+ ID : server .ID ,
7980 Status : status ,
8081 }, nil
8182}
@@ -92,20 +93,20 @@ func (v *VultrProvisioner) Delete(request HostDeleteRequest) error {
9293 }
9394 }
9495
95- server , err := v .client .Server . GetServer (context .Background (), id )
96+ server , err := v .client .Instance . Get (context .Background (), id )
9697 if err != nil {
9798 return err
9899 }
99100
100- err = v .client .Server .Delete (context .Background (), id )
101+ err = v .client .Instance .Delete (context .Background (), id )
101102 if err != nil {
102103 return err
103104 }
104105
105- scripts , err := v .client .StartupScript .List (context .Background ())
106+ scripts , _ , err := v .client .StartupScript .List (context .Background (), nil )
106107 for _ , s := range scripts {
107108 if s .Name == server .Label {
108- _ = v .client .StartupScript .Delete (context .Background (), s .ScriptID )
109+ _ = v .client .StartupScript .Delete (context .Background (), s .ID )
109110 break
110111 }
111112 }
@@ -115,27 +116,30 @@ func (v *VultrProvisioner) Delete(request HostDeleteRequest) error {
115116
116117// List returns a list of exit nodes
117118func (v * VultrProvisioner ) List (filter ListFilter ) ([]* ProvisionedHost , error ) {
118- servers , err := v .client .Server . ListByTag (context .Background (), filter . Filter )
119+ servers , _ , err := v .client .Instance . List (context .Background (), nil )
119120 if err != nil {
120121 return nil , err
121122 }
122123
123124 var inlets []* ProvisionedHost
124125 for _ , server := range servers {
125- host := & ProvisionedHost {
126- IP : server .MainIP ,
127- ID : server .InstanceID ,
128- Status : vultrToInletsStatus (server .Status ),
126+ if server .Tag == filter .Filter {
127+ host := & ProvisionedHost {
128+ IP : server .MainIP ,
129+ ID : server .ID ,
130+ Status : vultrToInletsStatus (server .Status ),
131+ }
132+ inlets = append (inlets , host )
129133 }
130- inlets = append ( inlets , host )
134+
131135 }
132136
133137 return inlets , nil
134138}
135139
136140func (v * VultrProvisioner ) lookupID (request HostDeleteRequest ) (string , error ) {
137141
138- inlets , err := v .List (ListFilter {Filter : exiteNodeTag , ProjectID : request . ProjectID })
142+ inlets , err := v .List (ListFilter {Filter : exiteNodeTag })
139143 if err != nil {
140144 return "" , err
141145 }
@@ -153,14 +157,14 @@ func (v *VultrProvisioner) lookupRegion(id string) (*int, error) {
153157 return & result , nil
154158 }
155159
156- regions , err := v .client .Region .List (context .Background ())
160+ regions , _ , err := v .client .Region .List (context .Background (), nil )
157161 if err != nil {
158162 return nil , err
159163 }
160164
161165 for _ , region := range regions {
162- if strings .EqualFold (id , region .RegionCode ) || strings . EqualFold ( id , region . Name ) {
163- regionId , _ := strconv .Atoi (region .RegionID )
166+ if strings .EqualFold (id , region .ID ) {
167+ regionId , _ := strconv .Atoi (region .ID )
164168 return & regionId , nil
165169 }
166170 }
0 commit comments