JumboInteractiveLimited · kevinh-jumbo · Feb 3, 2021 · Nov 17, 2023 · Mar 22, 2024 · Mar 25, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,9 +1,5 @@
 version: 2.1
 
-notify:
-  webhooks:
-    - url: 'https://webhooks.gitter.im/e/cc6aefa009b39156b845'
-
 workflows:
   version: 2
 
@@ -46,45 +42,36 @@ jobs:
 
   Shfmt:
     docker:
-      - image: golang:1.12
+      - image: mvdan/shfmt:v3-alpine
     steps:
       - checkout
 
-      - run:
-          name: install
-          command: go get mvdan.cc/sh/cmd/shfmt
-
       - run:
           name: check
           command: shfmt -d -ln=posix -s .
 
   GolangCI-Lint:
     docker:
-      - image: golang:1.12
+      - image: golangci/golangci-lint:v1.57.1
     steps:
       - checkout
 
-      - run:
-          name: install
-          command: |
-              curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0
-
       - run:
           name: get deps
-          command: go mod download
+          command: cd completion && go mod download
           environment:
             GO111MODULE: 'on'
 
       - run:
           name: check
           command: |
               ./scripts/compgen.sh
-              cd completion && golangci-lint run --deadline 4m --enable-all --disable dupl,lll,gochecknoglobals,gochecknoinits
+              cd completion && golangci-lint run --timeout 4m --enable-all --disable dupl,lll,gochecknoglobals,gochecknoinits,depguard,exhaustivestruct,exhaustruct,gomnd,varnamelen,nonamedreturns,wsl,ireturn,gofumpt
 
 
   'Danger Automated Code Review':
     docker:
-      - image: circleci/node:latest
+      - image: cimg/node:lts
     steps:
       - checkout
 
@@ -100,16 +87,22 @@ jobs:
       - checkout
 
       - run:
-          name: Install Docker Compose
+          name: Install Docker Compose v2
           command: |
-            curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+            curl -sSL "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m)" -o ~/docker-compose
+            mkdir -p ~/.docker/cli-plugins
             chmod +x ~/docker-compose
-            sudo mv ~/docker-compose /usr/local/bin/docker-compose
+            mv ~/docker-compose ~/.docker/cli-plugins/docker-compose
 
       - run:
           name: Build Image
           command: ./scripts/build.sh
 
+      - run:
+          name: Create tmp folder
+          command:
+            mkdir -p /tmp
+
       - run:
           name: Smoke Tests
           command: script -qec './scripts/test.sh'
@@ -119,6 +112,7 @@ jobs:
 
       - store_test_results:
           path: /tmp/dab/test_results
+
       - run:
           name: Clear test results
           when: on_fail
@@ -133,6 +127,7 @@ jobs:
 
       - store_test_results:
           path: /tmp/dab/test_results
+
       - run:
           name: Clear test results
           when: on_fail
@@ -145,11 +140,12 @@ jobs:
       - checkout
 
       - run:
-          name: Install Docker Compose
+          name: Install Docker Compose v2
           command: |
-            curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+            curl -sSL "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m)" -o ~/docker-compose
+            mkdir -p ~/.docker/cli-plugins
             chmod +x ~/docker-compose
-            sudo mv ~/docker-compose /usr/local/bin/docker-compose
+            mv ~/docker-compose ~/.docker/cli-plugins/docker-compose
 
       - run:
           name: UX Regression Tests
@@ -159,6 +155,7 @@ jobs:
 
       - store_test_results:
           path: /tmp/dab/test_results
+
       - run:
           name: Clear test results
           when: on_fail
@@ -171,12 +168,12 @@ jobs:
       - checkout
 
       - run:
-          name: Install Docker Compose
+          name: Install Docker Compose v2
           command: |
-            curl -L https://github.com/docker/compose/releases/download/1.19.0/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+            curl -sSL "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-$(uname -s)-$(uname -m)" -o ~/docker-compose
+            mkdir -p ~/.docker/cli-plugins
             chmod +x ~/docker-compose
