add hashicorp repo support

Author: tprasadtp

.github/workflows/build.yml

@@ -98,4 +98,4 @@ jobs:
           sudo docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
 
       - name: Test on ARM64 ${{ matrix.release }}
-        run: ./tests/distro.sh "arm64v8/ubuntu" ${{ matrix.release }} "arm.yml"
+        run: ./tests/local.sh --build --distro ubuntu --release "${{ matrix.release }}" --cfg config/arm.yml

README.md

@@ -107,6 +107,7 @@ Also handles adding several tweaks and fixes necessary to add repositories and P
 |Visual Studio code | vscode
 |Wine HQ | winehq
 |Github CLI | github
+|Hashicorp Tools(terraform, consul etc) | hashicorp
 
 ## Issues & Help
 

after-effects

@@ -21,8 +21,8 @@ esac
 
 # SCRIPT METADATA
 readonly dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
-readonly REL_NAME="6.1.1-RC1"
-readonly REL_NUM=611
+readonly REL_NAME="6.2.0-RC1"
+readonly REL_NUM=620
 
 function _init_printf_variables()
 {
@@ -301,7 +301,7 @@ function _init_script_variables()
   readonly SOURCES_FILE_DIR=/etc/apt/sources.list.d
 
   # Ping URL
-  readonly PING_URL="www.google.com"
+  readonly PING_URL="http://connectivitycheck.gstatic.com/generate_204"
 
 
   #-------------------------- Release codenames --------------------------------------
@@ -311,7 +311,7 @@ function _init_script_variables()
   # 404 is a placeholder which is  set when there are
   # no suitable releases which can use this feature or
   # the release is unknown or too early in developement.
-  readonly codename_upcoming_release="404"
+  readonly codename_upcoming_release="hirsute"
 
   readonly codename_current_lts="focal"
   readonly codename_previous_lts="bionic"
@@ -572,7 +572,13 @@ function _fix_ubuntu_derivatives()
                                             readonly enable_ppa="true";
                                             readonly python2_disabled="true";
                                             readonly distro_name="ubuntu";
-                                            _log_warn "This is Ubuntu 20.10 Groovy Gorilla"
+                                            _log_inform "Release is Ubuntu 20.10 Groovy Gorilla"
+                                            ;;
+      hirsute )                             readonly bool_config_partner_repo="true";
+                                            readonly enable_ppa="true";
+                                            readonly python2_disabled="true";
+                                            readonly distro_name="ubuntu";
+                                            _log_warn "Release is Ubuntu 21.04 Hirsute Hippo (Unstable!!)"
                                             ;;
       stretch | jessie | buster )           bool_is_debian="true";
                                             readonly distro_name="debian";
