diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 62b78edab..000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "recommendations": [ - "hashicorp.terraform", - "ms-azure-devops.azure-pipelines", - "tsandall.opa", - "ms-vscode.powershell", - "eamodio.gitlens" - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 4fe87dc73..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "editor.formatOnSave": true, - "powershell.startAutomatically": false, - "files.associations": { - ".ci/*.yml": "azure-pipelines", - ".ci/*.yaml": "azure-pipelines", - "**/*.tf": "terraform", - "**/*.tfvars": "terraform" - }, - "terraform.languageServer": { - "external": true, - "args": ["serve"] - }, - "terraform-ls.rootModules": [ - "modules/azure/aks-global", - "modules/azure/core", - "modules/azure/aks", - "modules/azure/azure-pipelines-agent-vmss", - "modules/azure/governance", - "modules/azure/hub", - "modules/kubernetes/aad-pod-identity", - "modules/kubernetes/loki", - "modules/kubernetes/external-dns", - "modules/kubernetes/velero", - "modules/kubernetes/cert-manager", - "modules/kubernetes/fluxcd-v1", - "modules/kubernetes/azdo-proxy", - "modules/kubernetes/helm-operator", - "modules/kubernetes/ingress-nginx", - "modules/kubernetes/opa-gatekeeper" - ] -} diff --git a/Makefile b/Makefile index bf2786552..f05f1ec7e 100644 --- a/Makefile +++ b/Makefile @@ -89,11 +89,3 @@ terraform-init: terraform init 1>/dev/null done done - -.SILENT: -vscode-tf: terraform-init - set -e - TF_MODULES=$$(find modules -depth 2 -type d) - jq --arg arr "$${TF_MODULES}" '.["terraform-ls.rootModules"] = ($$arr | split("\n"))' .vscode/settings.json > .vscode/settings.json_new - mv .vscode/settings.json_new .vscode/settings.json - echo vscode-tf: Success