-            sudo mv ~/docker-compose /usr/local/bin/docker-compose
-
+            mv ~/docker-compose ~/.docker/cli-plugins/docker-compose 
 
       - run:
           name: Profile

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+.idea
+
 /tests/vendor
 /tests/node_modules
 /completion/completion

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage for compiling shell completion binary.
-FROM golang:1.12 AS completion
+FROM golang:1.22 AS completion
 
 WORKDIR $GOPATH/src/app/completion
 
@@ -17,10 +17,11 @@ RUN cd ../ \
  && ./compgen.sh
 
 ENV CGO_ENABLED=0 \
-    GOARCH=386
+    GOARCH=amd64
 
 RUN GOOS=linux go build -a -installsuffix cgo -ldflags='-w -s' -o /usr/bin/dab-completion-linux .
 RUN GOOS=darwin go build -a -installsuffix cgo -ldflags='-w -s' -o /usr/bin/dab-completion-darwin .
+RUN GOOS=darwin GOARCH=arm64 go build -a -installsuffix cgo -ldflags='-w -s' -o /usr/bin/dab-completion-m1 .
 
 
 # This phase generates versioning artifacts from git.
@@ -69,15 +70,15 @@ LABEL org.label-schema.schema-version="1.0" \
 # they are to be kept at a lower layer for caching.
 RUN apk add --no-cache --virtual .toolchain \
     python3-dev libffi-dev openssl-dev build-base \
- && apk add --no-cache docker-cli python3 py3-pip py3-cryptography \
+ && apk add --no-cache asciinema docker-cli docker-cli-buildx docker-cli-compose python3 py3-pip py3-cryptography \
  && rm -f /usr/bin/dockerd /usr/bin/docker-containerd* \
- && pip3 install "docker-compose>=1.24.0,<1.25.0" asciinema \
  && apk del .toolchain \
  && rm -rf ~/.cache
 
 # Misc tools required for scripts.
 RUN apk add --no-cache git openssh tree util-linux jq nss-tools multitail ca-certificates highlight libintl entr postgresql-client task bash \
- && pip3 install yq \
+ && wget -O /usr/bin/yq https://github.com/mikefarah/yq/releases/download/v4.44.1/yq_linux_amd64 \
+ && chmod +x /usr/bin/yq \
  && echo "check_mail:0" >> /etc/multitail.conf \
  && chmod 666 /etc/passwd
 

diff --git a/README.md b/README.md
@@ -183,7 +183,7 @@ The following projects are used to write dab:
 - [docker-compose-gen][9]
 - [yq][10]
 - [jq][11]
-- [docker-compose][12]
+- [docker compose][12]
 - [shellcheck][13]
 - [complete][14]
 

diff --git a/app/bin/dar-link-dest b/app/bin/dar-link-dest
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-export HOST_PWD=$PWD
+export HOST_PWD="$PWD"
 exec dab apps run "$(basename "$0")" "$@"
diff --git a/app/bin/maybe_update_wrapper b/app/bin/maybe_update_wrapper
@@ -5,10 +5,12 @@ file_hash() {
 	"${FILE_HASH_ALGO:-md5}sum" "$1" | cut -d' ' -f1
 }
 
-if [ "${DAB_AUTOUPDATE:-true}" = 'false' ] || [ "${DAB_AUTOUPDATE_WRAPPER:-true}" = 'false' ] || ! [ -f /tmp/wrapper ] || ! [ -f "$DAB/dab" ]; then
+DAB_WRAPPER_FILENAME="$(basename "$DAB_WRAPPER_PATH")"
+
+if [ "${DAB_AUTOUPDATE:-true}" = 'false' ] || [ "${DAB_AUTOUPDATE_WRAPPER:-true}" = 'false' ] || ! [ -f "/tmp/wrapper/$DAB_WRAPPER_FILENAME" ] || ! [ -f "$DAB/dab" ]; then
 	return 0
-elif [ -r /tmp/wrapper ] && [ -r "$DAB/dab" ] && [ "$(file_hash "$DAB/dab")" != "$(file_hash /tmp/wrapper)" ]; then
-	if cat "$DAB/dab" >/tmp/wrapper; then
+elif [ -r "/tmp/wrapper/$DAB_WRAPPER_FILENAME" ] && [ -r "$DAB/dab" ] && [ "$(file_hash "$DAB/dab")" != "$(file_hash "/tmp/wrapper/$DAB_WRAPPER_FILENAME")" ]; then
+	if cat "$DAB/dab" >"/tmp/wrapper/$DAB_WRAPPER_FILENAME"; then
 		warn "Dab wrapper script at $DAB_WRAPPER_PATH was updated!"
 	else
 		error "Dab wrapper script at $DAB_WRAPPER_PATH could NOT be automatically updated!"

