Merge pull request #6 from awslabs/feat/devcontainer-init

Feat/devcontainer init

Author: valter-silva-au

.devcontainer/Dockerfile

@@ -1,114 +1,23 @@
-# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-# SPDX-License-Identifier: MIT-0
-
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/ubuntu/.devcontainer/base.Dockerfile
-
-# [Choice] Ubuntu version (use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon): ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
 ARG VARIANT="jammy"
 FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
 
 # Install OS packages
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
-    ca-certificates \
-	curl \
-	expect \
-	figlet \
-	gawk \
-	git \
-	git-flow \
-	golang \
-	gnupg \
-	jq \
-	less \
-	make \
-	python3-pip \
-	software-properties-common \
-	ssh \
-	tree \
-	bash-completion \
-	unzip \
-	vim \
-	wget \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN update-ca-certificates
-
-# Terraform
-RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - \
-	&& apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" \
-	&& apt-get update && sudo apt-get -qq install --no-install-recommends --yes terraform terraform-ls
+    make
 
-# AWS CLI
-SHELL ["/bin/zsh", "-c"]
-RUN mkdir -p /tmp/download \
-	&& cd /tmp/download \
-	&& curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" --silent -o "awscliv2.zip" \
-	&& unzip -qq awscliv2.zip \
-	&& ./aws/install \
-	&& rm -rf /tmp/download \
-	&& autoload bashcompinit && bashcompinit \
-	&& autoload -Uz compinit && compinit \
-	&& echo "complete -C '/usr/local/bin/aws_completer' aws" >> /home/vscode/.bashrc \
-	&& echo "complete -C '/usr/local/bin/aws_completer' aws" >> /home/vscode/.zshrc
-
-# Gomplate
-ARG GOMPLATE_VERSION=3.10.0
-RUN mkdir -p /tmp/download \
-	&& wget https://github.com/hairyhenderson/gomplate/releases/download/v${GOMPLATE_VERSION}/gomplate_linux-amd64-slim -O /tmp/download/gomplate --quiet --no-check-certificate \
-	&& chmod +x /tmp/download/gomplate \
-	&& mv /tmp/download/gomplate /usr/local/bin/ \
-	&& rm -rf /tmp/download
+USER vscode
 
-# Terraform Docs
 ARG TERRAFORM_DOCS_VERSION=0.16.0
-RUN mkdir -p /tmp/download /tmp/extract \
-	&& wget https://github.com/terraform-docs/terraform-docs/releases/download/v${TERRAFORM_DOCS_VERSION}/terraform-docs-v${TERRAFORM_DOCS_VERSION}-linux-amd64.tar.gz -O /tmp/download/terraform-docs-${TERRAFORM_DOCS_VERSION}-linux-amd64.tar.gz --quiet --no-check-certificate \
-	&& tar -C /tmp/extract -xzf /tmp/download/terraform-docs-${TERRAFORM_DOCS_VERSION}-linux-amd64.tar.gz \
-	&& mv /tmp/extract/terraform-docs /usr/local/bin/ \
-	&& rm -rf /tmp/download /tmp/extract
-
-# TFLINT
-ARG TFLINT_AWS_RULESET_VERSION=0.13.4
-RUN curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
-
-# TFSEC
 ARG TFSEC_VERSION=1.15.2
-RUN mkdir -p /tmp/download \
-	&& wget https://github.com/aquasecurity/tfsec/releases/download/v${TFSEC_VERSION}/tfsec-linux-amd64 -O /tmp/download/tfsec --quiet --no-check-certificate \
-	&& chmod +x /tmp/download/tfsec \
-	&& mv /tmp/download/tfsec /usr/local/bin/ \
-	&& rm -rf /tmp/download
-
-# TFSWITCH
-RUN curl -L https://raw.githubusercontent.com/warrensbox/terraform-switcher/release/install.sh | bash
-
-# TERRASCAN
 ARG TERRASCAN_VERSION=1.13.2
