Rename attachement to attachment

README.md

@@ -93,7 +93,7 @@ eu-west-1 - EC2Subnet - 'subnet-154d844e' - would remove
 eu-west-1 - EC2Volume - 'vol-0ddfb15461a00c3e2' - would remove
 eu-west-1 - EC2Vpc - 'vpc-c6159fa1' - would remove
 eu-west-1 - IamUserAccessKeys - 'my-user -> ABCDEFGHIJKLMNOPQRST' - would remove
-eu-west-1 - IamUserPolicyAttachement - 'my-user -> AdministratorAccess' - would remove
+eu-west-1 - IamUserPolicyAttachment - 'my-user -> AdministratorAccess' - would remove
 eu-west-1 - IamUser - 'my-user' - would remove
 Scan complete: 13 total, 11 nukeable, 2 filtered.
 
@@ -118,7 +118,7 @@ accounts:
     filters:
       IamUser:
       - "my-user"
-      IamUserPolicyAttachement:
+      IamUserPolicyAttachment:
       - "my-user -> AdministratorAccess"
       IamUserAccessKeys:
       - "my-user -> ABCDEFGHIJKLMNOPQRST"
@@ -143,7 +143,7 @@ eu-west-1 - EC2Subnet - 'subnet-154d844e' - would remove
 eu-west-1 - EC2Volume - 'vol-0ddfb15461a00c3e2' - would remove
 eu-west-1 - EC2Vpc - 'vpc-c6159fa1' - would remove
 eu-west-1 - IamUserAccessKeys - 'my-user -> ABCDEFGHIJKLMNOPQRST' - filtered by config
-eu-west-1 - IamUserPolicyAttachement - 'my-user -> AdministratorAccess' - filtered by config
+eu-west-1 - IamUserPolicyAttachment - 'my-user -> AdministratorAccess' - filtered by config
 eu-west-1 - IamUser - 'my-user' - filtered by config
 Scan complete: 13 total, 8 nukeable, 5 filtered.
 

cmd/config_test.go

@@ -63,7 +63,7 @@ func TestLoadExampleConfig(t *testing.T) {
 					"IamRole": []string{
 						"uber.admin",
 					},
-					"IamRolePolicyAttachement": []string{
+					"IamRolePolicyAttachment": []string{
 						"uber.admin -> AdministratorAccess",
 					},
 				},

config/example.yaml

@@ -9,5 +9,5 @@ accounts:
     filters:
       IamRole:
       - "uber.admin"
-      IamRolePolicyAttachement:
+      IamRolePolicyAttachment:
       - "uber.admin -> AdministratorAccess"

resources/ec2-internet-gateway-attachements.go → resources/ec2-internet-gateway-attachments.go

@@ -7,13 +7,13 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 )
 