@@ -607,7 +613,7 @@ function _test_internet_connection ()
 {
   # Function to check internet connection
   _log_info "Checking connectivity"
-  if wget --tries=5 --timeout=2 "$PING_URL" -O /tmp/ae/testinternet &>/dev/null 2>&1; then
+  if wget --tries=2 --timeout=10 "$PING_URL" -O /tmp/ae/testinternet &>/dev/null 2>&1; then
     rm -f /tmp/ae/testinternet
     _log_success "Connected!"
   else
@@ -860,6 +866,8 @@ function _set_yaml_config()
 
   _check_bool "add_gh_repo" "${config__add_repo__github[0]}"
 
+  _check_bool "add_hashicorp_repo" "${config__add_repo__hashicorp[0]}"
+
 
   # Other Script Flags
   #################################################################################
@@ -1427,15 +1435,30 @@ function add_repositories()
   # Github CLI
   #gh
 
-    if [ "$add_gh_repo" == "true" ]; then
-      _log_info "GitHub CLI(gh)"
+  if [ "$add_gh_repo" == "true" ]; then
+    _log_info "GitHub CLI(gh)"
+    _log_debug "Adding Key to trusted GPG keys directory"
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C99B11DEB97541F0 |& _log_trace "${_phase_apt_key}" \
+   || _log_error "Adding Github CLI keys failed"
+    echo "deb https://cli.github.com/packages  ${code_name}  main #GitHub-CLI" > ${SOURCES_FILE_DIR}/github-cli.list
+  else
+    _log_debug "Skipped GitHub CLI(gh)."
+  fi
+
+  # Hashicorp
+  if [ "$add_hashicorp_repo" == "true" ]; then
+    if [ "$ARCH" == "amd64" ]; then
+      _log_info "Hashicorp APT repository"
       _log_debug "Adding Key to trusted GPG keys directory"
-      apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C99B11DEB97541F0 |& _log_trace "${_phase_apt_key}" \
-     || _log_error "Adding Github CLI keys failed"
-      echo "deb https://cli.github.com/packages  ${code_name}  main #GitHub-CLI" > ${SOURCES_FILE_DIR}/github-cli.list
+      apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys DA418C88A3219F7B |& _log_trace "${_phase_apt_key}" \
+    || _log_error "Adding Hashicorp GPG keys failed"
+      echo "deb [arch=amd64] https://apt.releases.hashicorp.com ${code_name} main#Hashicorp-Packages" > ${SOURCES_FILE_DIR}/hashicorp.list
     else
-      _log_debug "Skipped GitHub CLI(gh)."
+      _log_error "Hashicorp repositories are not supported on this architecture[$ARCH]!"
     fi
+  else
+    _log_debug "Skipped adding Hashicorp repos"
+  fi
 
 
   # ROS
@@ -2255,17 +2278,19 @@ function _process_menu()
   __menu_info_add_repo="
   Settings for additional repositories is set as follows.
   -------------------------------------------------------
-  Google Chrome, Google Earth : $add_google_repo
-  Google Cloud SDK            : $add_googlecloud_repo
-  GCS-Fuse                    : $add_gcsfuse_repo
-  VS Code                     : $add_vscode_repo
-  Docker Community Edition    : $add_docker_repo
-  Insync                      : $add_insync_repo
-  Skype                       : $add_skype_repo
-  Signal Desktop              : $add_signal_repo
-  Mendeley                    : $add_mendeley_repo
-  ROS                         : $add_ros_repo
-  Duo Security for Unix       : $add_duo_repo
+  Google Chrome & Google Earth : $add_google_repo
+  Google Cloud SDK             : $add_googlecloud_repo
+  GCS-Fuse                     : $add_gcsfuse_repo
+  Visual Studio Code           : $add_vscode_repo
+  Docker Community Edition     : $add_docker_repo
+  Insync                       : $add_insync_repo
+  Skype for Linux              : $add_skype_repo
+  Signal for Desktop           : $add_signal_repo
+  Mendeley                     : $add_mendeley_repo
+  ROS (Robot Operating System) : $add_ros_repo
+  Duo Security for Unix        : $add_duo_repo
+  GitHub CLI (gh)              : $add_gh_repo
+  Hashicorp Packages           : $add_hashicorp_repo
 
   Proceed with this action?
   "
@@ -2554,8 +2579,8 @@ Usage: ${GREEN} [sudo] ./${SCRIPT} ${YELLOW}  [options]${NC}
 ${YELLOW}
 Non-Action options (can be run as non-root user)
 -------------------------------------------------${NC}
-[-v --version]     Display version info
-[-h --help]        Display this help message
+[-v --version]         Display version info
+[-h --help]            Display this help message
 ${YELLOW}
 Configuration Options
 -------------------------------------------------${NC}
@@ -2582,13 +2607,14 @@ Other Options
 -------------------------------------------------${NC}
 [-E | --skip-env-checks]     Skip some env checks
 [-V | --skip-version-check]  Skip checking for latest version
-[-A --autopilot]             Enables AUTOPILOT mode(No Prompts)
+[-A | --autopilot]           Enables AUTOPILOT mode(No Prompts)
 ${GREEN}
-Links & License
+Documentation, License and Version Info
 -------------------------------------------------${NC}
+Version         : ${ORANGE}${REL_NAME}${NC}
 GitHub          : ${BLUE}https://git.io/Jv08V${NC}
 Documentation   : ${BLUE}https://ae.prasadt.com${NC}
-* This script is licensed under GPLv3.
+License         : ${ORANGE}GPLv3${NC}
 -------------------------------------------------
 EOF
 }
@@ -2745,20 +2771,11 @@ function main()
   # Did I tell you that I need to call My friends over internet?
   _test_internet_connection;
 
-  # Checks CI & Containers If running on EC2/GCP/Azure/DO
-  _ci_cloud_and_container_checks;
-
-  # Take care of Mint and other distros
-  _fix_ubuntu_derivatives;
-
-
   _log_stage "Check if config is defined"
 
   # Handle Remote YAML
   _log_var "bool_local_config_file" "${bool_local_config_file}"
   _log_var "local_config_file_path" "${local_config_file_path}"
