REVErT

Author: adrianriobo

pkg/provider/aws/modules/ec2/compute/dedicated-host/dedicated-host.go

@@ -12,6 +12,7 @@ import (
 	"github.com/redhat-developer/mapt/pkg/provider/aws"
 	awsConstants "github.com/redhat-developer/mapt/pkg/provider/aws/constants"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/data"
+	"github.com/redhat-developer/mapt/pkg/provider/aws/services/ec2/compute"
 	"github.com/redhat-developer/mapt/pkg/provider/util/output"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 	resourcesUtil "github.com/redhat-developer/mapt/pkg/util/resources"
@@ -72,13 +73,50 @@ func Destroy(prefix *string) (err error) {
 	if prefix == nil {
 		prefix = &defaultPrefix
 	}
-	return aws.DestroyStack(
+	// Get stack first and export host-id and region
+	regionId, dhId, err := getDedicatedHostData(prefix)
+	if err != nil {
+		return err
+	}
+	err = aws.DestroyStack(
 		aws.DestroyStackRequest{
 			ProjectName: fmt.Sprintf("%s-%s",
 				*prefix,
 				maptContext.ProjectName()),
 			Stackname: maptContext.StackNameByProject(maptDHDefaultPrefix),
 		})
+	if err != nil {
+		return err
+	}
+	return compute.DedicatedHostRelease(regionId, dhId)
+}
+
+func getDedicatedHostData(prefix *string) (region *string, hostId *string, err error) {
+	s, err := manager.CheckStack(
+		manager.Stack{
+			ProjectName: fmt.Sprintf("%s-%s",
+				*prefix,
+				maptContext.ProjectName()),
+			StackName:           maptContext.StackNameByProject(maptDHDefaultPrefix),
+			BackedURL:           maptContext.BackedURL(),
+			ProviderCredentials: aws.DefaultCredentials,
+		})
+	if err != nil {
+		return nil, nil, err
+	}
+	outputs, err := manager.GetOutputs(s)
+	if err != nil {
+		return nil, nil, err
+	}
+	if value, exists := outputs[fmt.Sprintf("%s-%s", *prefix, outputRegion)]; exists {
+		regionV := value.Value.(string)
+		region = &regionV
+	}
+	if value, exists := outputs[fmt.Sprintf("%s-%s", *prefix, outputDedicatedHostID)]; exists {
+		dhIdV := value.Value.(string)
+		hostId = &dhIdV
+	}
+	return
 }
 
 // this function will create the dedicated host resource

pkg/provider/aws/services/ec2/compute/compute.go

@@ -105,3 +105,27 @@ func DedicatedHost(region, azId, instanceType *string, tags map[string]string) (
 	}
 	return &hostID, err
 }
+
+func DedicatedHostRelease(region, hostId *string) error {
+	ctx := context.Background()
+	cfg, err := config.LoadDefaultConfig(
+		ctx,
+		config.WithRegion(*region))
+	if err != nil {
+		return err
+	}
+	client := ec2.NewFromConfig(cfg)
+	logging.Debugf("destroying dedicated host: %s", *hostId)
+	output, err := client.ReleaseHosts(ctx,
+		&ec2.ReleaseHostsInput{
+			HostIds: []string{*hostId},
+		})
+	if err != nil {
+		return err
+	}
+	if len(output.Unsuccessful) == 1 {
+		return fmt.Errorf("unsuccessful releases: %v", output.Unsuccessful)
+	}
+	logging.Debugf("dedicated host: %s has been destroyed successfully", *hostId)
+	return nil
+}