@@ -14,7 +14,7 @@ import (
1414)
1515
1616// returns only instance IDs of unprotected ec2 instances
17- func getInstanceDetails (svc * ec2.Client , output * ec2.DescribeInstancesResponse , region string , logger * log.Entry ) ([]* types.Resource , error ) {
17+ func getInstanceDetails (svc * ec2.Client , output * ec2.DescribeInstancesOutput , region string , logger * log.Entry ) ([]* types.Resource , error ) {
1818 var ec2Instances []* types.Resource
1919 logger .Debug ("Fetching EC2 Details" )
2020 for _ , reservation := range output .Reservations {
@@ -42,14 +42,12 @@ func getInstanceDetails(svc *ec2.Client, output *ec2.DescribeInstancesResponse,
4242// GetAllEC2Instances Get all instances
4343func GetAllEC2Instances (cfg aws.Config , region string , logger * log.Entry ) ([]* types.Resource , error ) {
4444 logger .Debug ("Fetching EC2 Instances" )
45- svc := ec2 .New (cfg )
45+ svc := ec2 .NewFromConfig (cfg )
4646 params := & ec2.DescribeInstancesInput {}
4747
4848 // Build the request with its input parameters
49- req := svc .DescribeInstancesRequest ( params )
49+ resp , err := svc .DescribeInstances ( context . Background (), params )
5050
51- // Send the request, and get the response or error back
52- resp , err := req .Send (context .Background ())
5351 if err != nil {
5452 return nil , err
5553 }
@@ -63,12 +61,12 @@ func GetAllEC2Instances(cfg aws.Config, region string, logger *log.Entry) ([]*ty
6361
6462// StopEC2Instances Stop Running Instances
6563func StopEC2Instances (cfg aws.Config , instances []* types.Resource , logger * log.Entry ) error {
66- svc := ec2 .New (cfg )
67- var instanceIds []string
64+ svc := ec2 .NewFromConfig (cfg )
65+ var instanceIds []* string
6866
6967 for _ , instance := range instances {
7068 if instance .IsActive () {
71- instanceIds = append (instanceIds , instance .UUID )
69+ instanceIds = append (instanceIds , & instance .UUID )
7270 }
7371 }
7472
@@ -82,8 +80,7 @@ func StopEC2Instances(cfg aws.Config, instances []*types.Resource, logger *log.E
8280 InstanceIds : instanceIds ,
8381 }
8482
85- req := svc .StopInstancesRequest (params )
86- resp , err := req .Send (context .Background ())
83+ resp , err := svc .StopInstances (context .Background (), params )
8784 // TODO Attach error to specific instance where the error occurred if possible
8885 if err != nil {
8986 fmt .Println (resp , err )
@@ -93,12 +90,12 @@ func StopEC2Instances(cfg aws.Config, instances []*types.Resource, logger *log.E
9390
9491// ResumeEC2Instances Resume Stopped instances
9592func ResumeEC2Instances (cfg aws.Config , instances []* types.Resource , logger * log.Entry ) error {
96- svc := ec2 .New (cfg )
97- var instanceIds []string
93+ svc := ec2 .NewFromConfig (cfg )
94+ var instanceIds []* string
9895
9996 for _ , instance := range instances {
10097 if instance .IsStopped () {
101- instanceIds = append (instanceIds , instance .UUID )
98+ instanceIds = append (instanceIds , & instance .UUID )
10299 }
103100 }
104101
@@ -111,23 +108,22 @@ func ResumeEC2Instances(cfg aws.Config, instances []*types.Resource, logger *log
111108 }
112109 logger .Debug ("Starting EC2 Instances " , instanceIds , " ..." )
113110
114- req := svc .StartInstancesRequest (params )
115- resp , err := req .Send (context .Background ())
111+ resp , err := svc .StartInstances (context .Background (), params )
116112 // TODO Attach error to specific instance where the error occurred if possible
117113 if err != nil {
118114 fmt .Println (resp , err )
119115 }
120116 return err
121117}
122118
123- // StartEC2Instances Start Stopped instances
119+ // TerminateEC2Instances Shutdown instances
124120func TerminateEC2Instances (cfg aws.Config , instances []* types.Resource , logger * log.Entry ) error {
125- svc := ec2 .New (cfg )
126- var instanceIds []string
121+ svc := ec2 .NewFromConfig (cfg )
122+ var instanceIds []* string
127123
128124 for _ , instance := range instances {
129125 if instance .IsStopped () || instance .IsActive () {
130- instanceIds = append (instanceIds , instance .UUID )
126+ instanceIds = append (instanceIds , & instance .UUID )
131127 }
132128 }
133129
@@ -141,8 +137,7 @@ func TerminateEC2Instances(cfg aws.Config, instances []*types.Resource, logger *
141137 InstanceIds : instanceIds ,
142138 }
143139
144- req := svc .TerminateInstancesRequest (params )
145- resp , err := req .Send (context .Background ())
140+ resp , err := svc .TerminateInstances (context .Background (), params )
146141 // TODO Attach error to specific instance where the error occurred if possible
147142 if err != nil {
148143 fmt .Println (resp , err )
0 commit comments