-  _log_var "bool_custom_version_file" "${bool_custom_version_file}"
-  _log_var "custom_version_file" "${custom_version_file}"
   _log_var "bool_remote_yaml" "${bool_remote_yaml}"
   _log_var "url_remote_yaml" "${url_remote_yaml}"
 
@@ -2778,7 +2795,15 @@ function main()
     _log_and_exit "Custom version info file you have specified is not found or not accessible" "36"
   fi
 
+  # Checks CI & Containers If running on EC2/GCP/Azure/DO
+  _ci_cloud_and_container_checks;
+
+  # Take care of Mint and other distros
+  _fix_ubuntu_derivatives;
+
   # Get Remote Config File/s, check version & configure
+  _log_var "bool_custom_version_file" "${bool_custom_version_file}"
+  _log_var "custom_version_file" "${custom_version_file}"
   _version_checks;
 
   _set_yaml_config;

after-effects.asc

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEE8FV2m9/w2tr5gevHB8IBTKWxN9gFAl/z0ukACgkQB8IBTKWx
-N9hTgw/+Iuj2dmp6rWslySn/4Vl43dSG/zDK54Yx0vKn3/fypJS1cywQbiab7ijl
-YeEuphG8uHA73dI2oQZgpHWvM1apcAYH3dGtp5SBCZv2d+8nHZxP9PBRQQkVJk8v
-SAlERqUyRDlWRpAZcpqINmuIt43HcQNciUOEtPX9satyfJE3IwLj4ARmaAITcGV5
-Zh3KrinY8SZCrax7kImuuhfzayEeJyzCSoPHqBxQ/LTmEt6ehsgblWk4Vcmfv1GX
-GgMt7kJoGRozzgikbV/KCJZXHJzV5Y710h723A9FzH11RoHg2Mb36oDdO1Qe13fR
-djHT/CFboA8GBwAK837ilfTdLq2eg2zql6CyB1dWLeQ9vXRl0P0UAyuR45AfcyJ8
-YNws0bLT8KjCCO35S1ahYO9ZvNe95zt4WqyJSK9n9CJ6yySFvzNhWJZSmho1RUOu
-uNxZ78JBWJE7f3j3AxqLR3LvbuV4kD3DbGoqFiPXd/CG3waw8R9vw72JrtnOKcn8
-5Y8xzAvmMufe8R0MAOEXqbRxOQAJk6eKWhLWGG1STa7fBdLCQJcsjjtURTVrNZaU
-ZalpIAubr3CtoR5BUKrLc53nAzNsQ390LzhYjWOHF+OFJFLRkYrIoiT4hxj2QGpz
-cyIe6TuA/5g6ILoFMe2+vVFVX05l/LISzSTa4xNmV37wpfEd1/0=
-=iifQ
+iQIzBAABCgAdFiEE8FV2m9/w2tr5gevHB8IBTKWxN9gFAl/z8KYACgkQB8IBTKWx
+N9i6WxAAhbUCpaMa4+mpcTPE9n1zPfpioK0w8iVr2K6ggBwlBFGwEUuzhhpZYICK
+ZZNHvLYeFny36l8OZPXayN2xa7y/8PSz2SjCYC/YWHghdcm1x7ZhY5cJOwa0lbEh
+U1pa5Zx6q6U2XST0ImYalxi52PuPJWkCb7uusUzjXBwrWbBISJF3mFYNZRwg3Yk5
+626A1jZdZXLiJjKRlRcEeC5L2Bv9hRsGX8RxXjY3I+bIF2c+9TGcky2B8oNh2NjY
+OaBBpgorrY9K9971FUm5TWLVWlU1QIxq80zmdrqk7WGrfRKFCVUAJE/ChN45qOPF
+Sfh5mOEdsHRBV6qPnJQXj+AkDvGk3ZcYjGVVMlem+0F8lvoGoEFJvqvxnFpXt89D
+W/FLPuwRNbmDK2bCN1pYWFq6XZzGlqha6SwUfDEuAiY3vyNqbah31egWuf0ElaJs
+/zl6W05J8sCsvyIG3ECCfS9xKuP5fQ5SaU9ganRcUPmFd6OmXGYTrisdUNuy/u34
+ceRHB10RNDSuynkRrmH0mlFrFghPTmdMcbYbVNhEY3GWDrqrOaSrcmj0Gmx+mBum
+msih/ADO3sylB7CPVy920BshhwfGEXCFKC7k0UbEO1Pbhg8nGH2dSM8RwgOge+ry
+jq+8dXnDqNrUJrzSVDXqoZnBAwLuO65+0X/4Z+zMHQichWsZamM=
+=r8Eq
 -----END PGP SIGNATURE-----

