Fix extensions (#3381)

* Fixes for extensions * Removed un-used launch configs.
hitachienergy · Aug 1, 2023 · c9589f6 · c9589f6
1 parent 6c91742
commit c9589f6
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 55 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,39 +1,62 @@
 {
     "name": "epicli",
     "dockerFile": "Dockerfile",
-    "extensions": [
-        // Ansible
-        "redhat.ansible",
-        // Black Duck Scan
-        "synopsyscodesight.vscode-codesight",
-        // Common
-        "shardulm94.trailing-spaces",
-        // Git
-        "eamodio.gitlens",
-        // Jinja
-        "samuelcolvin.jinjahtml",
-        // Kubernetes
-        "ms-kubernetes-tools.vscode-kubernetes-tools",
-        // Markdown
-        "davidanson.vscode-markdownlint",
-        // Python
-        "ms-python.python",
-        // Ruby
-        "rebornix.Ruby",
-        "castwide.solargraph",
-        // Shell
-        "timonwong.shellcheck",
-        // Terraform
-        "hashicorp.terraform",
-        // YAML
-        "redhat.vscode-yaml",
-    ],
+    "customizations":{
+        "vscode": {
+            "extensions": [
+                // Ansible
+                "redhat.ansible",
+                // Common
+                "shardulm94.trailing-spaces",
+                // Jinja
+                "samuelcolvin.jinjahtml",
+                // Kubernetes
+                "ms-kubernetes-tools.vscode-kubernetes-tools",
+                // Markdown
+                "davidanson.vscode-markdownlint",
+                // Python
+                "ms-python.python",
+                // Ruby
+                "rebornix.Ruby",
+                "castwide.solargraph",
+                // Shell
+                "timonwong.shellcheck",
+                // Terraform
+                "hashicorp.terraform",
+                // YAML
+                "redhat.vscode-yaml"
+            ],
+			"settings": {
+                // Common
+                "trailing-spaces.highlightCurrentLine": false, // highlighting currently edited line can be annoying
+                "trailing-spaces.syntaxIgnore": [
+                    "markdown" // "two spaces" syntax is for line breaks
+                ],
+
+                // Python
+                "python.linting.enabled": true,
+                "python.linting.pylintEnabled": true,
+                "python.linting.pylintArgs": [
+                    "--rcfile",
+                    "${workspaceFolder}/.pylintrc"
+                ],
+                "python.testing.pytestEnabled": true,
+                "python.testing.unittestEnabled": false,
+                "python.envFile": "${workspaceFolder}/.devcontainer/python.env",
+                "python.pythonPath": "/usr/local/bin/python",
+
+                // Ruby
+                "ruby.format": false,
+                "ruby.lint": {
+                    "rubocop": true
+                },
+                "solargraph.diagnostics": false,
+                "solargraph.formatting": true
+			}
+        }
+    },
     "mounts": [
         "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/vscode/.ssh,type=bind",
     ],
-    "settings": {
-        "python.envFile": "${workspaceFolder}/.devcontainer/python.env",
-        "python.pythonPath": "/usr/local/bin/python",
-    },
     "remoteUser": "vscode",
 }
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,27 +1,6 @@
 {
     "recommendations": [
-        // Ansible
-        "redhat.ansible",
-        // Common
-        "shardulm94.trailing-spaces",
-        // Git
-        "eamodio.gitlens",
-        // Jinja
-        "samuelcolvin.jinjahtml",
-        // Markdown
-        "davidanson.vscode-markdownlint",
-        // Python
-        "ms-python.python",
-        // Ruby
-        "rebornix.Ruby",
-        "castwide.solargraph",
-        // Shell
-        "timonwong.shellcheck",
-        // Terraform
-        "hashicorp.terraform",
-        // VS Code
-        "ms-vscode-remote.remote-containers",
-        // YAML
-        "redhat.vscode-yaml",
+        // VS Code devcontainers
+        "ms-vscode-remote.remote-containers"
     ]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,7 +14,6 @@
             "console": "integratedTerminal",
             // "args": ["--debug", "1", "apply", "-f", "${workspaceFolder}/clusters/<YOUR_CONFIG>.yml"]
             // "args": ["--help"]
-            "args": ["apply", "-f", "${workspaceFolder}/clusters/azure-ubuntu.yml"]
             // "args": ["apply", "-f", "${workspaceFolder}/clusters/<YOUR_CONFIG>.yml", "--vault-password", "<ANSIBLE_VAULT_PASSWORD>"]
             // "args": ["apply", "-f", "${workspaceFolder}/clusters/<YOUR_CONFIG>.yml", "--offline-requirements", "${workspaceFolder}/downloads/epirepo"]
             // "args": ["delete", "-b", "${workspaceFolder}/clusters/build/<DIR>"]