fakegit · pull · May 1, 2023 · May 5, 2023 · May 5, 2023 · May 5, 2023
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -4,19 +4,36 @@
 #
 #  vim:ts=2:sts=2:sw=2:et
 #
-#  https://github.com/harisekhon/devops-python-tools
+#  https://github.com/HariSekhon/DevOps-Python-tools
 #
 #  License: see accompanying Hari Sekhon LICENSE file
 #
 #  If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
 #
-#  https://www.linkedin.com/in/harisekhon
+#  https://www.linkedin.com/in/HariSekhon
 #
 
+# ============================================================================ #
+#                             A p p V e y o r   C I
+# ============================================================================ #
+
 # https://www.appveyor.com/docs/appveyor-yml/
 
 image: Ubuntu
 
+# workaround for default JDK9 have old CA certs:
+#
+#   https://github.com/appveyor/ci/issues/3833
+#
+#   https://www.appveyor.com/docs/getting-started-with-appveyor-for-linux/#configuring-language-stack
+#
+stack: jdk 15
+
+skip_commits:
+  files:
+    - docs/*
+    - '**/*.md'
+
 # https://www.appveyor.com/docs/how-to/ssh-to-build-worker/
 environment:
   APPVEYOR_SSH_KEY: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvihSRU+YjBKvKiacDfUoZ7ghoVMcwNh4cWIYUNFGZosXOzNtyOcBpIb71TCgLFhOd+aMWKXCEC67BpNSIjt+a/FLD27AwmgVHv6cPlE3G0JJ9zmIrNmx9511dshTsxUW2O0SbYG+3InuO7FUkSrld+kA1OucyjgmZU7/+Cs9shpAEOaIVYmGlpDGRucAHpwtckvdgRTtnA3WNZ/Qg1vU6Ik4Xm03vjrW6lSiuTffYO1kbdcMQ4IZBlzfmovOtXQ0PomvN5NMCpgOyQuoNlvyS11tOXoqNiWOkiLE15XEzAQth9hHbNiH8jHJbAtkHqWWh0KK4IUyNGvoL6QfNxsTlw== hari@anotherdimension
@@ -37,34 +54,36 @@ on_finish:
   #
   #     https://github.com/appveyor/ci/pull/3385
   #
-  #- sh: curl -sflL 'https://raw.githubusercontent.com/HariSekhon/devops-python-tools/master/setup/install_openssh.sh' | bash -e -
+  #- sh: curl -sflL 'https://raw.githubusercontent.com/HariSekhon/DevOps-Python-tools/master/install/install_openssh.sh' | bash -e -
+  #
+  # https://www.appveyor.com/docs/how-to/ssh-to-build-worker/
   - sh: if [ "$APPVEYOR_SSH_BLOCK" = true ]; then curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -; fi
 
 install:
