Rename and remove short version

Author: politas

aliases

@@ -38,6 +38,7 @@ alias aws-account-id='~/.bash-my-aws/bin/bma aws-account-id'
 alias aws-accounts='~/.bash-my-aws/bin/bma aws-accounts'
 alias aws-panopticon='~/.bash-my-aws/bin/bma aws-panopticon'
 alias bucket-acls='~/.bash-my-aws/bin/bma bucket-acls'
+alias bucket-objects='~/.bash-my-aws/bin/bma bucket-objects'
 alias bucket-remove='~/.bash-my-aws/bin/bma bucket-remove'
 alias bucket-remove-force='~/.bash-my-aws/bin/bma bucket-remove-force'
 alias buckets='~/.bash-my-aws/bin/bma buckets'
@@ -115,8 +116,6 @@ alias rds-db-clusters='~/.bash-my-aws/bin/bma rds-db-clusters'
 alias rds-db-instances='~/.bash-my-aws/bin/bma rds-db-instances'
 alias region-each='~/.bash-my-aws/bin/bma region-each'
 alias regions='~/.bash-my-aws/bin/bma regions'
-alias s3-ls='~/.bash-my-aws/bin/bma s3-ls'
-alias s3-lsl='~/.bash-my-aws/bin/bma s3-lsl'
 alias skim-stdin='~/.bash-my-aws/bin/bma skim-stdin'
 alias stack-arn='~/.bash-my-aws/bin/bma stack-arn'
 alias stack-asg-instances='~/.bash-my-aws/bin/bma stack-asg-instances'

bash_completion.sh

@@ -138,11 +138,10 @@ complete -F _bma_aws-accounts_completion aws-account-cost-explorer
 complete -F _bma_aws-accounts_completion aws-account-cost-recommendations
 complete -F _bma_aws-accounts_completion aws-accounts
 complete -F _bma_buckets_completion bucket-acls
+complete -F _bma_buckets_completion bucket-objects
 complete -F _bma_buckets_completion bucket-remove
 complete -F _bma_buckets_completion bucket-remove-force
 complete -F _bma_buckets_completion buckets
-complete -F _bma_buckets_completion s3-ls
-complete -F _bma_buckets_completion s3-lsl
 complete -F _bma_certs_completion cert-delete
 complete -F _bma_certs_completion cert-users
 complete -F _bma_certs_completion certs

lib/s3-functions

@@ -55,6 +55,27 @@ bucket-acls() {
   done
 }
 
+bucket-objects() {
+
+  # List of S3 Bucket Objects.
+  #
+  #     $ bucket-objects example-bucket
+  #     object-key         last-modified storage-class owner-display-name etag size
+  #     another-object-key last-modified storage-class owner-display-name etag size
+  #
+
+  local buckets=$(skim-stdin "$@")
+  [[ -z "$buckets" ]] && __bma_usage "bucket [bucket]" && return 1
+
+  local bucket
+  for bucket in $buckets; do
+    aws s3api list-objects \
+      --bucket "$bucket"   \
+      --output text        \
+      --query "Contents[].[Key, LastModified, StorageClass, Owner.DisplayName, ETag, Size]"
+  done
+}
+
 
 bucket-remove() {
 
@@ -116,47 +137,3 @@ bucket-remove-force() {
   fi
 }
 
-
-s3-ls() {
-
-  # List of S3 Bucket Objects.
-  #
-  #     $ s3-ls example-bucket
-  #     object-key
-  #     another-object-key
-  #
-
-  local buckets=$(skim-stdin "$@")
-  [[ -z "$buckets" ]] && __bma_usage "bucket [bucket]" && return 1
-
-  local bucket
-  for bucket in $buckets; do
-    aws s3api list-objects \
-      --bucket "$bucket"   \
-      --output text        \
-      --query "Contents[].[Key]"
-  done
-}
-
-
-s3-lsl() {
-
-  # Detail List of S3 Bucket Objects.
-  #
-  #     $ s3-lsl another-example-bucket
-  #     object-key         last-modified storage-class owner-display-name etag size
-  #     another-object-key last-modified storage-class owner-display-name etag size
-  #
-
-  local buckets=$(skim-stdin "$@")
-  [[ -z "$buckets" ]] && __bma_usage "bucket [bucket]" && return 1
-
-  local bucket
-  for bucket in $buckets; do
-    aws s3api list-objects \
-      --bucket "$bucket"   \
-      --output text        \
-      --query "Contents[].[Key, LastModified, StorageClass, Owner.DisplayName, ETag, Size]"
-  done
-}
-