From e6101621fcfefc00ad84af55742c9a5e95bcde40 Mon Sep 17 00:00:00 2001 From: Evstigneev Denis Date: Mon, 9 Dec 2024 13:22:28 +0300 Subject: [PATCH] resolve conflict --- metadata/metadata_test.go | 1 - util/structfs/metadata_ec2.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/metadata/metadata_test.go b/metadata/metadata_test.go index a0932d39..84738f81 100644 --- a/metadata/metadata_test.go +++ b/metadata/metadata_test.go @@ -83,7 +83,6 @@ func TestPassing(t *testing.T) { if ok { t.Fatalf("create outgoing context") } - _ = md ctx = NewOutgoingContext(ctx, New(1)) testCtx(ctx) diff --git a/util/structfs/metadata_ec2.go b/util/structfs/metadata_ec2.go index 7d58156c..5bf9605e 100644 --- a/util/structfs/metadata_ec2.go +++ b/util/structfs/metadata_ec2.go @@ -23,7 +23,7 @@ type EC2Metadata struct { ReservationID int `json:"reservation-id"` AMIID int `json:"ami-id"` AMILaunchIndex int `json:"ami-launch-index"` - kernelID int `json:"kernel-id"` + KernelID int `json:"kernel-id"` InstanceID int `json:"instance-id"` } `json:"meta-data"` } `json:"latest"`