Skip to content

Commit 775ff93

Browse files
committed
Merge branch 'feat/BMA-4-build-hygiene'
2 parents dae20a6 + da4182b commit 775ff93

File tree

7 files changed

+453
-4
lines changed

7 files changed

+453
-4
lines changed

.github/workflows/build-check.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Build Check
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
8+
9+
jobs:
10+
check-generated-files:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Check generated files are up to date
16+
run: make check

Makefile

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
1+
.PHONY: build build-verbose test run_tests check clean install-hooks
2+
3+
build:
4+
@./scripts/build > /dev/null 2>&1
5+
@echo "Build complete."
6+
@echo " Functions: $$(wc -l < functions | tr -d ' ')"
7+
@echo " Aliases: $$(grep -c '^alias ' aliases)"
8+
@if ! git diff --quiet aliases functions bash_completion.sh 2>/dev/null; then \
9+
echo ""; \
10+
echo "Changed files:"; \
11+
git diff --stat aliases functions bash_completion.sh; \
12+
fi
13+
14+
build-verbose:
15+
./scripts/build
16+
117
test: run_tests
218

319
run_tests:
420
'./test/shared-spec.sh'
521
'./test/stack-spec.sh'
22+
23+
check:
24+
@echo "Checking if generated files are up to date..."
25+
@./scripts/build > /dev/null 2>&1
26+
@if git diff --quiet aliases functions bash_completion.sh; then \
27+
echo "✓ Generated files are up to date"; \
28+
else \
29+
echo "✗ Generated files are out of date. Run 'make build' to update."; \
30+
git diff --stat aliases functions bash_completion.sh; \
31+
exit 1; \
32+
fi
33+
34+
clean:
35+
@echo "Restoring generated files to git HEAD..."
36+
git checkout -- aliases functions bash_completion.sh
37+
38+
install-hooks:
39+
@echo "Installing git hooks..."
40+
ln -sf ../../scripts/hooks/pre-push .git/hooks/pre-push
41+
@echo "✓ pre-push hook installed"

aliases

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ alias backup-jobs='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma backup-jobs'
7373
alias bucket-acls='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma bucket-acls'
7474
alias bucket-remove='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma bucket-remove'
7575
alias bucket-remove-force='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma bucket-remove-force'
76+
alias bucket-size='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma bucket-size'
7677
alias buckets='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma buckets'
7778
alias cert-chain='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma cert-chain'
7879
alias cert-delete='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma cert-delete'
@@ -84,6 +85,10 @@ alias certs='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma certs'
8485
alias certs-arn='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma certs-arn'
8586
alias cloudtrail-status='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma cloudtrail-status'
8687
alias cloudtrails='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma cloudtrails'
88+
alias cloudwatch-alarm-actions-disable='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma cloudwatch-alarm-actions-disable'
89+
alias cloudwatch-alarm-actions-enable='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma cloudwatch-alarm-actions-enable'
90+
alias cloudwatch-alarm-delete='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma cloudwatch-alarm-delete'
91+
alias cloudwatch-alarms='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma cloudwatch-alarms'
8792
alias columnise='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma columnise'
8893
alias connector-group-apps='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma connector-group-apps'
8994
alias connector-group-members='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma connector-group-members'
@@ -94,6 +99,9 @@ alias deployment-delete-danger='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma deployme
9499
alias deployment-groups='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma deployment-groups'
95100
alias deployments-group='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma deployments-group'
96101
alias distributions='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma distributions'
102+
alias domain-autorenew-disable='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma domain-autorenew-disable'
103+
alias domain-autorenew-enable='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma domain-autorenew-enable'
104+
alias domains='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma domains'
97105
alias ecr-repositories='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecr-repositories'
98106
alias ecr-repository-images='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma ecr-repository-images'
99107
alias elb-azs='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma elb-azs'
@@ -109,6 +117,7 @@ alias elbv2-dnsname='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma elbv2-dnsname'
109117
alias elbv2-subnets='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma elbv2-subnets'
110118
alias elbv2-target-groups='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma elbv2-target-groups'
111119
alias elbv2s='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma elbv2s'
120+
alias hosted-zone-delete='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma hosted-zone-delete'
112121
alias hosted-zone-ns-records='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma hosted-zone-ns-records'
113122
alias hosted-zones='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma hosted-zones'
114123
alias iam-access-key-rotate='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma iam-access-key-rotate'
@@ -144,6 +153,7 @@ alias instance-tag='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma instance-tag'
144153
alias instance-tag-create='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma instance-tag-create'
145154
alias instance-tag-delete='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma instance-tag-delete'
146155
alias instance-tags='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma instance-tags'
156+
alias instance-tags-v2='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma instance-tags-v2'
147157
alias instance-terminate='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma instance-terminate'
148158
alias instance-termination-protection='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma instance-termination-protection'
149159
alias instance-termination-protection-disable='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma instance-termination-protection-disable'
@@ -179,7 +189,15 @@ alias location-unset='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma location-unset'
179189
alias locations='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma locations'
180190
alias log-groups='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma log-groups'
181191
alias management-groups='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma management-groups'
192+
alias network-interfaces='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma network-interfaces'
193+
alias nics='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma nics'
182194
alias pcxs='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma pcxs'
195+
alias private-dns-zone-a-record-add='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma private-dns-zone-a-record-add'
196+
alias private-dns-zone-a-record-delete='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma private-dns-zone-a-record-delete'
197+
alias private-dns-zone-record-sets='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma private-dns-zone-record-sets'
198+
alias private-dns-zones='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma private-dns-zones'
199+
alias private-endpoint-custom-dns-configs='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma private-endpoint-custom-dns-configs'
200+
alias private-endpoints='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma private-endpoints'
183201
alias rds-db-clusters='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma rds-db-clusters'
184202
alias rds-db-instances='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma rds-db-instances'
185203
alias region-each='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma region-each'
@@ -217,6 +235,9 @@ alias stack-cancel-update='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-cancel-
217235
alias stack-create='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-create'
218236
alias stack-delete='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-delete'
219237
alias stack-diff='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-diff'
238+
alias stack-drift-detect='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-drift-detect'
239+
alias stack-drift-resources='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-drift-resources'
240+
alias stack-drift-status='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-drift-status'
220241
alias stack-elbs='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-elbs'
221242
alias stack-events='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-events'
222243
alias stack-exports='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-exports'
@@ -237,19 +258,26 @@ alias stack-update='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-update'
237258
alias stack-validate='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stack-validate'
238259
alias stacks='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma stacks'
239260
alias sts-assume-role='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma sts-assume-role'
261+
alias subnet-ips='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma subnet-ips'
240262
alias subnets='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma subnets'
241263
alias subscription='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma subscription'
242264
alias subscription-each='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma subscription-each'
243265
alias subscription-unset='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma subscription-unset'
244266
alias subscriptions='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma subscriptions'
267+
alias subscriptions-each='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma subscriptions-each'
245268
alias tag-keys='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma tag-keys'
269+
alias tag-split='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma tag-split'
246270
alias tag-values='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma tag-values'
247271
alias target-group-targets='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma target-group-targets'
248272
alias target-groups='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma target-groups'
273+
alias vnet-dns-resolvers='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vnet-dns-resolvers'
274+
alias vnet-subnets='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vnet-subnets'
275+
alias vnets='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vnets'
249276
alias vpc-az-count='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vpc-az-count'
250277
alias vpc-azs='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vpc-azs'
251278
alias vpc-default-delete='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vpc-default-delete'
252279
alias vpc-dhcp-options-ntp='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vpc-dhcp-options-ntp'
280+
alias vpc-endpoint-policy='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vpc-endpoint-policy'
253281
alias vpc-endpoint-services='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vpc-endpoint-services'
254282
alias vpc-endpoints='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vpc-endpoints'
255283
alias vpc-igw='${BMA_HOME:-$HOME/.bash-my-aws}/bin/bma vpc-igw'
@@ -270,5 +298,8 @@ function region() {
270298
echo "${AWS_DEFAULT_REGION:-'AWS_DEFAULT_REGION not set'}";
271299
else
272300
export AWS_DEFAULT_REGION="$inputs";
301+
if [[ -n $AWS_REGION ]]; then
302+
export AWS_REGION="$AWS_DEFAULT_REGION";
303+
fi;
273304
fi
274305
}