-# workaround for:
-# Some packages could not be installed. This may mean that you have
-# requested an impossible situation or if you are using the unstable
-# distribution that some required packages have not yet been created
-# or been moved out of Incoming.
-# The following information may help to resolve the situation:
-#
-# The following packages have unmet dependencies:
-#  mssql-server : Depends: libsasl2-modules-gssapi-mit but it is not going to be installed
-#  E: Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages.
-#  devops-python-tools/Makefile.in:272: recipe for target 'apt-packages' failed
-#  make[2]: *** [apt-packages] Error 123
-#  make[2]: Leaving directory '/home/appveyor/projects/pylib'
-#  devops-python-tools/Makefile.in:212: recipe for target 'system-packages' failed
-#
-#  adding "|| :" to the end of these commands causes them to be silently ignored!
-- sudo sed -i '/https:\/\/packages.microsoft.com\/ubuntu\/.*\/mssql-server/d' /etc/apt/sources.list
-- sudo apt purge -qy --allow-change-held-packages mssql-server
-# this prevents conflicts installing default-jdk - see https://github.com/appveyor/ci/issues/3411
-#- dpkg -l | awk '/openjdk/{print $2}' | DEBIAN_FRONTEND=noninteractive xargs sudo apt-get remove -y --allow-change-held-packages
-- setup/ci_bootstrap.sh
-- make
+  # workaround for:
+  # Some packages could not be installed. This may mean that you have
+  # requested an impossible situation or if you are using the unstable
+  # distribution that some required packages have not yet been created
+  # or been moved out of Incoming.
+  # The following information may help to resolve the situation:
+  #
+  # The following packages have unmet dependencies:
+  #  mssql-server : Depends: libsasl2-modules-gssapi-mit but it is not going to be installed
+  #  E: Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages.
+  #  DevOps-Python-tools/Makefile.in:272: recipe for target 'apt-packages' failed
+  #  make[2]: *** [apt-packages] Error 123
+  #  make[2]: Leaving directory '/home/appveyor/projects/pylib'
+  #  DevOps-Python-tools/Makefile.in:212: recipe for target 'system-packages' failed
+  #
+  #  adding "|| :" to the end of these commands causes them to be silently ignored!
+  - sudo sed -i '/https:\/\/packages.microsoft.com\/ubuntu\/.*\/mssql-server/d' /etc/apt/sources.list
+  - sudo apt purge -yq --allow-change-held-packages mssql-server
+  # this prevents conflicts installing default-jdk - see https://github.com/appveyor/ci/issues/3411
+  #- dpkg -l | awk '/openjdk/{print $2}' | DEBIAN_FRONTEND=noninteractive xargs sudo apt-get remove -y --allow-change-held-packages
+  - setup/ci_bootstrap.sh
+  - make
 
 test_script:
-- make test
+  - make test
 
 build: off
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -4,15 +4,19 @@
 #
 #  vim:ts=2:sts=2:sw=2:et
 #
-#  https://github.com/harisekhon/devops-python-tools
+#  https://github.com/HariSekhon/DevOps-Python-tools
 #
 #  License: see accompanying Hari Sekhon LICENSE file
 #
 #  If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
 #
-#  https://www.linkedin.com/in/harisekhon
+#  https://www.linkedin.com/in/HariSekhon
 #
 
+# ============================================================================ #
+#                            B u i l d K i t e   C I
+# ============================================================================ #
+
 # BuildKite Pipeline
 #
 # add this command to the UI and it will read the rest of the steps from here:

diff --git a/.checkov.yaml b/.checkov.yaml
@@ -0,0 +1,48 @@
+#
+#  Author: Hari Sekhon
+#  Date: 2022-02-21 16:53:29 +0000 (Mon, 21 Feb 2022)
+#
+#  vim:ts=2:sts=2:sw=2:et
+#
+#  https://github.com/HariSekhon/DevOps-Python-tools
+#
+#  License: see accompanying Hari Sekhon LICENSE file
+#
+#  If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
+#
+#  https://www.linkedin.com/in/HariSekhon
+#
+
+# ============================================================================ #
+#                          C h e c k o v   c o n f i g
+# ============================================================================ #
+
+# https://github.com/bridgecrewio/checkov#configuration-using-a-config-file
+#
+# This is not well documented but the fields seem to be the same as:
+#
+#   checkov --help
+#
+# See master template at:
+#
+#   https://github.com/HariSekhon/Templates/blob/master/.checkov.yaml
+
+---
+compact: true
+directory:
+  - .
+skip-path:
+  - bash-tools
+  - pylib
+  - sql
+  - templates
+docker-image: harisekhon/pytools
+download-external-modules: true  # without this gets lots of annoying warning lines such as '2022-02-22 16:14:40,180 [MainThread  ] [WARNI]  Failed to download module x/y/z:n.n.n'
+framework:
+  - all
+no-guide: true
+output: cli
+quiet: true
+repo-id: HariSekhon/DevOps-Python-tools  # what to report to Bridgecrew Cloud - without this gets annoying duplicate repos such as 'harisekhon_cli_repo/pytools'
+skip-suppressions: true
+soft-fail: true
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,36 +5,50 @@
 #
 #  vim:ts=2:sts=2:sw=2:et
 #
-#  https://github.com/harisekhon/devops-python-tools
+#  https://github.com/HariSekhon/DevOps-Python-tools
 #
 #  License: see accompanying Hari Sekhon LICENSE file
 #
 #  If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
 #
