Skip to content

Commit

Permalink
spelling (#1365)
Browse files Browse the repository at this point in the history
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
  • Loading branch information
helsaawy authored Apr 22, 2022
1 parent db5e1b1 commit 51a6919
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions cmd/containerd-shim-runhcs-v1/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,11 @@ func readOptions(r io.Reader) (*runhcsopts.Options, error) {
if len(d) > 0 {
var a types.Any
if err := proto.Unmarshal(d, &a); err != nil {
return nil, errors.Wrap(err, "failed unmarshaling into Any")
return nil, errors.Wrap(err, "failed unmarshalling into Any")
}
v, err := typeurl.UnmarshalAny(&a)
if err != nil {
return nil, errors.Wrap(err, "failed unmarshaling by typeurl")
return nil, errors.Wrap(err, "failed unmarshalling by typeurl")
}
return v.(*runhcsopts.Options), nil
}
Expand Down
2 changes: 1 addition & 1 deletion container.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ type container struct {
waitCh chan struct{}
}

// createComputeSystemAdditionalJSON is read from the environment at initialisation
// createContainerAdditionalJSON is read from the environment at initialization
// time. It allows an environment variable to define additional JSON which
// is merged in the CreateComputeSystem call to HCS.
var createContainerAdditionalJSON []byte
Expand Down
8 changes: 4 additions & 4 deletions hcn/hcnnamespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,11 @@ func GetNamespaceContainerIds(namespaceId string) ([]string, error) {
var containerIds []string
for _, resource := range namespace.Resources {
if resource.Type == "Container" {
var contaienrResource NamespaceResourceContainer
if err := json.Unmarshal([]byte(resource.Data), &contaienrResource); err != nil {
var containerResource NamespaceResourceContainer
if err := json.Unmarshal([]byte(resource.Data), &containerResource); err != nil {
return nil, err
}
containerIds = append(containerIds, contaienrResource.Id)
containerIds = append(containerIds, containerResource.Id)
}
}
return containerIds, nil
Expand Down Expand Up @@ -377,7 +377,7 @@ func (namespace *HostComputeNamespace) Sync() error {
}
shimPath := runhcs.VMPipePath(cfg.HostUniqueID)
if err := runhcs.IssueVMRequest(shimPath, &req); err != nil {
// The shim is likey gone. Simply ignore the sync as if it didn't exist.
// The shim is likely gone. Simply ignore the sync as if it didn't exist.
if perr, ok := err.(*os.PathError); ok && perr.Err == syscall.ERROR_FILE_NOT_FOUND {
// Remove the reg key there is no point to try again
_ = cfg.Remove()
Expand Down
2 changes: 1 addition & 1 deletion internal/guest/runtime/hcsv2/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ type containerProcess struct {
// (runtime.Process).Wait() call returns, and exitCode has been updated.
exitWg sync.WaitGroup

// Used to allow addtion/removal to the writersWg after an initial wait has
// Used to allow addition/removal to the writersWg after an initial wait has
// already been issued. It is not safe to call Add/Done without holding this
// lock.
writersSyncRoot sync.Mutex
Expand Down
2 changes: 1 addition & 1 deletion internal/lcow/scratch.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const (
// requested size. It has a caching capability. If the cacheFile exists, and the
// request is for a default size, a copy of that is made to the target. If the
// size is non-default, or the cache file does not exist, it uses a utility VM
// to create target. It is the responsibility of the caller to synchronise
// to create target. It is the responsibility of the caller to synchronize
// simultaneous attempts to create the cache file.
func CreateScratch(ctx context.Context, lcowUVM *uvm.UtilityVM, destFile string, sizeGB uint32, cacheFile string) error {
if lcowUVM == nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/securitypolicy/securitypolicy.go
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ func newMountConstraints(mountConfigs []MountConfig) Mounts {
}
}

// Custom JSON marshalling to add `lenth` field that matches the number of
// Custom JSON marshalling to add `length` field that matches the number of
// elements present in the `elements` field.

func (c Containers) MarshalJSON() ([]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/securitypolicy/securitypolicyenforcer.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ var _ SecurityPolicyEnforcer = (*StandardSecurityPolicyEnforcer)(nil)
func NewStandardSecurityPolicyEnforcer(containers []securityPolicyContainer, encoded string) *StandardSecurityPolicyEnforcer {
// create new StandardSecurityPolicyEnforcer and add the expected containers
// to it
// fill out corresponding devices structure by creating a "same shapped"
// fill out corresponding devices structure by creating a "same shaped"
// devices listing that corresponds to our container root hash lists
// the devices list will get filled out as layers are mounted
devices := make([][]string, len(containers))
Expand Down
2 changes: 1 addition & 1 deletion test/vendor/github.com/Microsoft/hcsshim/container.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions test/vendor/github.com/Microsoft/hcsshim/hcn/hcnnamespace.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 51a6919

Please sign in to comment.