bash_completion.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ complete -F _bma_aws-accounts_completion aws-accounts
175175
complete -F _bma_buckets_completion bucket-acls
176176
complete -F _bma_buckets_completion bucket-remove
177177
complete -F _bma_buckets_completion bucket-remove-force
178+
complete -F _bma_buckets_completion bucket-size
178179
complete -F _bma_buckets_completion buckets
179180
complete -F _bma_certs_completion cert-chain
180181
complete -F _bma_certs_completion cert-delete
@@ -224,6 +225,7 @@ complete -F _bma_instances_completion instance-tag
224225
complete -F _bma_instances_completion instance-tag-create
225226
complete -F _bma_instances_completion instance-tag-delete
226227
complete -F _bma_instances_completion instance-tags
228+
complete -F _bma_instances_completion instance-tags-v2
227229
complete -F _bma_instances_completion instance-terminate
228230
complete -F _bma_instances_completion instance-termination-protection
229231
complete -F _bma_instances_completion instance-termination-protection-disable
@@ -242,6 +244,9 @@ complete -F _bma_stacks_completion stack-asgs
242244
complete -F _bma_stacks_completion stack-cancel-update
243245
complete -F _bma_stacks_completion stack-delete
244246
complete -F _bma_stacks_completion stack-diff
247+
complete -F _bma_stacks_completion stack-drift-detect
248+
complete -F _bma_stacks_completion stack-drift-resources
249+
complete -F _bma_stacks_completion stack-drift-status
245250
complete -F _bma_stacks_completion stack-elbs
246251
complete -F _bma_stacks_completion stack-events
247252
complete -F _bma_stacks_completion stack-exports
@@ -261,6 +266,7 @@ complete -F _bma_target-groups_completion target-group-targets
261266
complete -F _bma_target-groups_completion target-groups
262267
complete -F _bma_vpcs_completion vpc-az-count
263268
complete -F _bma_vpcs_completion vpc-azs
269+
complete -F _bma_vpcs_completion vpc-endpoint-policy
264270
complete -F _bma_vpcs_completion vpc-endpoints
265271
complete -F _bma_vpcs_completion vpc-igw
266272
complete -F _bma_vpcs_completion vpc-lambda-functions

0 commit comments

Comments
 (0)