From 1fe917101c855f1c0ee4c6c01da9b22581b1dd37 Mon Sep 17 00:00:00 2001
From: Ari Kalfus <dev@artis3nal.com>
Date: Tue, 6 Feb 2024 22:26:32 -0500
Subject: [PATCH] bump the base devcontainer image (#427)

* bump the base devcontainer image

* fix variable typo

* clean up ansible-lint config
---
 .ansible-lint                   | 1 -
 .devcontainer/devcontainer.json | 7 +------
 Makefile                        | 2 +-
 README.md                       | 1 +
 tasks/install.yml               | 4 ++--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index cf016d25..c37065be 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -5,7 +5,6 @@ exclude_paths:
     - .vscode/
     - molecule/default/headscale.config.yaml
     - molecule/default/init_tailscale_vars.yml
-    - molecule/oauth/init_tailscale_vars.yml
 
 skip_list:
     - yaml[line-length]
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f718cdc7..5e0fc95d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 {
 	"name": "Python 3",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/python:0-3.11-bullseye",
+	"image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye",
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
@@ -16,14 +16,9 @@
 		"ghcr.io/devcontainers-contrib/features/ansible:2": {},
 		"ghcr.io/devcontainers-contrib/features/poetry:2": {},
 		"ghcr.io/devcontainers-contrib/features/pre-commit:2": {},
-		"ghcr.io/devcontainers/features/go:1": {},
 		"ghcr.io/devcontainers/features/common-utils:2": {
 			"installOhMyZsh": true,
 			"upgradePackages": true
-		},
-		"ghcr.io/devcontainers-contrib/features/zsh-plugins:0": {
-			"plugins": "zsh-syntax-highlighting",
-			"omzPlugins":"https://github.com/zsh-users/zsh-syntax-highlighting.git"
 		}
 	},
 
diff --git a/Makefile b/Makefile
index 4323ca9e..edaba8a0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ all: lint test
 # Install Python 3.10 first
 .PHONY: install
 install:
-	poetry install
+	poetry install --no-root
 	poetry run pre-commit install --install-hooks
 	poetry run ansible-galaxy collection install -r requirements.yml
 
diff --git a/README.md b/README.md
index 0eefad2c..fb02c0cc 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 [![Ansible Role](https://img.shields.io/ansible/role/d/artis3n/tailscale)](https://galaxy.ansible.com/ui/standalone/roles/artis3n/tailscale/)
 [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/artis3n/ansible-role-tailscale?include_prereleases)](https://github.com/artis3n/ansible-role-tailscale/releases)
 [![Molecule Tests](https://github.com/artis3n/ansible-role-tailscale/actions/workflows/pull_request_target.yml/badge.svg)](https://github.com/artis3n/ansible-role-tailscale/actions/workflows/pull_request_target.yml)
+[![Codespaces Prebuilds](https://github.com/artis3n/ansible-role-tailscale/actions/workflows/codespaces/create_codespaces_prebuilds/badge.svg)](https://github.com/artis3n/ansible-role-tailscale/actions/workflows/codespaces/create_codespaces_prebuilds)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6312/badge)](https://bestpractices.coreinfrastructure.org/projects/6312)
 ![GitHub last commit](https://img.shields.io/github/last-commit/artis3n/ansible-role-tailscale)
 ![GitHub](https://img.shields.io/github/license/artis3n/ansible-role-tailscale)
diff --git a/tasks/install.yml b/tasks/install.yml
index 86dbd773..033cadf5 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -92,7 +92,7 @@
       {% else %}
       Unknown token format
       {% endif %}
-    tailscale_authkey_sting: >-
+    tailscale_authkey_string: >-
       {# Check if the key is an OAuth key #}
       {% if tailscale_authkey.startswith('tskey-client-') %}
       {{ tailscale_authkey }}?ephemeral={{ tailscale_oauth_ephemeral | bool }}&preauthorized={{ tailscale_oauth_preauthorized | bool }}
@@ -131,7 +131,7 @@
 
 - name: Install | Bring Tailscale Up
   become: true
-  ansible.builtin.command: "tailscale up {{ tailscale_args_string | trim }} --authkey={{ tailscale_authkey_sting | trim }}"
+  ansible.builtin.command: "tailscale up {{ tailscale_args_string | trim }} --authkey={{ tailscale_authkey_string | trim }}"
   # Since the auth key is included in this task's output, we do not want to log output
   no_log: "{{ not (insecurely_log_authkey | bool) }}"
   changed_when: true