diff --git a/app/bin/query_user b/app/bin/query_user
@@ -5,7 +5,7 @@ set -eu
 
 message="${1:-Are you sure you would like to proceed?}"
 while true; do
-	# shellcheck disable=SC2039
+	# shellcheck disable=SC3045
 	read -r -p "$message " yn
 	case $yn in
 	[Yy]*) return 0 ;;

diff --git a/app/docker/Dockerfile.ansible b/app/docker/Dockerfile.ansible
@@ -1,18 +1,23 @@
 FROM alpine:3.10.0
 
 RUN apk add --no-cache --virtual build-dependencies \
-      gcc musl-dev libffi-dev openssl-dev python-dev \
+      gcc musl-dev libffi-dev openssl-dev python3-dev \
  && apk add --no-cache \
-      bash curl tar openssh-client sshpass git python py-boto py-dateutil \
+      bash curl tar openssh-client sshpass git python3 py-boto py-dateutil \
       py-httplib2 py-jinja2 py-paramiko py-pip ca-certificates docker \
- && pip install python-keyczar docker-compose
+ && python3 -m pip install --upgrade pip \
+ && pip install python-keyczar
+
+RUN DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} \
+      mkdir -p $DOCKER_CONFIG/cli-plugins
+ADD https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64 $HOME/.docker/cli-plugins/docker-compose
 
 RUN mkdir -p /etc/ansible /ansible/playbooks \
  && echo "[local]" >> /etc/ansible/hosts \
  && echo "localhost" >> /etc/ansible/hosts
 WORKDIR /ansible/playbooks
 
-ARG ANSIBLE_VERSION=2.7.1
+ARG ANSIBLE_VERSION=2.11
 ENV ANSIBLE_VERSION="${ANSIBLE_VERSION}" \
     ANSIBLE_GATHERING=smart \
     ANSIBLE_HOST_KEY_CHECKING=false \

diff --git a/app/docker/Dockerfile.cartography b/app/docker/Dockerfile.cartography
@@ -1,5 +1,6 @@
 FROM python:3
 
-RUN pip install cartography
+RUN python3 -m pip install --upgrade pip && \
+    pip install cartography
 
 ENTRYPOINT ["/usr/local/bin/cartography","--neo4j-uri=bolt://neo4j:7687"]
diff --git a/app/docker/Dockerfile.cyberchef b/app/docker/Dockerfile.cyberchef
@@ -1,4 +1,7 @@
 ARG NGINX_TAG=alpine
 FROM "nginx:$NGINX_TAG"
 
-ADD --chown=nginx:nginx https://gchq.github.io/CyberChef/cyberchef.htm /usr/share/nginx/html/index.html
+WORKDIR /usr/share/nginx/html
+
+RUN wget -qO- https://github.com/gchq/CyberChef/releases/download/v10.8.2/CyberChef_v10.8.2.zip \
+	| busybox unzip - && chown nginx:nginx * -R
diff --git a/app/docker/Dockerfile.dive b/app/docker/Dockerfile.dive
@@ -1,5 +1,5 @@
-FROM centos:latest
+FROM rockylinux:9
 
-ARG DIVE_VERSION=0.4.1
+ARG DIVE_VERSION=0.12.0
 RUN yum install -y "https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.rpm"
 ENTRYPOINT ["/usr/local/bin/dive"]
diff --git a/app/docker/Dockerfile.fn b/app/docker/Dockerfile.fn
@@ -13,13 +13,15 @@ RUN apt-get update \
      curl \
      gnupg2 \
      software-properties-common \
- && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
- && add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/debian \
-   $(lsb_release -cs) \
-   stable" \
+ && install -m 0755 -d /etc/apt/keyrings \
+ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \
+ && chmod a+r /etc/apt/keyrings/docker.asc \
+ && echo \
+   "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+   $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+   tee /etc/apt/sources.list.d/docker.list > /dev/null \
  && apt-get update \