config/arm.yml

@@ -30,6 +30,7 @@ config:
     googlecloud: true
     gcsfuse: false
     spotify: true
+    hashicorp: true
     vscode: true
     skype: true
     signal: true
@@ -59,7 +60,7 @@ config:
     # Follows same pattern as Debian packages
     # Name to be saved is second field
     binaries:
-      - https://github.com/kubernetes/kompose/releases/download/v1.19.0/kompose-linux-arm,kompose
+      - https://storage.googleapis.com/kubernetes-release/release/v1.20.1/bin/linux/arm64/kubectl,kubectl
     snaps:
       normal:
         # No Beta, No classic

config/test-fix.yml

@@ -58,7 +58,7 @@ config:
     debian_packages:
       - https://github.com/sharkdp/bat/releases/download/v0.16.0/bat-musl_0.16.0_amd64.deb,bat.deb
     binaries:
-      - https://github.com/mikefarah/yq/releases/download/3.4.0/yq_linux_amd64,yq
+      - https://storage.googleapis.com/kubernetes-release/release/v1.20.1/bin/linux/amd64/kubectl,kubectl
     snaps:
       normal:
         - htop

config/test-suite.yml

@@ -24,19 +24,20 @@ config:
     snaps: true
   # Repository Flags
   add_repo:
-    googlecloud: true
+    docker: true
+    duo: true
     gcsfuse: true
-    spotify: true
-    vscode: true
-    skype: true
-    signal: true
     github: true
     google: true
+    googlecloud: true
+    hashicorp: true
+    mendeley: false
     ros: true
-    duo: true
+    signal: true
+    skype: true
+    spotify: true
+    vscode: true
     winehq: true
-    docker: true
-    mendeley: false
 
   # Flags
   flags:
@@ -57,14 +58,14 @@ config:
     debian_packages:
       - https://github.com/sharkdp/bat/releases/download/v0.16.0/bat-musl_0.16.0_amd64.deb,bat.deb
     binaries:
-      - https://github.com/mikefarah/yq/releases/download/3.4.0/yq_linux_amd64,yq
+      - https://storage.googleapis.com/kubernetes-release/release/v1.20.1/bin/linux/amd64/kubectl,kubectl
     snaps:
       normal:
         - htop
       classic:
         - hugo
     python2:
-      - future
+      - aws
     python3:
       - coloredlogs
     apt:
@@ -85,3 +86,4 @@ config:
         - less
       external:
         - gh
+        - terraform

config/version.yml

@@ -2,5 +2,5 @@
 api: 3
 # Configuration
 version:
-  number: 611
-  name: 6.1.1-RC1
+  number: 620
+  name: 6.2.0-RC1

docs/changelog.md

@@ -1,8 +1,10 @@
 # Changelog
 
-## 6.1.1
+## 6.2.0
 
+- **New-Repository** Hashicorp Repository (Terraform, Vault Consul etc)
 - Fix `-d` and `-k` flags not working properly. [#45](https://github.com/tprasadtp/ubuntu-post-install/issues/45)
+- Enable Hirsute Hippo
 
 ## 6.1
 

docs/tasks.md

@@ -21,6 +21,8 @@ This task can add the following repositories.
 |Visual Studio code | vscode
 |Wine HQ | winehq
 |Github CLI | github
+|Hashicorp Tools(terraform, consul etc) | hashicorp
+
 
 ??? tip "Using `--fix` flag"
     Please note that the above repositories are sometimes not updated for latest Ubuntu release and most certainly will not be available for upcoming release of Ubuntu(Alpha/Beta). It might take some time till the repositories are available for the latest release. Use -f or --fix command line option or --pre-release in case you are using a development version of Ubuntu to revert using latest available version of repositories (usually previous Ubuntu release or in case of Beta/Alpha latest stable release of Ubuntu). [For more info see command line options.](/clioptions/#fix-for-latest-ubuntu-releases)