Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

all: fix typo #1310

Merged
merged 2 commits into from
Mar 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/containerd-shim-runhcs-v1/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ var serveCommand = cli.Command{
}

if shimOpts.Debug && shimOpts.LogLevel != "" {
logrus.Warning("Both Debug and LogLevel specified, Debug will be overriden")
logrus.Warning("Both Debug and LogLevel specified, Debug will be overridden")
}

// For now keep supporting the debug option, this used to be the only way to specify a different logging
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd-shim-runhcs-v1/task_hcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ type hcsTask struct {
host *uvm.UtilityVM

// ecl is the exec create lock for all non-init execs and MUST be held
// durring create to prevent ID duplication.
// during create to prevent ID duplication.
ecl sync.Mutex
execs sync.Map

Expand Down
4 changes: 2 additions & 2 deletions hcn/hcn.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func IPv6DualStackSupported() error {
return platformDoesNotSupportError("IPv6 DualStack")
}

//L4proxySupported returns an error if the HCN verison does not support L4Proxy
//L4proxySupported returns an error if the HCN version does not support L4Proxy
func L4proxyPolicySupported() error {
supported, err := GetCachedSupportedFeatures()
if err != nil {
Expand All @@ -240,7 +240,7 @@ func L4proxyPolicySupported() error {
return platformDoesNotSupportError("L4ProxyPolicy")
}

// L4WfpProxySupported returns an error if the HCN verison does not support L4WfpProxy
// L4WfpProxySupported returns an error if the HCN version does not support L4WfpProxy
func L4WfpProxyPolicySupported() error {
supported, err := GetCachedSupportedFeatures()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion hcn/hcnendpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/sirupsen/logrus"
)

// IpConfig is assoicated with an endpoint
// IpConfig is associated with an endpoint
type IpConfig struct {
IpAddress string `json:",omitempty"`
PrefixLength uint8 `json:",omitempty"`
Expand Down
10 changes: 5 additions & 5 deletions hcn/hcnerrors.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func new(hr error, title string, rest string) error {
// we wish to seperate them as they are shim usage error
//

// NetworkNotFoundError results from a failed seach for a network by Id or Name
// NetworkNotFoundError results from a failed search for a network by Id or Name
type NetworkNotFoundError struct {
NetworkName string
NetworkID string
Expand All @@ -103,7 +103,7 @@ func (e NetworkNotFoundError) Error() string {
return fmt.Sprintf("Network ID %q not found", e.NetworkID)
}

// EndpointNotFoundError results from a failed seach for an endpoint by Id or Name
// EndpointNotFoundError results from a failed search for an endpoint by Id or Name
type EndpointNotFoundError struct {
EndpointName string
EndpointID string
Expand All @@ -116,7 +116,7 @@ func (e EndpointNotFoundError) Error() string {
return fmt.Sprintf("Endpoint ID %q not found", e.EndpointID)
}

// NamespaceNotFoundError results from a failed seach for a namsepace by Id
// NamespaceNotFoundError results from a failed search for a namsepace by Id
type NamespaceNotFoundError struct {
NamespaceID string
}
Expand All @@ -125,7 +125,7 @@ func (e NamespaceNotFoundError) Error() string {
return fmt.Sprintf("Namespace ID %q not found", e.NamespaceID)
}

// LoadBalancerNotFoundError results from a failed seach for a loadbalancer by Id
// LoadBalancerNotFoundError results from a failed search for a loadbalancer by Id
type LoadBalancerNotFoundError struct {
LoadBalancerId string
}
Expand All @@ -134,7 +134,7 @@ func (e LoadBalancerNotFoundError) Error() string {
return fmt.Sprintf("LoadBalancer %q not found", e.LoadBalancerId)
}

// RouteNotFoundError results from a failed seach for a route by Id
// RouteNotFoundError results from a failed search for a route by Id
type RouteNotFoundError struct {
RouteId string
}
Expand Down
2 changes: 1 addition & 1 deletion hcn/hcnnamespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type NamespaceResourceContainer struct {
type NamespaceResourceType string

var (
// NamespaceResourceTypeContainer are contianers associated with a Namespace.
// NamespaceResourceTypeContainer are containers associated with a Namespace.
NamespaceResourceTypeContainer NamespaceResourceType = "Container"
// NamespaceResourceTypeEndpoint are endpoints associated with a Namespace.
NamespaceResourceTypeEndpoint NamespaceResourceType = "Endpoint"
Expand Down
4 changes: 2 additions & 2 deletions hnsnetwork.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"github.com/Microsoft/hcsshim/internal/hns"
)

// Subnet is assoicated with a network and represents a list
// Subnet is associated with a network and represents a list
// of subnets available to the network
type Subnet = hns.Subnet

// MacPool is assoicated with a network and represents a list
// MacPool is associated with a network and represents a list
// of macaddresses available to the network
type MacPool = hns.MacPool

Expand Down
2 changes: 1 addition & 1 deletion internal/clone/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func storePersistedUVMConfig(id string, encodedConfig []byte) error {
}

// removePersistedUVMConfig removes any persisted state associated with this config. If the config
// is not found in the registery `Remove` returns no error.
// is not found in the registry `Remove` returns no error.
func removePersistedUVMConfig(id string) error {
sk, err := regstate.Open(configRoot, false)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/cni/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (pnc *PersistedNamespaceConfig) Store() error {
}

// Remove removes any persisted state associated with this config. If the config
// is not found in the registery `Remove` returns no error.
// is not found in the registry `Remove` returns no error.
func (pnc *PersistedNamespaceConfig) Remove() error {
if pnc.stored {
sk, err := regstate.Open(cniRoot, false)
Expand Down
4 changes: 2 additions & 2 deletions test/vendor/github.com/Microsoft/hcsshim/hcn/hcn.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.

10 changes: 5 additions & 5 deletions test/vendor/github.com/Microsoft/hcsshim/hcn/hcnerrors.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.

4 changes: 2 additions & 2 deletions test/vendor/github.com/Microsoft/hcsshim/hnsnetwork.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.