-RUN mkdir -p /tmp/download /tmp/extract \
-	&& wget https://github.com/accurics/terrascan/releases/download/v${TERRASCAN_VERSION}/terrascan_${TERRASCAN_VERSION}_Linux_x86_64.tar.gz -O /tmp/download/terrascan_${TERRASCAN_VERSION}_Linux_x86_64.tar.gz --quiet --no-check-certificate \
-	&& sha256sum /tmp/download/terrascan_${TERRASCAN_VERSION}_Linux_x86_64.tar.gz \
-	&& tar -C /tmp/extract -xzf /tmp/download/terrascan_${TERRASCAN_VERSION}_Linux_x86_64.tar.gz \
-	&& sudo mv /tmp/extract/terrascan /usr/local/bin/ \
-	&& rm -rf /tmp/download /tmp/extract
-
-# Gitignore CLI
-RUN echo "function gi() { curl -sL https://www.toptal.com/developers/gitignore/api/\$@ ;}" >> /home/vscode/.bashrc
-RUN echo "function gi() { curl -sLw "\n" https://www.toptal.com/developers/gitignore/api/\$@ ;}" >> /home/vscode/.zshrc
-
-# Upgrade pip
-RUN pip3 install --progress-bar off --upgrade pip
-
-USER vscode
-
-# Install pre-commit
-RUN pip3 install --progress-bar off --upgrade --user pre-commit
-
-# Install checkov
-RUN pip3 install --progress-bar off --upgrade --user checkov
+ARG TFLINT_AWS_RULESET_VERSION=0.21.1
 
-# Install Ansible
-RUN pip3 install --progress-bar off --upgrade --user ansible
+RUN cd /tmp/ \
+    && git clone https://github.com/awslabs/aws-code-habits.git \
+    && cd aws-code-habits \
+    && make devcontainer/terraform/init \
+    && rm -rf /tmp/aws-code-habits
 
 USER root
 

.devcontainer/devcontainer.json

@@ -4,11 +4,10 @@
     "dockerfile": "Dockerfile",
     "args": {
       "VARIANT": "ubuntu-22.04",
-      "GOMPLATE_VERSION": "3.11.3",
       "TERRAFORM_DOCS_VERSION": "0.16.0",
-      "TFLINT_AWS_RULESET_VERSION": "0.17.1",
       "TFSEC_VERSION": "1.28.0",
-      "TERRASCAN_VERSION": "1.15.2"
+      "TERRASCAN_VERSION": "1.15.2",
+      "TFLINT_AWS_RULESET_VERSION": "0.21.1"
     }
   },
   "postStartCommand": "post-start",

.github/actions/docker-image-build.yml

@@ -4,9 +4,8 @@ runs:
   using: "docker"
   image: "./.devcontainer/Dockerfile"
   args:
-    - VARIANT: "ubuntu-20.04"
-    - GOMPLATE_VERSION: "3.11.3"
+    - VARIANT: "ubuntu-22.04"
     - TERRAFORM_DOCS_VERSION: "0.16.0"
-    - TFLINT_AWS_RULESET_VERSION: "0.17.1"
     - TFSEC_VERSION: "1.28.0"
     - TERRASCAN_VERSION: "1.15.2"
+    - TFLINT_AWS_RULESET_VERSION: "0.21.1"

.github/workflows/hygiene.yml

@@ -24,6 +24,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install pre-commit
+
       - name: Install pre-commit hooks and execute rules
         run: pre-commit run --all-files
 
@@ -39,9 +40,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install virtualenv
-      - name: Create virtualenv
-        run: python -m venv .venv
 
       - name: Build documentation
         run: make doc/build

.prettierignore

@@ -1 +1,2 @@
 README.md
+CHANGELOG.md

habits

@@ -1 +1,5 @@
 GITIGNORE=macos,windows,linux,visualstudiocode,python,node,terraform
+TFLINT_AWS_RULESET_VERSION=0.21.1
+TERRAFORM_DOCS_VERSION=0.16.0
+TERRASCAN_VERSION=1.17.1
+TFSEC_VERSION=1.28.1