-#  https://www.linkedin.com/in/harisekhon
+#  https://www.linkedin.com/in/HariSekhon
 #
 
-# https://circleci.com/docs/2.0/configuration-reference
+# ============================================================================ #
+#                                C i r c l e C I
+# ============================================================================ #
+
+# Master Template with more advanced config:
+#
+#   https://github.com/HariSekhon/Templates/blob/master/circleci_config.yml
+
+# Reference:
+#
+#   https://circleci.com/docs/2.0/configuration-reference
 
 version: 2.1
+
+workflows:
+  version: 2
+  workflow:
+    jobs:
+      - build
+
 jobs:
   build:
-    # technically a docker image is a better choice than machine
-    # but we want to introduce some native environment variation
-    # between build systems in order to test the repo's build automation is robust
-    machine:
-      image: default
-      #image: ubuntu-1604:201903-01
-      # set to an actual docker image when running locally using circle_ci_job.sh
-      # docker image must have git installed to do the checkout
-      # so using harisekhon/dev:ubuntu instead of base ubuntu image
-      #image: harisekhon/dev:ubuntu
+    docker:
+      - image: cimg/base:2024.12
+    resource_class: small
     steps:
+      # CLI is too old - config validate breaks in test - install new version to fix
+      # doesn't work - existing version is too old to update
+      #- run: circleci update
+      - run: |
+          curl -sSLf https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/main/install.sh | sudo bash
       - checkout
+      #- setup_remote_docker:
+      #    version: 20.10.11
       - run: setup/ci_bootstrap.sh
       - run: make init
       - run: make
-      # to allow docker networking to work
-      - run: sudo sysctl net.ipv4.ip_forward=1
-      - run: sudo service docker restart
       - run: make test
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -4,21 +4,27 @@
 #
 #  vim:ts=2:sts=2:sw=2:et
 #
-#  https://github.com/harisekhon/devops-python-tools
+#  https://github.com/HariSekhon/DevOps-Python-tools
 #
 #  License: see accompanying Hari Sekhon LICENSE file
 #
 #  If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
 #
-#  https://www.linkedin.com/in/harisekhon
+#  https://www.linkedin.com/in/HariSekhon
 #
 
+# ============================================================================ #
+#                               C i r r u s   C I
+# ============================================================================ #
+
 # https://cirrus-ci.org/guide/writing-tasks/
 
 container:
   image: ubuntu:18.04
 
 task:
+  env:
+    TMPDIR: /var/tmp
   script:
     - setup/ci_bootstrap.sh
     - make init

diff --git a/.concourse.yml b/.concourse.yml
diff --git a/.drone.yml b/.drone.yml
@@ -1,18 +1,24 @@
+---
+# XXX: putting this separator further down with code causes a parsing bug in drone lint
 #
 #  Author: Hari Sekhon
 #  Date: 2020-02-29 12:05:52 +0000 (Sat, 29 Feb 2020)
 #
 #  vim:ts=2:sts=2:sw=2:et
 #
-#  https://github.com/harisekhon/devops-python-tools
+#  https://github.com/HariSekhon/DevOps-Python-tools
 #
 #  License: see accompanying Hari Sekhon LICENSE file
 #
 #  If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
 #
-#  https://www.linkedin.com/in/harisekhon
+#  https://www.linkedin.com/in/HariSekhon
 #
 
+# ============================================================================ #
+#                                D r o n e   C I
+# ============================================================================ #
+
 # https://docs.drone.io/quickstart/cli/
 #
 # https://docs.drone.io/cli/install/
@@ -28,16 +34,16 @@ type: docker
 name: default
 
 steps:
-- name: build
-  image: ubuntu:18.04
-#  environment:
-#    DEBUG: 1
-  commands:
-  - setup/ci_bootstrap.sh
-  - make init
-  - make ci
-  - make test
+  - name: build
+    image: ubuntu:18.04
+    #environment:
+    #  DEBUG: 1
+    commands:
+      - setup/ci_bootstrap.sh
+      - make init
+      - make ci
+      - make test
 
 trigger:
   branch:
-  - master
+    - master