From ccda1c5c7d3f90d6708a49cbd55ac1f7e7c8da64 Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Thu, 7 Sep 2023 14:53:23 -0400 Subject: [PATCH] fix: rm tf provider versions in examples/ (#9586) --- examples/parameters-dynamic-options/main.tf | 6 +-- examples/parameters/main.tf | 6 +-- examples/templates/aws-ecs-container/main.tf | 7 ++-- examples/templates/aws-linux/main.tf | 6 +-- examples/templates/aws-windows/main.tf | 6 +-- examples/templates/azure-linux/main.tf | 6 +-- examples/templates/azure-windows/main.tf | 6 +-- .../templates/devcontainer-docker/main.tf | 6 +-- .../templates/devcontainer-kubernetes/main.tf | 6 +-- examples/templates/do-linux/main.tf | 6 +-- .../templates/docker-with-dotfiles/main.tf | 6 +-- examples/templates/docker/main.tf | 6 +-- examples/templates/envbox/main.tf | 6 +-- examples/templates/fly-docker-image/main.tf | 6 +-- examples/templates/gcp-linux/main.tf | 6 +-- examples/templates/gcp-vm-container/main.tf | 6 +-- examples/templates/gcp-windows/main.tf | 6 +-- examples/templates/jfrog/docker/main.tf | 9 ++--- .../templates/kubernetes-with-podman/main.tf | 6 +-- examples/templates/kubernetes/main.tf | 6 +-- examples/update_template_versions.sh | 37 ------------------- 21 files changed, 42 insertions(+), 119 deletions(-) delete mode 100755 examples/update_template_versions.sh diff --git a/examples/parameters-dynamic-options/main.tf b/examples/parameters-dynamic-options/main.tf index 20071e2664..d459a41f70 100644 --- a/examples/parameters-dynamic-options/main.tf +++ b/examples/parameters-dynamic-options/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "0.11.1" + source = "coder/coder" } docker = { - source = "kreuzwerker/docker" - version = "~> 2.22" + source = "kreuzwerker/docker" } } } diff --git a/examples/parameters/main.tf b/examples/parameters/main.tf index 0903a2d2e6..10dc82f575 100644 --- a/examples/parameters/main.tf +++ b/examples/parameters/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.11.1" + source = "coder/coder" } docker = { - source = "kreuzwerker/docker" - version = "~> 3.0.1" + source = "kreuzwerker/docker" } } } diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf index f7f2249ee8..ee1ebae0d7 100644 --- a/examples/templates/aws-ecs-container/main.tf +++ b/examples/templates/aws-ecs-container/main.tf @@ -1,17 +1,16 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } aws = { - source = "hashicorp/aws" - version = "~> 4.55" + source = "hashicorp/aws" } } } provider "coder" { + feature_use_managed_variables = true } variable "ecs-cluster" { diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf index 3017abf339..cce6252c82 100644 --- a/examples/templates/aws-linux/main.tf +++ b/examples/templates/aws-linux/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.11.0" + source = "coder/coder" } aws = { - source = "hashicorp/aws" - version = "~> 4.55" + source = "hashicorp/aws" } } } diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf index 215aaff56f..39e10f473f 100644 --- a/examples/templates/aws-windows/main.tf +++ b/examples/templates/aws-windows/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } aws = { - source = "hashicorp/aws" - version = "~> 4.55" + source = "hashicorp/aws" } } } diff --git a/examples/templates/azure-linux/main.tf b/examples/templates/azure-linux/main.tf index ccb934a8b6..9afb876a3c 100644 --- a/examples/templates/azure-linux/main.tf +++ b/examples/templates/azure-linux/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } azurerm = { - source = "hashicorp/azurerm" - version = "~>3.47.0" + source = "hashicorp/azurerm" } } } diff --git a/examples/templates/azure-windows/main.tf b/examples/templates/azure-windows/main.tf index 92f62c1f10..e494b037f7 100644 --- a/examples/templates/azure-windows/main.tf +++ b/examples/templates/azure-windows/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "0.7.0" + source = "coder/coder" } azurerm = { - source = "hashicorp/azurerm" - version = "=3.52.0" + source = "hashicorp/azurerm" } } } diff --git a/examples/templates/devcontainer-docker/main.tf b/examples/templates/devcontainer-docker/main.tf index 5941b0c6b9..f69e03b58e 100644 --- a/examples/templates/devcontainer-docker/main.tf +++ b/examples/templates/devcontainer-docker/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "0.11.0" + source = "coder/coder" } docker = { - source = "kreuzwerker/docker" - version = "3.0.2" + source = "kreuzwerker/docker" } } } diff --git a/examples/templates/devcontainer-kubernetes/main.tf b/examples/templates/devcontainer-kubernetes/main.tf index 58c183e5be..635fd34d5f 100644 --- a/examples/templates/devcontainer-kubernetes/main.tf +++ b/examples/templates/devcontainer-kubernetes/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "0.11.0" + source = "coder/coder" } kubernetes = { - source = "hashicorp/kubernetes" - version = "~> 2.3.2" + source = "hashicorp/kubernetes" } } } diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf index 3080c9228b..22eed81bdb 100644 --- a/examples/templates/do-linux/main.tf +++ b/examples/templates/do-linux/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } digitalocean = { - source = "digitalocean/digitalocean" - version = "~> 2.0" + source = "digitalocean/digitalocean" } } } diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf index f5b2b92747..956a4308b9 100644 --- a/examples/templates/docker-with-dotfiles/main.tf +++ b/examples/templates/docker-with-dotfiles/main.tf @@ -8,12 +8,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } docker = { - source = "kreuzwerker/docker" - version = "~> 3.0.1" + source = "kreuzwerker/docker" } } } diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf index 7749cd983b..b4ec8c4057 100644 --- a/examples/templates/docker/main.tf +++ b/examples/templates/docker/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.8.3" + source = "coder/coder" } docker = { - source = "kreuzwerker/docker" - version = "~> 3.0.1" + source = "kreuzwerker/docker" } } } diff --git a/examples/templates/envbox/main.tf b/examples/templates/envbox/main.tf index f5460c622b..e452ac4507 100644 --- a/examples/templates/envbox/main.tf +++ b/examples/templates/envbox/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "0.6.12" + source = "coder/coder" } kubernetes = { - source = "hashicorp/kubernetes" - version = "~> 2.12.1" + source = "hashicorp/kubernetes" } } } diff --git a/examples/templates/fly-docker-image/main.tf b/examples/templates/fly-docker-image/main.tf index abd84c0e7d..70cb00077b 100644 --- a/examples/templates/fly-docker-image/main.tf +++ b/examples/templates/fly-docker-image/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { fly = { - source = "fly-apps/fly" - version = "~>0.0.23" + source = "fly-apps/fly" } coder = { - source = "coder/coder" - version = "~>0.7.0" + source = "coder/coder" } } } diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf index e4bba1bcbe..29c64393e5 100644 --- a/examples/templates/gcp-linux/main.tf +++ b/examples/templates/gcp-linux/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } google = { - source = "hashicorp/google" - version = "~> 4.34.0" + source = "hashicorp/google" } } } diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf index 45a76c63a4..ba203e0270 100644 --- a/examples/templates/gcp-vm-container/main.tf +++ b/examples/templates/gcp-vm-container/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } google = { - source = "hashicorp/google" - version = "~> 4.34.0" + source = "hashicorp/google" } } } diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf index 16148ef407..ea9032eaf3 100644 --- a/examples/templates/gcp-windows/main.tf +++ b/examples/templates/gcp-windows/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } google = { - source = "hashicorp/google" - version = "~> 4.34.0" + source = "hashicorp/google" } } } diff --git a/examples/templates/jfrog/docker/main.tf b/examples/templates/jfrog/docker/main.tf index f5bcb6728c..54b952b2fd 100644 --- a/examples/templates/jfrog/docker/main.tf +++ b/examples/templates/jfrog/docker/main.tf @@ -1,16 +1,13 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.11.1" + source = "coder/coder" } docker = { - source = "kreuzwerker/docker" - version = "~> 3.0.1" + source = "kreuzwerker/docker" } artifactory = { - source = "registry.terraform.io/jfrog/artifactory" - version = "~> 8.4.0" + source = "registry.terraform.io/jfrog/artifactory" } } } diff --git a/examples/templates/kubernetes-with-podman/main.tf b/examples/templates/kubernetes-with-podman/main.tf index e0d76492df..2a041c1e8d 100644 --- a/examples/templates/kubernetes-with-podman/main.tf +++ b/examples/templates/kubernetes-with-podman/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.7.0" + source = "coder/coder" } kubernetes = { - source = "hashicorp/kubernetes" - version = "~> 2.18" + source = "hashicorp/kubernetes" } } } diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf index 7eef83dd45..38ba4a7b8a 100644 --- a/examples/templates/kubernetes/main.tf +++ b/examples/templates/kubernetes/main.tf @@ -1,12 +1,10 @@ terraform { required_providers { coder = { - source = "coder/coder" - version = "~> 0.11.0" + source = "coder/coder" } kubernetes = { - source = "hashicorp/kubernetes" - version = "~> 2.22" + source = "hashicorp/kubernetes" } } } diff --git a/examples/update_template_versions.sh b/examples/update_template_versions.sh deleted file mode 100755 index d747b36460..0000000000 --- a/examples/update_template_versions.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -set -euo pipefail - -EXAMPLES_DIR=$(dirname "${BASH_SOURCE[0]}") -PROJECT_ROOT=$(cd "$EXAMPLES_DIR" && git rev-parse --show-toplevel) - -# shellcheck source=scripts/lib.sh -source "$PROJECT_ROOT/scripts/lib.sh" - -dependencies curl jq sed - -sed_args=(-i) -if isdarwin; then - sed_args=(-i '') -fi - -main() { - pushd "$EXAMPLES_DIR/templates" - - # Fetch the latest release of terraform-provider-coder from GitHub. - latest_provider_coder="$(curl --fail -sSL https://api.github.com/repos/coder/terraform-provider-coder/releases/latest | jq -r .tag_name)" - latest_provider_coder=${latest_provider_coder#v} - - # Update all terraform files that contain ~ the following lines: - # source = "coder/coder" - # version = "[version]" - find . -type f -name "*.tf" -print0 | while read -r -d $'\0' f; do - current_version_raw="$(grep -n -A 1 'source *= *"coder/coder"' "$f" | tail -n 1)" - if [[ $current_version_raw = *version* ]]; then - line="${current_version_raw%%-*}" - sed "${sed_args[@]}" "$line s/\".*\"/\"$latest_provider_coder\"/" "$f" - fi - done -} - -# Wrap the main function in a subshell to restore the working directory. -(main)