Skip to content

Commit fe929f2

Browse files
committed
Merge branch 'develop'
2 parents cf4798c + c7b9d92 commit fe929f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+245
-355
lines changed

java/editorconfig/.editorconfig renamed to .editorconfig

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,6 +1749,38 @@ ij_properties_spaces_around_key_value_delimiter = false
17491749
[{*.qute.htm,*.qute.html,*.qute.json,*.qute.txt,*.qute.yaml,*.qute.yml}]
17501750
ij_qute_keep_indents_on_empty_lines = false
17511751

1752+
[{*.hcl,*.nomad}]
1753+
ij_hcl_indent_size = 2
1754+
ij_hcl_array_wrapping = normal
1755+
ij_hcl_keep_blank_lines_in_code = 1
1756+
ij_hcl_keep_indents_on_empty_lines = false
1757+
ij_hcl_keep_line_breaks = true
1758+
ij_hcl_object_wrapping = normal
1759+
ij_hcl_property_alignment = on_equals
1760+
ij_hcl_property_line_commenter_character = 1
1761+
ij_hcl_space_after_comma = true
1762+
ij_hcl_space_before_comma = false
1763+
ij_hcl_spaces_around_assignment_operators = true
1764+
ij_hcl_spaces_within_braces = false
1765+
ij_hcl_spaces_within_brackets = false
1766+
ij_hcl_wrap_long_lines = false
1767+
1768+
[{*.tf,*.tfvars}]
1769+
ij_hcl-terraform_indent_size = 2
1770+
ij_hcl-terraform_array_wrapping = normal
1771+
ij_hcl-terraform_keep_blank_lines_in_code = 1
1772+
ij_hcl-terraform_keep_indents_on_empty_lines = false
1773+
ij_hcl-terraform_keep_line_breaks = true
1774+
ij_hcl-terraform_object_wrapping = normal
1775+
ij_hcl-terraform_property_alignment = on_equals
1776+
ij_hcl-terraform_property_line_commenter_character = 1
1777+
ij_hcl-terraform_space_after_comma = true
1778+
ij_hcl-terraform_space_before_comma = false
1779+
ij_hcl-terraform_spaces_around_assignment_operators = true
1780+
ij_hcl-terraform_spaces_within_braces = false
1781+
ij_hcl-terraform_spaces_within_brackets = false
1782+
ij_hcl-terraform_wrap_long_lines = false
1783+
17521784
[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
17531785
ij_toml_keep_indents_on_empty_lines = false
17541786

@@ -1760,6 +1792,9 @@ ij_yaml_block_mapping_on_new_line = false
17601792
ij_yaml_indent_sequence_value = true
17611793
ij_yaml_keep_indents_on_empty_lines = false
17621794
ij_yaml_keep_line_breaks = true
1795+
ij_yaml_line_comment_add_space = true
1796+
ij_yaml_line_comment_add_space_on_reformat = true
1797+
ij_yaml_line_comment_at_first_column = false
17631798
ij_yaml_sequence_on_new_line = false
17641799
ij_yaml_space_before_colon = false
17651800
ij_yaml_spaces_within_braces = true

aws/aws-cli-commands.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
######################################################################
22

3-
function aws() { echo "+ aws ${@}">&2; command aws "${@}"; }
4-
53
alias aws="docker container run --rm -it -v ~/.aws:/root/.aws -v \$(pwd):/aws amazon/aws-cli"
64

75
######################################################################
@@ -10,9 +8,8 @@ docker container run --rm -it amazon/aws-cli --version
108
docker container run --rm -it -v ~/.aws:/root/.aws amazon/aws-cli --version
119
docker container run --rm -it -v ~/.aws:/root/.aws -v $(pwd):/aws amazon/aws-cli --version
1210

13-
mkdir ~/.aws
1411
docker container run --rm -it -v ~/.aws:/root/.aws amazon/aws-cli configure
15-
# aws configure
12+
aws configure
1613
### AWS Access Key ID [None]:
1714
### AWS Secret Access Key [None]:
1815
### Default region name [None]:

aws/localstack/start-localstack.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

confluent/command/confluent-commands.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
######################################################################
22

3+
### process
4+
35
alias killzookeeper="sudo pkill -9 -ecf \"org\.apache\.zookeeper\.server\.quorum\.QuorumPeerMain\""
46
alias killkafka="sudo pkill -9 -ecf \"kafka\.Kafka\""
57
alias killschemaregistry="sudo pkill -9 -ecf \"io\.confluent\.kafka\.schemaregistry\.rest\.SchemaRegistryMain\""
@@ -10,4 +12,6 @@ alias killcontrolcenter="sudo pkill -9 -ecf \"io\.confluent\.controlcenter\.Cont
1012

1113
alias killconfluent="killzookeeper; killkafka; killschemaregistry; killkafkaconnect; killkafkarest; killksqldb; killcontrolcenter;"
1214

15+
######################################################################
16+
1317
function cdconfluent() { DIRECTORY="/usr/local/confluent"; echo "+ cd ${DIRECTORY}">&2; command cd ${DIRECTORY} || exit; STATUS="${?}"; if [ "${STATUS}" -eq "0" ]; then ls --almost-all -l; fi; }

coredns/coredns-commands.sh

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
######################################################################
2+
3+
### start
4+
sudo /usr/local/bin/coredns \
5+
-conf ${COREDNS_HOME}/corefile-server.conf \
6+
-pidfile ${COREDNS_HOME}/coredns.pid
7+
8+
### start with nohup
9+
sudo nohup /usr/local/bin/coredns \
10+
-conf ${COREDNS_HOME}/corefile-server.conf \
11+
-pidfile ${COREDNS_HOME}/coredns.pid \
12+
> ${COREDNS_HOME}/nohup.coredns.out 2>&1 &
13+
sleep 1
14+
sudo chown $(id -un):$(id -gn) ${COREDNS_HOME}/coredns.pid
15+
16+
######################################################################
17+
18+
### kill
19+
sudo pkill --echo --count --pidfile ${COREDNS_HOME}/coredns.pid
20+
sudo kill -9 $(cat ${COREDNS_HOME}/coredns.pid)

coredns/start-coredns.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

coredns/stop-coredns.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

docker/docker-commands.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
######################################################################
22

3-
function docker() { echo "+ docker ${@}">&2; command docker "${@}"; }
4-
5-
alias pxdockerd="sudo pgrep -xa dockerd | grep dockerd"
6-
alias pxdockerproxy="sudo pgrep -xa docker-proxy | grep docker-proxy"
3+
### process
4+
sudo pgrep -xa dockerd | grep dockerd
5+
sudo pgrep -xa docker-proxy | grep docker-proxy
76

87
######################################################################
98

docker/docker-compose-commands.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
######################################################################
22

3-
alias docker-compose="docker compose"
4-
function docker() { echo "+ docker ${@}">&2; command docker "${@}"; }
5-
6-
function docker-compose() { echo "+ docker-compose ${@}">&2; command docker-compose "${@}"; }
7-
8-
######################################################################
9-
103
docker compose version
11-
124
docker compose config
13-
145
docker compose logs
156
docker compose logs --follow
167

git/git-commands.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
######################################################################
22

3-
function git() { echo "+ git ${@}">&2; command git "${@}"; }
4-
53
### debug
64
GIT_TRACE=1 git push origin main
75

8-
function gclo() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -z "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
6+
######################################################################
7+
8+
git clone <REPO_URL>
9+
git clone --recurse-submodules <REPO_URL>
10+
11+
function git-clone-lower() { REPO_URL="${1}"; DIR_NAME="${2}"; if [ -z "${DIR_NAME}" ]; then REPO_NAME="${DIR_NAME}"; else REPO_NAME=$(basename "${REPO_URL}" .git | tr '[:upper:]' '[:lower:]'); fi; echo "+ git clone ${REPO_URL} ${REPO_NAME}">&2; command git clone ${REPO_URL} ${REPO_NAME}; }
912

1013
######################################################################
1114

0 commit comments

Comments
 (0)