- && apt-get install -y docker-ce \
+ && apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \
  && rm -rf /var/lib/apt/lists/*
 
 COPY --from=download /usr/bin/fn /usr/bin/fn

diff --git a/app/docker/Dockerfile.remote_syslog2 b/app/docker/Dockerfile.remote_syslog2
@@ -1,7 +1,6 @@
 FROM golang:latest
 
-RUN go get -d -v github.com/papertrail/remote_syslog2 \
- && go install github.com/papertrail/remote_syslog2
+RUN go install github.com/papertrail/remote_syslog2
 
 COPY configs/remote_syslog2.yml /etc/log_files.yml
 

diff --git a/app/docker/Dockerfile.sam b/app/docker/Dockerfile.sam
@@ -1,3 +1,3 @@
 FROM python:3
 
-RUN pip install awscli aws-sam-cli
+RUN pip install awscliv2 aws-sam-cli
diff --git a/app/docker/Dockerfile.vault b/app/docker/Dockerfile.vault
@@ -1,5 +1,5 @@
 ARG VAULT_TAG=latest
-FROM "vault:$VAULT_TAG"
+FROM "hashicorp/vault:$VAULT_TAG"
 
 COPY configs/vault.hcl /vault/config/
 

diff --git a/app/docker/Dockerfile.xsstrike b/app/docker/Dockerfile.xsstrike
@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-RUN apk add --no-cache ca-certificates python3 py3-pip git \
+RUN apk add --no-cache ca-certificates python3 py3-pip git \ 
  && update-ca-certificates
 
 ARG XSSTRIKE_VERSION=3.0.3
@@ -12,6 +12,6 @@ RUN mkdir -p /opt \
  && git checkout ${XSSTRIKE_VERSION} \
  && chmod +x xsstrike.py
 
-RUN pip3 install -r /opt/xsstrike/requirements.txt
+RUN pip3 install --break-system-packages -r /opt/xsstrike/requirements.txt
 
 ENTRYPOINT ["/opt/xsstrike/xsstrike.py"]
diff --git a/app/docker/configs/docker-gen/templates/telegraf.conf.tmpl b/app/docker/configs/docker-gen/templates/telegraf.conf.tmpl
@@ -62,7 +62,7 @@
   ## Precision will NOT be used for service inputs. It is up to each individual
   ## service input to set the timestamp at the appropriate precision.
   ## Valid time units are "ns", "us" (or "µs"), "ms", "s".
-  precision = "s"
+  precision = "1s"
 
   ## Logging configuration:
   ## Run telegraf with debug log messages.
@@ -112,8 +112,8 @@
   # timeout = "5s"
 
   ## HTTP Basic Auth
-  # username = "telegraf"
-  # password = "metricsmetricsmetricsmetrics"
+  username = "root"
+  password = "root"
 
   ## HTTP User-Agent
   # user_agent = "telegraf"
@@ -508,7 +508,7 @@
 #
 #   ## Whether to report for each container per-device blkio (8:0, 8:1...) and
 #   ## network (eth0, eth1, ...) stats or not
-#   perdevice = true
+#   perdevice_include = true
 #   ## Whether to report for each container total blkio and network stats or not
 #   total = false
 #   ## Which environment variables should we use as a tag
@@ -587,7 +587,7 @@
 # HTTP/HTTPS request given an address a method and a timeout
 [[inputs.http_response]]
   ## Server address (default http://localhost)
-  address = "http://tick:8888"
+  urls = ["http://tick:8888"]
 
   ## Set http_proxy (telegraf uses the system wide proxy settings if it's is not set)
   # http_proxy = "http://localhost:8888"
@@ -922,7 +922,7 @@
 ###############################################################################
 
 # Influx HTTP write listener
-[[inputs.http_listener]]
+[[inputs.http_listener_v2]]
   ## Address and port to host HTTP listener on
   service_address = ":8086"
 
@@ -1006,7 +1006,7 @@
 
   ## Parses tags in the datadog statsd format
   ## http://docs.datadoghq.com/guides/dogstatsd/
-  parse_data_dog_tags = true
+  datadog_extensions = true
 
   ## Statsd data translation templates, more info can be read here:
   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md#graphite