From c72d2272f7d3198372aaa3fa7841add2cf385075 Mon Sep 17 00:00:00 2001 From: Vinayak Gaikwad Date: Sat, 31 May 2025 10:17:41 +0530 Subject: [PATCH] Fix failing tests for aws views - tests were not updated with the new number of key bindings - one field is missing for ec2 test - fmt.ErrorF in gcp helper had argument but no formatting directive --- internal/gcp/helper.go | 4 ++-- internal/render/ec2_test.go | 17 +++++++++-------- internal/view/ec2_test.go | 2 +- internal/view/ecs_clusters_test.go | 2 +- internal/view/vm_image_test.go | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/internal/gcp/helper.go b/internal/gcp/helper.go index 7209657..0134976 100644 --- a/internal/gcp/helper.go +++ b/internal/gcp/helper.go @@ -12,11 +12,11 @@ func GetLocalTime(timestamp string) (string, error) { launchTime, err := time.Parse("2006-01-02T15:04:05.999-07:00", timestamp) if err != nil { - return "", fmt.Errorf("Error parsing timestamp : ", err) + return "", fmt.Errorf("Error parsing timestamp: %v", err) } localZone, err := config.GetLocalTimeZone() if err != nil { - return "", fmt.Errorf("Error loading local timezone: ", err) + return "", fmt.Errorf("Error loading local timezone: %v", err) } loc, _ := time.LoadLocation(localZone) IST := launchTime.In(loc) diff --git a/internal/render/ec2_test.go b/internal/render/ec2_test.go index 373acd1..0de2d98 100644 --- a/internal/render/ec2_test.go +++ b/internal/render/ec2_test.go @@ -8,7 +8,7 @@ import ( ) func TestEc2Render(t *testing.T) { - resp := aws.EC2Resp{InstanceId: "ec2-instance-1", InstanceState: "running", InstanceType: "t2.micro", MonitoringState: "disabled", PublicDNS: "public-dns", LaunchTime: "9:00:00", AvailabilityZone: "us-east-1e"} + resp := aws.EC2Resp{Name: "server", InstanceId: "ec2-instance-1", InstanceState: "running", InstanceType: "t2.micro", MonitoringState: "disabled", PublicDNS: "public-dns", LaunchTime: "9:00:00", AvailabilityZone: "us-east-1e"} var ec2 EC2 r := NewRow(7) @@ -17,15 +17,16 @@ func TestEc2Render(t *testing.T) { assert.Nil(t, err) assert.Equal(t, "ec2", r.ID) - e := Fields{"ec2-instance-1", "running", "t2.micro", "disabled", "9:00:00", "public-dns", "us-east-1e"} + e := Fields{"ec2-instance-1", "server", "running", "t2.micro", "disabled", "9:00:00", "public-dns", "us-east-1e"} assert.Equal(t, e, r.Fields[0:]) headers := ec2.Header() assert.Equal(t, 0, headers.IndexOf("Instance-Id", false)) - assert.Equal(t, 1, headers.IndexOf("Instance-State", false)) - assert.Equal(t, 2, headers.IndexOf("Instance-Type", false)) - assert.Equal(t, 3, headers.IndexOf("Monitoring-State", false)) - assert.Equal(t, 4, headers.IndexOf("Launch-Time", false)) - assert.Equal(t, 5, headers.IndexOf("Public-DNS", true)) - assert.Equal(t, 6, headers.IndexOf("Availability-Zone", false)) + assert.Equal(t, 1, headers.IndexOf("Name", false)) + assert.Equal(t, 2, headers.IndexOf("Instance-State", false)) + assert.Equal(t, 3, headers.IndexOf("Instance-Type", false)) + assert.Equal(t, 4, headers.IndexOf("Monitoring-State", false)) + assert.Equal(t, 5, headers.IndexOf("Launch-Time", false)) + assert.Equal(t, 6, headers.IndexOf("Public-DNS", true)) + assert.Equal(t, 7, headers.IndexOf("Availability-Zone", false)) } diff --git a/internal/view/ec2_test.go b/internal/view/ec2_test.go index f41d2cf..7b0bee0 100644 --- a/internal/view/ec2_test.go +++ b/internal/view/ec2_test.go @@ -10,5 +10,5 @@ func TestNewEc2(t *testing.T) { ec2 := NewEC2("ec2") assert.Nil(t, ec2.Init(makeCtx())) assert.Equal(t, "ec2", ec2.Name()) - assert.Equal(t, 11, len(ec2.Hints())) + assert.Equal(t, 12, len(ec2.Hints())) } diff --git a/internal/view/ecs_clusters_test.go b/internal/view/ecs_clusters_test.go index 76bf30d..b812b0a 100644 --- a/internal/view/ecs_clusters_test.go +++ b/internal/view/ecs_clusters_test.go @@ -10,5 +10,5 @@ func TestNewEcsCluster(t *testing.T) { ecs := NewEcs("ecs:c") assert.Nil(t, ecs.Init(makeCtx())) assert.Equal(t, "ecs:c", ecs.Name()) - assert.Equal(t, 5, len(ecs.Hints())) + assert.Equal(t, 7, len(ecs.Hints())) } diff --git a/internal/view/vm_image_test.go b/internal/view/vm_image_test.go index b936d76..b464f4b 100644 --- a/internal/view/vm_image_test.go +++ b/internal/view/vm_image_test.go @@ -10,5 +10,5 @@ func TestNewVMI(t *testing.T) { vmi := NewVMI("vmi") assert.Nil(t, vmi.Init(makeCtx())) assert.Equal(t, "vmi", vmi.Name()) - assert.Equal(t, 6, len(vmi.Hints())) + assert.Equal(t, 7, len(vmi.Hints())) }