resolve conflict
Some checks failed
test / test (pull_request) Successful in 46s
lint / lint (pull_request) Failing after 10m3s

This commit is contained in:
Денис Евстигнеев 2024-12-09 13:22:28 +03:00
parent 5a9558d0a3
commit e6101621fc
2 changed files with 1 additions and 2 deletions

View File

@ -83,7 +83,6 @@ func TestPassing(t *testing.T) {
if ok { if ok {
t.Fatalf("create outgoing context") t.Fatalf("create outgoing context")
} }
_ = md
ctx = NewOutgoingContext(ctx, New(1)) ctx = NewOutgoingContext(ctx, New(1))
testCtx(ctx) testCtx(ctx)

View File

@ -23,7 +23,7 @@ type EC2Metadata struct {
ReservationID int `json:"reservation-id"` ReservationID int `json:"reservation-id"`
AMIID int `json:"ami-id"` AMIID int `json:"ami-id"`
AMILaunchIndex int `json:"ami-launch-index"` AMILaunchIndex int `json:"ami-launch-index"`
kernelID int `json:"kernel-id"` KernelID int `json:"kernel-id"`
InstanceID int `json:"instance-id"` InstanceID int `json:"instance-id"`
} `json:"meta-data"` } `json:"meta-data"`
} `json:"latest"` } `json:"latest"`