Refactored from -expired-workspace -protected-workspace

README.md

@@ -8,7 +8,7 @@ we need an automated way to destroy these environments, so they don't sit around
 
 So what is the purpose of this? Well, when you create a new environment using a terraform workspace using this you can add the workspace you have 
 created in your automated pipeline into a DynamoDB table with a TTL value. You can then set up an automated job to also use this tool to 
-pull expired workspaces from DynamoDB
+pull protected workspaces from DynamoDB
 
 ## Creating the DynamoDB table
 
@@ -26,13 +26,13 @@ module "workspace-cleanup" {
 
 ```
 Usage: tf-workspace-cleanup -register-workspace=<workspace> -aws-account-id=12345678 -aws-iam-role=operator
-Usage: tf-workspace-cleanup -expired-workspaces=true -aws-account-id=12345678 -aws-iam-role=operator
+Usage: tf-workspace-cleanup -protected-workspaces=true -aws-account-id=12345678 -aws-iam-role=operator
   -aws-account-id string
     	Account ID for IAM Role
   -aws-iam-role string
     	AWS IAM Role Name
-  -expired-workspaces
-    	get list of expired workspaces for deletion
+  -protected-workspaces
+    	get list of protected workspaces for deletion
   -register-workspace string
     	Register a workspace to be deleted at a later point
 ```

cmd/retrieve_registered_workspaces.go

@@ -15,7 +15,7 @@ type Item struct {
 	WorkspaceName string
 }
 
-func RetrieveExpiredWorkspaces(accountId *string, iamRoleName *string) {
+func RetrieveProtectedWorkspaces(accountId *string, iamRoleName *string) {
 
 	sess, err := session.NewSession()
 	if err != nil {

main.go

@@ -9,18 +9,18 @@ import (
 func main()  {
 	flag.Usage = func() {
 		fmt.Println("Usage: tf-workspace-cleanup -register-workspace=<workspace> -aws-account-id=12345678 -aws-iam-role=sirius-ci")
-		fmt.Println("Usage: tf-workspace-cleanup -expired-workspaces=true -aws-account-id=12345678 -aws-iam-role=sirius-ci")
+		fmt.Println("Usage: tf-workspace-cleanup -protected-workspaces=true -aws-account-id=12345678 -aws-iam-role=sirius-ci")
 		flag.PrintDefaults()
 	}
 	var workspaceName string
-	var expiredWorkspaces bool
+	var protectedWorkspaces bool
 	var awsAccountId string
 	var awsIAMRoleName string
 
 	flag.StringVar(&workspaceName, "register-workspace", "", "Register a workspace to be deleted at a later point")
 	flag.StringVar(&awsAccountId, "aws-account-id", "", "Account ID for IAM Role")
 	flag.StringVar(&awsIAMRoleName, "aws-iam-role", "", "AWS IAM Role Name ")
-	flag.BoolVar(&expiredWorkspaces, "expired-workspaces", false, "get list of expired workspaces for deletion")
+	flag.BoolVar(&protectedWorkspaces, "protected-workspaces", false, "get list of protected workspaces for deletion")
 	flag.Parse()
 
 	if awsAccountId == "" {
@@ -33,13 +33,13 @@ func main()  {
 		flag.Usage()
 	}
 
-	if expiredWorkspaces {
-		cmd.RetrieveExpiredWorkspaces(&awsAccountId, &awsIAMRoleName)
+	if protectedWorkspaces {
+		cmd.RetrieveProtectedWorkspaces(&awsAccountId, &awsIAMRoleName)
 	}
 
 	if workspaceName != "" {
 		cmd.RegisterWorkspace(&workspaceName, &awsAccountId, &awsIAMRoleName)
-	} else if expiredWorkspaces != true {
+	} else if protectedWorkspaces != true {
 		fmt.Println("Error: Workspace not passed")
 		flag.Usage()
 	}