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

fixed minor typos throughout project #223

Merged
merged 1 commit into from
Sep 21, 2018
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 pkg/ami/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const (

ImageFamilyAmazonLinux2 = "AmazonLinux2"

// ResolverStatic is used to indicate that the stqtic (i.e. compiled into eksctl) AMIs should be used
// ResolverStatic is used to indicate that the static (i.e. compiled into eksctl) AMIs should be used
ResolverStatic = "static"
// ResolverAuto is used to indicate that the latest EKS AMIs should be used for the nodes. This implies
// that automatic resolution of AMI will occur.
Expand Down
2 changes: 1 addition & 1 deletion pkg/ami/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var (

// Resolve will resolve an AMI from the supplied region
// and instance type. It will invoke a specific resolver
// to do the actual detrminng of AMI.
// to do the actual determining of AMI.
func Resolve(region string, instanceType string) (string, error) {
for _, resolver := range DefaultResolvers {
ami, err := resolver.Resolve(region, instanceType)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/vpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (n *nodeGroupResourceSet) addResourcesForSecurityGroups() {
n.newResource("IngressInterClusterCP", &gfn.AWSEC2SecurityGroupIngress{
GroupId: refCP,
SourceSecurityGroupId: refSG,
Description: gfn.NewString("Allow control plane to recieve API requests from " + desc),
Description: gfn.NewString("Allow control plane to receive API requests from " + desc),
IpProtocol: tcp,
FromPort: apiPort,
ToPort: apiPort,
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/manager/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type task func(chan error) error

// Run a set of tests in parallel and wait for them to complete;
// passError should take any errors and do what it needs to in
// a given context, e.g. duing serial CLI-driven execution one
// a given context, e.g. during serial CLI-driven execution one
// can keep errors in a slice, while in a daemon channel maybe
// more suitable
func Run(passError func(error), tasks ...task) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/eks/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ func (c *ClusterProvider) CheckAuth() error {
return nil
}

// EnsureAMI ensures that the node AMI is set and isavailable
// EnsureAMI ensures that the node AMI is set and is available
func (c *ClusterProvider) EnsureAMI() error {
// TODO: https://github.com/weaveworks/eksctl/issues/28
// - imporve validation of parameter set overall, probably in another package
// - improve validation of parameter set overall, probably in another package
if c.Spec.NodeAMI == ami.ResolverAuto {
ami.DefaultResolvers = []ami.Resolver{ami.NewAutoResolver(c.Provider.EC2())}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/eks/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (c *ClusterProvider) LoadSSHPublicKey() error {
}
return errors.Wrap(err, fmt.Sprintf("reading SSH public key file %q", c.Spec.SSHPublicKeyPath))
}
// on successfull read – import it
// on successful read – import it
c.Spec.SSHPublicKey = sshPublicKey
if err := c.importSSHPublicKeyIfNeeded(); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion pkg/eks/nodegroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (c *ClusterProvider) newNodeAuthConfigMap() (*corev1.ConfigMap, error) {
func (c *ClusterProvider) CreateDefaultNodeGroupAuthConfigMap(clientSet *clientset.Clientset) error {
cm, err := c.newNodeAuthConfigMap()
if err != nil {
return errors.Wrap(err, "contructing auth ConfigMap for DefaultNodeGroup")
return errors.Wrap(err, "constructing auth ConfigMap for DefaultNodeGroup")
}
if _, err := clientSet.CoreV1().ConfigMaps("kube-system").Create(cm); err != nil {
return errors.Wrap(err, "creating auth ConfigMap for DefaultNodeGroup")
Expand Down
8 changes: 4 additions & 4 deletions pkg/printers/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
)

const (
DefaultPrefix = ""
DefaultIdentation = " "
DefaultPrefix = ""
DefaultIndentation = " "
)

// JSONPrinter is a printer that outputs an object formatted
Expand All @@ -18,9 +18,9 @@ type JSONPrinter struct {
}

// NewJSONPrinter creates a new JsonPrinter with defaults for
// level of identation.
// level of indentation.
func NewJSONPrinter() OutputPrinter {
return &JSONPrinter{prefix: DefaultPrefix, indent: DefaultIdentation}
return &JSONPrinter{prefix: DefaultPrefix, indent: DefaultIndentation}
}

// PrintObj will print the passed object formatted as JSON to
Expand Down
4 changes: 2 additions & 2 deletions pkg/testutils/aws/cloudformation.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

const (
errorMerssageTemplate = "Stack with id %s does not exist"
errorMessageTemplate = "Stack with id %s does not exist"
)

// StackExists checks to see if a CloudFormation stack exists
Expand All @@ -24,7 +24,7 @@ func StackExists(stackName string, session *session.Session) (bool, error) {

if err != nil {
// Check if its a not found error
errorMessage := fmt.Sprintf(errorMerssageTemplate, stackName)
errorMessage := fmt.Sprintf(errorMessageTemplate, stackName)
if !strings.Contains(err.Error(), errorMessage) {
return false, err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/testutils/matchers/have_cfn_stack_matcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
)

const (
errorMerssageTemplate = "Stack with id %s does not exist"
errorMessageTemplate = "Stack with id %s does not exist"
)

// HaveCfnStack returns a GoMega matcher that will check for the existence of an cloudformatioin stack
// HaveCfnStack returns a GoMega matcher that will check for the existence of an cloudformation stack
func HaveCfnStack(expectedStackName string) types.GomegaMatcher {
return &haveCfnStackMatcher{expectedStackName: expectedStackName}
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/testutils/matchers/have_eks_cluster_matcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
)

// HaveEksCluster returns a GoMega matcher that will check for the existence of an EKS cluster
func HaveEksCluster(expectedName string, expectedStatus string, expectedversion string) types.GomegaMatcher {
return &haveEksClusterMatcher{expectedName: expectedName, expectedStatus: expectedStatus, expectedVersion: expectedversion}
func HaveEksCluster(expectedName string, expectedStatus string, expectedVersion string) types.GomegaMatcher {
return &haveEksClusterMatcher{expectedName: expectedName, expectedStatus: expectedStatus, expectedVersion: expectedVersion}
}

type haveEksClusterMatcher struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/kubeconfig/kubeconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (

// New creates Kubernetes client configuration for a given username
// if certificateAuthorityPath is no empty, it is used instead of
// embdedded certificate-authority-data
// embedded certificate-authority-data
func New(spec *api.ClusterConfig, username, certificateAuthorityPath string) (*clientcmdapi.Config, string, string) {
clusterName := fmt.Sprintf("%s.%s.eksctl.io", spec.ClusterName, spec.Region)
contextName := fmt.Sprintf("%s@%s", username, clusterName)
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func CheckAllCommands(kubeconfigPath string, isContextSet bool, contextName stri

logger.Info("kubectl command should work with %q, try '%s'", kubeconfigPath, fmtKubectlCmd(ktl, "get", "nodes"))
} else {
logger.Debug("skipping kubectl integration ckecks, as writing kubeconfig file is disabled")
logger.Debug("skipping kubectl integration checks, as writing kubeconfig file is disabled")
}

return nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ func IsGPUInstanceType(instanceType string) bool {
return strings.HasPrefix(instanceType, "p2") || strings.HasPrefix(instanceType, "p3")
}

// ClusterName generates a neme string when a and b are empty strings.
// ClusterName generates a name string when a and b are empty strings.
// If either a or b are non-empty, it returns whichever is non-empty.
// If neither a nor b are empty, it returns empty name, to indicate
// ambigous usage.
// ambiguous usage.
func ClusterName(a, b string) string {
if a != "" && b != "" {
return ""
Expand Down