-type EC2InternetGatewayAttachement struct {
+type EC2InternetGatewayAttachment struct {
 	svc   *ec2.EC2
 	vpcId *string
 	igwId *string
 }
 
-func (n *EC2Nuke) ListInternetGatewayAttachements() ([]Resource, error) {
+func (n *EC2Nuke) ListInternetGatewayAttachments() ([]Resource, error) {
 	resp, err := n.Service.DescribeVpcs(nil)
 	if err != nil {
 		return nil, err
@@ -36,7 +36,7 @@ func (n *EC2Nuke) ListInternetGatewayAttachements() ([]Resource, error) {
 		}
 
 		for _, out := range resp.InternetGateways {
-			resources = append(resources, &EC2InternetGatewayAttachement{
+			resources = append(resources, &EC2InternetGatewayAttachment{
 				svc:   n.Service,
 				vpcId: vpc.VpcId,
 				igwId: out.InternetGatewayId,
@@ -47,7 +47,7 @@ func (n *EC2Nuke) ListInternetGatewayAttachements() ([]Resource, error) {
 	return resources, nil
 }
 
-func (e *EC2InternetGatewayAttachement) Remove() error {
+func (e *EC2InternetGatewayAttachment) Remove() error {
 	params := &ec2.DetachInternetGatewayInput{
 		VpcId:             e.vpcId,
 		InternetGatewayId: e.igwId,
@@ -61,6 +61,6 @@ func (e *EC2InternetGatewayAttachement) Remove() error {
 	return nil
 }
 
-func (e *EC2InternetGatewayAttachement) String() string {
+func (e *EC2InternetGatewayAttachment) String() string {
 	return fmt.Sprintf("%s -> %s", *e.igwId, *e.vpcId)
 }

resources/ec2-vpn-gateway-attachements.go → resources/ec2-vpn-gateway-attachments.go

@@ -6,14 +6,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 )
 
-type EC2VpnGatewayAttachement struct {
+type EC2VpnGatewayAttachment struct {
 	svc   *ec2.EC2
 	vpcId string
 	vpnId string
 	state string
 }
 
-func (n *EC2Nuke) ListVpnGatewayAttachements() ([]Resource, error) {
+func (n *EC2Nuke) ListVpnGatewayAttachments() ([]Resource, error) {
 
 	resp, err := n.Service.DescribeVpnGateways(nil)
 	if err != nil {
@@ -24,7 +24,7 @@ func (n *EC2Nuke) ListVpnGatewayAttachements() ([]Resource, error) {
 
 	for _, vgw := range resp.VpnGateways {
 		for _, att := range vgw.VpcAttachments {
-			resources = append(resources, &EC2VpnGatewayAttachement{
+			resources = append(resources, &EC2VpnGatewayAttachment{
 				svc:   n.Service,
 				vpcId: *att.VpcId,
 				vpnId: *vgw.VpnGatewayId,
@@ -36,14 +36,14 @@ func (n *EC2Nuke) ListVpnGatewayAttachements() ([]Resource, error) {
 	return resources, nil
 }
 
-func (i *EC2VpnGatewayAttachement) Filter() error {
+func (i *EC2VpnGatewayAttachment) Filter() error {
 	if i.state == "detached" {
 		return fmt.Errorf("already detached")
 	}
 	return nil
 }
 
-func (e *EC2VpnGatewayAttachement) Remove() error {
+func (e *EC2VpnGatewayAttachment) Remove() error {
 	params := &ec2.DetachVpnGatewayInput{
 		VpcId:        &e.vpcId,
 		VpnGatewayId: &e.vpnId,
@@ -57,6 +57,6 @@ func (e *EC2VpnGatewayAttachement) Remove() error {
 	return nil
 }
 
-func (e *EC2VpnGatewayAttachement) String() string {
+func (e *EC2VpnGatewayAttachment) String() string {
 	return fmt.Sprintf("%s -> %s", e.vpnId, e.vpcId)
 }

resources/iam-group-policy-attachements.go → resources/iam-group-policy-attachments.go

@@ -6,14 +6,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 )
 
-type IamGroupPolicyAttachement struct {
+type IamGroupPolicyAttachment struct {
 	svc        *iam.IAM
 	policyArn  string
 	policyName string
 	roleName   string
 }
 
-func (n *IamNuke) ListGroupPolicyAttachements() ([]Resource, error) {
+func (n *IamNuke) ListGroupPolicyAttachments() ([]Resource, error) {
 	resp, err := n.Service.ListGroups(nil)
 	if err != nil {
 		return nil, err
@@ -30,7 +30,7 @@ func (n *IamNuke) ListGroupPolicyAttachements() ([]Resource, error) {
 		}
 
 		for _, pol := range resp.AttachedPolicies {
-			resources = append(resources, &IamGroupPolicyAttachement{
+			resources = append(resources, &IamGroupPolicyAttachment{
 				svc:        n.Service,
 				policyArn:  *pol.PolicyArn,
 				policyName: *pol.PolicyName,
@@ -42,7 +42,7 @@ func (n *IamNuke) ListGroupPolicyAttachements() ([]Resource, error) {
 	return resources, nil
 }
 
-func (e *IamGroupPolicyAttachement) Remove() error {
+func (e *IamGroupPolicyAttachment) Remove() error {
 	_, err := e.svc.DetachGroupPolicy(
 		&iam.DetachGroupPolicyInput{
 			PolicyArn: &e.policyArn,
@@ -55,6 +55,6 @@ func (e *IamGroupPolicyAttachement) Remove() error {
 	return nil
 }
 
-func (e *IamGroupPolicyAttachement) String() string {
+func (e *IamGroupPolicyAttachment) String() string {
 	return fmt.Sprintf("%s -> %s", e.roleName, e.policyName)
 }

resources/iam-list-user-group-attachements.go → resources/iam-list-user-group-attachments.go

@@ -6,13 +6,13 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 )
 
-type IamUserGroupAttachement struct {
+type IamUserGroupAttachment struct {
 	svc       *iam.IAM
 	groupName string
 	userName  string
 }
 
-func (n *IamNuke) ListUserGroupAttachements() ([]Resource, error) {
+func (n *IamNuke) ListUserGroupAttachments() ([]Resource, error) {
 	resp, err := n.Service.ListUsers(nil)
 	if err != nil {
 		return nil, err
@@ -29,7 +29,7 @@ func (n *IamNuke) ListUserGroupAttachements() ([]Resource, error) {
 		}
 
 		for _, grp := range resp.Groups {
-			resources = append(resources, &IamUserGroupAttachement{
+			resources = append(resources, &IamUserGroupAttachment{
 				svc:       n.Service,
 				groupName: *grp.GroupName,
 				userName:  *role.UserName,
@@ -40,7 +40,7 @@ func (n *IamNuke) ListUserGroupAttachements() ([]Resource, error) {
 	return resources, nil
 }
 
-func (e *IamUserGroupAttachement) Remove() error {
+func (e *IamUserGroupAttachment) Remove() error {
 	_, err := e.svc.RemoveUserFromGroup(
 		&iam.RemoveUserFromGroupInput{
 			GroupName: &e.groupName,
@@ -53,6 +53,6 @@ func (e *IamUserGroupAttachement) Remove() error {
 	return nil
 }
 
-func (e *IamUserGroupAttachement) String() string {
+func (e *IamUserGroupAttachment) String() string {
 	return fmt.Sprintf("%s -> %s", e.userName, e.groupName)
 }

resources/iam-role-policie-attachements.go → resources/iam-role-policy-attachments.go

@@ -7,14 +7,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 )
 
-type IamRolePolicyAttachement struct {
+type IamRolePolicyAttachment struct {
 	svc        *iam.IAM
 	policyArn  string
 	policyName string
 	roleName   string
 }
 
-func (n *IamNuke) ListRolePolicyAttachements() ([]Resource, error) {
+func (n *IamNuke) ListRolePolicyAttachments() ([]Resource, error) {
 	resp, err := n.Service.ListRoles(nil)
 	if err != nil {
 		return nil, err
@@ -31,7 +31,7 @@ func (n *IamNuke) ListRolePolicyAttachements() ([]Resource, error) {
 		}
 
 		for _, pol := range resp.AttachedPolicies {
-			resources = append(resources, &IamRolePolicyAttachement{
+			resources = append(resources, &IamRolePolicyAttachment{
 				svc:        n.Service,
 				policyArn:  *pol.PolicyArn,
 				policyName: *pol.PolicyName,
@@ -43,14 +43,14 @@ func (n *IamNuke) ListRolePolicyAttachements() ([]Resource, error) {
 	return resources, nil
 }
 
-func (e *IamRolePolicyAttachement) Filter() error {
+func (e *IamRolePolicyAttachment) Filter() error {
 	if strings.HasPrefix(e.policyArn, "arn:aws:iam::aws:policy/aws-service-role/") {
 		return fmt.Errorf("cannot detach from service roles")
 	}
 	return nil
 }
 
-func (e *IamRolePolicyAttachement) Remove() error {
+func (e *IamRolePolicyAttachment) Remove() error {
 	_, err := e.svc.DetachRolePolicy(
 		&iam.DetachRolePolicyInput{
 			PolicyArn: &e.policyArn,
@@ -63,6 +63,6 @@ func (e *IamRolePolicyAttachement) Remove() error {
 	return nil
 }
 
-func (e *IamRolePolicyAttachement) String() string {
+func (e *IamRolePolicyAttachment) String() string {
 	return fmt.Sprintf("%s -> %s", e.roleName, e.policyName)
 }

resources/iam-user-policy-attachements.go → resources/iam-user-policy-attachments.go

@@ -6,14 +6,14 @@ import (
 	"github.com/aws/aws-sdk-go/service/iam"
 )
 
-type IamUserPolicyAttachement struct {
+type IamUserPolicyAttachment struct {
 	svc        *iam.IAM
 	policyArn  string
 	policyName string
 	roleName   string
 }
 
-func (n *IamNuke) ListUserPolicyAttachements() ([]Resource, error) {
+func (n *IamNuke) ListUserPolicyAttachments() ([]Resource, error) {
 	resp, err := n.Service.ListUsers(nil)
 	if err != nil {
 		return nil, err
@@ -30,7 +30,7 @@ func (n *IamNuke) ListUserPolicyAttachements() ([]Resource, error) {
 		}
 
 		for _, pol := range resp.AttachedPolicies {
-			resources = append(resources, &IamUserPolicyAttachement{
+			resources = append(resources, &IamUserPolicyAttachment{
 				svc:        n.Service,
 				policyArn:  *pol.PolicyArn,
 				policyName: *pol.PolicyName,
@@ -42,7 +42,7 @@ func (n *IamNuke) ListUserPolicyAttachements() ([]Resource, error) {
 	return resources, nil
 }
 
-func (e *IamUserPolicyAttachement) Remove() error {
+func (e *IamUserPolicyAttachment) Remove() error {
 	_, err := e.svc.DetachUserPolicy(
 		&iam.DetachUserPolicyInput{
 			PolicyArn: &e.policyArn,
@@ -55,6 +55,6 @@ func (e *IamUserPolicyAttachement) Remove() error {
 	return nil
 }
 
-func (e *IamUserPolicyAttachement) String() string {
+func (e *IamUserPolicyAttachment) String() string {
 	return fmt.Sprintf("%s -> %s", e.roleName, e.policyName)
 }

resources/listers.go

@@ -53,7 +53,7 @@ func GetListers(sess *session.Session) []ResourceLister {
 		ec2.ListCustomerGateways,
 		ec2.ListDhcpOptions,
 		ec2.ListInstances,
-		ec2.ListInternetGatewayAttachements,
+		ec2.ListInternetGatewayAttachments,
 		ec2.ListInternetGateways,
 		ec2.ListKeyPairs,
 		ec2.ListNatGateways,
@@ -66,7 +66,7 @@ func GetListers(sess *session.Session) []ResourceLister {
 		ec2.ListVpcEndpoints,
 		ec2.ListVpcs,
 		ec2.ListVpnConnections,
-		ec2.ListVpnGatewayAttachements,
+		ec2.ListVpnGatewayAttachments,
 		ec2.ListVpnGateways,
 		ecr.ListRepos,
 		efs.ListFileSystems,
@@ -76,18 +76,18 @@ func GetListers(sess *session.Session) []ResourceLister {
 		elb.ListELBs,
 		elbv2.ListELBs,
 		elbv2.ListTargetGroups,
-		iam.ListGroupPolicyAttachements,
+		iam.ListGroupPolicyAttachments,
 		iam.ListGroups,
 		iam.ListInstanceProfileRoles,
 		iam.ListInstanceProfiles,
 		iam.ListPolicies,
-		iam.ListRolePolicyAttachements,
+		iam.ListRolePolicyAttachments,
 		iam.ListRoles,
 		iam.ListServerCertificates,
 		iam.ListUserAccessKeys,
-		iam.ListUserGroupAttachements,
-		iam.ListUserGroupAttachements,
-		iam.ListUserPolicyAttachements,
+		iam.ListUserGroupAttachments,
+		iam.ListUserGroupAttachments,
+		iam.ListUserPolicyAttachments,
 		iam.ListUsers,
 		kms.ListAliases,
 		kms.ListKeys,