Merge pull request #5703 from AndiDog/log-ami-arch

k8s-ci-robot · web-flow · commit cc18666c494d · 2025-10-14T06:03:41.000-07:00
🌱 Log desired AMI architecture and owner ID on errors
diff --git a/pkg/cloud/services/ec2/ami.go b/pkg/cloud/services/ec2/ami.go
@@ -213,10 +213,10 @@ func DefaultAMILookup(ec2Client common.EC2API, ownerID, baseOS, kubernetesVersio
 
 	out, err := ec2Client.DescribeImages(context.TODO(), describeImageInput)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to find ami: %q", amiName)
+		return nil, errors.Wrapf(err, "failed to find AMI with name %q, architecture %q, ownerID %q", amiName, architecture, ownerID)
 	}
 	if out == nil || len(out.Images) == 0 {
-		return nil, errors.Errorf("found no AMIs with the name: %q", amiName)
+		return nil, errors.Errorf("found no AMIs with name %q, architecture %q, ownerID %q", amiName, architecture, ownerID)
 	}
 	latestImage, err := GetLatestImage(out.Images)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -213,10 +213,10 @@ func DefaultAMILookup(ec2Client common.EC2API, ownerID, baseOS, kubernetesVersio`
`213`	`213`
`214`	`214`	`out, err := ec2Client.DescribeImages(context.TODO(), describeImageInput)`
`215`	`215`	`if err != nil {`
`216`		`- return nil, errors.Wrapf(err, "failed to find ami: %q", amiName)`
	`216`	`+ return nil, errors.Wrapf(err, "failed to find AMI with name %q, architecture %q, ownerID %q", amiName, architecture, ownerID)`
`217`	`217`	`}`
`218`	`218`	`if out == nil \|\| len(out.Images) == 0 {`
`219`		`- return nil, errors.Errorf("found no AMIs with the name: %q", amiName)`
	`219`	`+ return nil, errors.Errorf("found no AMIs with name %q, architecture %q, ownerID %q", amiName, architecture, ownerID)`
`220`	`220`	`}`
`221`	`221`	`latestImage, err := GetLatestImage(out.Images)`
`222`	`222`	`if err != nil {`