From 7747c0f31feb1ee8b3d636e86adf19544233f7eb Mon Sep 17 00:00:00 2001
From: Sudarshan Aji <asudarshan@vmware.com>
Date: Wed, 18 Aug 2021 16:24:21 -0700
Subject: [PATCH] Correcting AMI ID being sent from the UI

Signed-off-by: Sudarshan <asudarshan@vmware.com>
---
 pkg/v1/tkg/tkgconfigproviders/aws.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkg/v1/tkg/tkgconfigproviders/aws.go b/pkg/v1/tkg/tkgconfigproviders/aws.go
index 942d65e91aa..dba675eceaf 100644
--- a/pkg/v1/tkg/tkgconfigproviders/aws.go
+++ b/pkg/v1/tkg/tkgconfigproviders/aws.go
@@ -121,8 +121,17 @@ func (c *client) NewAWSConfig(params *models.AWSRegionalClusterParams, encodedCr
 
 	amiID := ""
 
-	if val, ok := bomConfiguration.AMI[params.AwsAccountParams.Region]; ok {
-		amiID = val[0].ID
+	if amis, ok := bomConfiguration.AMI[params.AwsAccountParams.Region]; ok {
+		if params.Os != nil && params.Os.OsInfo != nil {
+			for _, ami := range amis {
+				if ami.OSInfo.Name == params.Os.OsInfo.Name {
+					amiID = ami.ID
+					break
+				}
+			}
+		} else {
+			amiID = amis[0].ID
+		}
 	}
 
 	if amiID == "" {