From d9e2e9edb2c8ee480c0dd0dc63da216fa041d7c8 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 8 Oct 2021 17:07:42 +1100 Subject: [PATCH] runtime: Rename constraintGRPCSpec to improve grammar "constraint" is a noun, "constrain" is the associated verb, which makes more sense in this context. Signed-off-by: David Gibson --- src/runtime/virtcontainers/kata_agent.go | 8 ++++---- src/runtime/virtcontainers/kata_agent_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/runtime/virtcontainers/kata_agent.go b/src/runtime/virtcontainers/kata_agent.go index feccb6382c..f46f5f3a1b 100644 --- a/src/runtime/virtcontainers/kata_agent.go +++ b/src/runtime/virtcontainers/kata_agent.go @@ -995,7 +995,7 @@ func (k *kataAgent) replaceOCIMountsForStorages(spec *specs.Spec, volumeStorages return nil } -func (k *kataAgent) constraintGRPCSpec(grpcSpec *grpc.Spec, passSeccomp bool) { +func (k *kataAgent) constrainGRPCSpec(grpcSpec *grpc.Spec, passSeccomp bool) { // Disable Hooks since they have been handled on the host and there is // no reason to send them to the agent. It would make no sense to try // to apply them on the guest. @@ -1411,9 +1411,9 @@ func (k *kataAgent) createContainer(ctx context.Context, sandbox *Sandbox, c *Co passSeccomp := !sandbox.config.DisableGuestSeccomp && sandbox.seccompSupported - // We need to constraint the spec to make sure we're not passing - // irrelevant information to the agent. - k.constraintGRPCSpec(grpcSpec, passSeccomp) + // We need to constrain the spec to make sure we're not + // passing irrelevant information to the agent. + k.constrainGRPCSpec(grpcSpec, passSeccomp) req := &grpc.CreateContainerRequest{ ContainerId: c.id, diff --git a/src/runtime/virtcontainers/kata_agent_test.go b/src/runtime/virtcontainers/kata_agent_test.go index ce4515e2ee..fa50569cea 100644 --- a/src/runtime/virtcontainers/kata_agent_test.go +++ b/src/runtime/virtcontainers/kata_agent_test.go @@ -541,7 +541,7 @@ func TestAppendVhostUserBlkDevices(t *testing.T) { updatedDevList, expected) } -func TestConstraintGRPCSpec(t *testing.T) { +func TestConstrainGRPCSpec(t *testing.T) { assert := assert.New(t) expectedCgroupPath := "/foo/bar" @@ -589,7 +589,7 @@ func TestConstraintGRPCSpec(t *testing.T) { } k := kataAgent{} - k.constraintGRPCSpec(g, true) + k.constrainGRPCSpec(g, true) // check nil fields assert.Nil(g.Hooks)