Merge develop into 2.0

.ansible-lint

@@ -38,6 +38,7 @@ skip_list:
   - meta-no-info
   - package-latest
   - fqcn-builtins
+  - no-jinja-when
 
 ##################
 # Tags to follow #

.devcontainer/Dockerfile

@@ -4,6 +4,7 @@ ARG USERNAME=vscode
 ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
+ARG AWS_CLI_VERSION=2.0.30
 ARG HELM_VERSION=3.3.1
 ARG KUBECTL_VERSION=1.22.4
 ARG TERRAFORM_VERSION=1.1.3
@@ -19,6 +20,7 @@ RUN : INSTALL APT REQUIREMENTS \
     make musl-dev openssh-client procps \
     psmisc rsync ruby-full sudo tar \
     unzip vim \
+    openjdk-11-jdk-headless \
  && apt-get -q autoremove -y \
  && apt-get -q clean -y \
  && rm -rf /var/lib/apt/lists/*
@@ -37,7 +39,13 @@ RUN : INSTALL HELM BINARY \
  && curl -fsSLO https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
  && unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin \
  && rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
- && terraform version
+ && terraform version \
+ && : INSTALL AWS CLI BINARY \
+ && curl -fsSLO https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip \
+ && unzip awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip \
+ && ./aws/install -i /usr/local/aws-cli -b /usr/local/bin \
+ && rm -rf awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip ./aws \
+ && aws --version
 
 RUN : INSTALL GEM REQUIREMENTS \
  && gem install \
@@ -58,5 +66,8 @@ RUN : SETUP USER AND OTHERS \
  && chmod ug=r,o= /etc/sudoers.d/$USERNAME \
  && setcap 'cap_net_bind_service=+ep' /usr/bin/ssh
 
+RUN : SETUP JAVE_HOME
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
+
 RUN : SETUP EPICLI ALIAS \
  && echo alias epicli='"export PYTHONPATH=/workspaces/epiphany && python3 -m cli.epicli"' >> /etc/bash.bashrc

.devcontainer/devcontainer.json

@@ -4,6 +4,8 @@
     "extensions": [
         // Ansible
         "redhat.ansible",
+        // Black Duck Scan
+        "synopsyscodesight.vscode-codesight",
         // Common
         "shardulm94.trailing-spaces",
         // Git