diff --git a/cmd/osbuild-service-maintenance/aws.go b/cmd/osbuild-service-maintenance/aws.go index 832b45631..d93ee7054 100644 --- a/cmd/osbuild-service-maintenance/aws.go +++ b/cmd/osbuild-service-maintenance/aws.go @@ -154,7 +154,7 @@ func terminateOrphanedSecureInstances(a *awscloud.AWS, dryRun bool) error { log.Printf("Cleaning up executor instances: %v", instanceIDs) if !dryRun { if len(instanceIDs) > 0 { - err = a.TerminateInstances(instanceIDs) + _, err = a.TerminateInstancesEC2(instanceIDs, 0) if err != nil { return fmt.Errorf("Unable to terminate secure instances: %w", err) } diff --git a/internal/cloud/awscloud/client-interfaces.go b/internal/cloud/awscloud/client-interfaces.go index 917eef90c..d1b5d6dcb 100644 --- a/internal/cloud/awscloud/client-interfaces.go +++ b/internal/cloud/awscloud/client-interfaces.go @@ -28,7 +28,6 @@ type EC2 interface { // Instances DescribeInstances(context.Context, *ec2.DescribeInstancesInput, ...func(*ec2.Options)) (*ec2.DescribeInstancesOutput, error) DescribeInstanceStatus(context.Context, *ec2.DescribeInstanceStatusInput, ...func(*ec2.Options)) (*ec2.DescribeInstanceStatusOutput, error) - TerminateInstances(context.Context, *ec2.TerminateInstancesInput, ...func(*ec2.Options)) (*ec2.TerminateInstancesOutput, error) // Fleets CreateFleet(context.Context, *ec2.CreateFleetInput, ...func(*ec2.Options)) (*ec2.CreateFleetOutput, error) diff --git a/internal/cloud/awscloud/maintenance.go b/internal/cloud/awscloud/maintenance.go index 885d5d77b..e40ee7d15 100644 --- a/internal/cloud/awscloud/maintenance.go +++ b/internal/cloud/awscloud/maintenance.go @@ -110,16 +110,6 @@ func (a *AWS) DescribeInstancesByInstanceID(instanceID string) ([]ec2types.Reser return res.Reservations, nil } -func (a *AWS) TerminateInstances(instanceIDs []string) error { - _, err := a.ec2.TerminateInstances( - context.Background(), - &ec2.TerminateInstancesInput{ - InstanceIds: instanceIDs, - }, - ) - return err -} - func (a *AWS) DescribeSecurityGroupsByPrefix(ctx context.Context, prefix string) ([]ec2types.SecurityGroup, error) { var securityGroups []ec2types.SecurityGroup diff --git a/internal/cloud/awscloud/secure-instance.go b/internal/cloud/awscloud/secure-instance.go index d24d4aeff..19017b3f9 100644 --- a/internal/cloud/awscloud/secure-instance.go +++ b/internal/cloud/awscloud/secure-instance.go @@ -271,12 +271,7 @@ func (a *AWS) terminatePreviousSI(hostInstanceID string) (string, error) { } instanceID := *descrInstancesOutput.Reservations[0].Instances[0].InstanceId - _, err = a.ec2.TerminateInstances( - context.Background(), - &ec2.TerminateInstancesInput{ - InstanceIds: []string{instanceID}, - }, - ) + _, err = a.TerminateInstancesEC2([]string{instanceID}, 0) if err != nil { return instanceID, err }