feat: add resource classes and images for Windows & GPU executors (#293)

Author: loderunner

.circleci/config.yml

@@ -27,7 +27,7 @@ parameters:
     type: string
     default: ""
 orbs:
-  go: circleci/go@1.9.0
+  go: circleci/go@1.11.0
   node: circleci/[email protected]
   snyk: snyk/[email protected]
   slack: circleci/[email protected]
@@ -175,7 +175,7 @@ commands:
 jobs:
   Create version file:
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.22.3
     description: |
       Create a version to be used by the /scripts/ldflags.sh when building the binaries
     parameters:
@@ -211,7 +211,7 @@ jobs:
     environment:
       SCHEMA_LOCATION: /home/circleci/project/schema.json
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.22.3
     parallelism: 5
     steps:
       - checkout
@@ -232,7 +232,7 @@ jobs:
       arch:
         type: string
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.22.3
     resource_class: << parameters.resource_class >>
     steps:
       - attach_workspace:
@@ -282,7 +282,7 @@ jobs:
 
   Build Windows:
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.22.3
     steps:
       - attach_workspace:
           at: ~/
@@ -352,7 +352,7 @@ jobs:
 
   Lint:
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.22.3
     steps:
       - checkout
       - run:
@@ -405,7 +405,7 @@ jobs:
 
   Pre-Release:
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.22.3
     steps:
       - checkout
       - attach_workspace:
@@ -492,7 +492,7 @@ jobs:
 
   Security Scan release:
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.22.3
     steps:
       - checkout
       - run:
@@ -507,7 +507,7 @@ jobs:
 
   Security Scan feature:
     docker:
-      - image: cimg/go:1.21.5
+      - image: cimg/go:1.22.3
     steps:
       - checkout
       - run:

.editorconfig

@@ -12,4 +12,4 @@ indent_size = 2
 indent_style = tab
 
 [*.yml]
-indent_size = 4
+indent_size = 2

.vscode/launch.json

@@ -18,9 +18,7 @@
         "--extensionDevelopmentPath=${workspaceFolder}/editors/vscode",
         "--disable-extensions"
       ],
-      "outFiles": [
-        "${workspaceFolder}/editors/vscode/dist/**/*.js"
-      ],
+      "outFiles": ["${workspaceFolder}/editors/vscode/dist/**/*.js"],
       "preLaunchTask": "task: task build",
       "env": {
         "CCI_DEV": "true",
@@ -37,12 +35,8 @@
       },
       "type": "extensionHost",
       "request": "launch",
-      "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}/editors/vscode"
-      ],
-      "outFiles": [
-        "${workspaceFolder}/editors/vscode/dist/**/*.js"
-      ],
+      "args": ["--extensionDevelopmentPath=${workspaceFolder}/editors/vscode"],
+      "outFiles": ["${workspaceFolder}/editors/vscode/dist/**/*.js"],
       "preLaunchTask": "task: task build",
       "env": {
         "CCI_DEV": "true"
@@ -75,9 +69,7 @@
       },
       "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
       "request": "launch",
-      "skipFiles": [
-        "<node_internals>/**"
-      ],
+      "skipFiles": ["<node_internals>/**"],
       "type": "node"
     },
     {
@@ -92,9 +84,7 @@
       },
       "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
       "request": "launch",
-      "skipFiles": [
-        "<node_internals>/**"
-      ],
+      "skipFiles": ["<node_internals>/**"],
       "type": "node"
     },
     {

go.mod

@@ -1,6 +1,6 @@
 module github.com/CircleCI-Public/circleci-yaml-language-server
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Masterminds/semver v1.5.0

pkg/ast/executor.go

@@ -219,41 +219,4 @@ func (e MacOSExecutor) GetEnvs() Environment {
 	return e.Environment
 }
 
-type WindowsExecutor struct {
-	BaseExecutor
-	Image string
-}
-
-func (e WindowsExecutor) GetRange() protocol.Range {
-	return e.Range
-}
-
-func (e WindowsExecutor) GetName() string {
-	return e.Name
-}
-
-func (e WindowsExecutor) GetNameRange() protocol.Range {
-	return e.NameRange
-}
-
-func (e WindowsExecutor) IsUncomplete() bool {
-	return e.Uncomplete
-}
-
-func (e WindowsExecutor) GetResourceClass() string {
-	return e.ResourceClass
-}
-
-func (e WindowsExecutor) GetParameters() map[string]Parameter {
-	return e.UserParameters
-}
-
-func (e WindowsExecutor) GetParametersRange() protocol.Range {
-	return e.UserParametersRange
-}
-
-func (e WindowsExecutor) GetEnvs() Environment {
-	return e.Environment
-}
-
 type EnvironmentParameter map[string]string

pkg/parser/executors.go

@@ -58,8 +58,6 @@ func (doc *YamlDocument) parseSingleExecutor(executorNode *sitter.Node) {
 			doc.Executors[executorName] = doc.parseSingleExecutorMachine(executorNameNode, blockMappingNode)
 		case "macos":
 			doc.Executors[executorName] = doc.parseSingleExecutorMacOS(executorNameNode, blockMappingNode)
-		case "windows":
-			doc.Executors[executorName] = doc.parseSingleExecutorWindows(executorNameNode, blockMappingNode)
 		}
 	})
 
@@ -200,32 +198,6 @@ func (doc *YamlDocument) parseSingleExecutorMacOS(nameNode *sitter.Node, valueNo
 	return res
 }
 
-func (doc *YamlDocument) parseSingleExecutorWindows(nameNode *sitter.Node, valueNode *sitter.Node) ast.WindowsExecutor {
-	// valueNode is a block_mapping
-	res := ast.WindowsExecutor{}
-
-	parseWindows := func(blockNode *sitter.Node) {
-		// blockNode is a block_node
-		blockMappingNode := GetChildMapping(blockNode)
-
-		if blockMappingNode == nil { //TODO: deal with errors
-			return
-		}
-
-		doc.iterateOnBlockMapping(blockMappingNode, func(child *sitter.Node) {
-			keyNode, valueNode := doc.GetKeyValueNodes(child)
-			keyName := doc.GetNodeText(keyNode)
-			switch keyName {
-			case "image":
-				res.Image = doc.GetNodeText(valueNode)
-			}
-		})
-	}
-
-	doc.parseBaseExecutor(&res.BaseExecutor, nameNode, valueNode, parseWindows, "windows")
-	return res
-}
-
 func (doc *YamlDocument) parseSingleExecutorDocker(nameNode *sitter.Node, valueNode *sitter.Node) ast.DockerExecutor {
 	// valueNode is a block_mapping
 	res := ast.DockerExecutor{
@@ -236,7 +208,7 @@ func (doc *YamlDocument) parseSingleExecutorDocker(nameNode *sitter.Node, valueN
 		// blockNode is a block_node
 		blockSequence := GetChildSequence(blockNode)
 
-		if blockSequence == nil { //TODO: deal with errors
+		if blockSequence == nil { // TODO: deal with errors
 			return
 		}
 
@@ -257,14 +229,14 @@ func (doc *YamlDocument) parseDockerImage(imageNode *sitter.Node) ast.DockerImag
 	dockerImg := ast.DockerImage{}
 	blockNode := GetChildOfType(imageNode, "block_node")
 
-	if blockNode == nil { //TODO: deal with errors
+	if blockNode == nil { // TODO: deal with errors
 		// Can happen if the docker is an alias/anchor
 		return dockerImg
 	}
 
 	blockMappingNode := GetChildMapping(blockNode)
 
-	if blockMappingNode == nil { //TODO: deal with errors
+	if blockMappingNode == nil { // TODO: deal with errors
 		return dockerImg
 	}
 
@@ -331,7 +303,7 @@ func (doc *YamlDocument) parseExecutorRef(valueNode *sitter.Node, child *sitter.
 
 	name := ""
 	blockMapping := GetChildMapping(valueNode)
-	if blockMapping == nil { //TODO: deal with errors
+	if blockMapping == nil { // TODO: deal with errors
 		return "", protocol.Range{}, executorParameters
 	}
 
@@ -368,11 +340,11 @@ func (doc *YamlDocument) addedMachineTrueDeprecatedDiag(child *sitter.Node, reso
 		return false
 	}
 
-	if !doc.Context.Api.UseDefaultInstance() || doc.IsSelfHostedRunner(resourceClass) {
+	if !doc.Context.Api.UseDefaultInstance() || utils.IsSelfHostedRunner(resourceClass) {
 		return false
 	}
 
-	if doc.IsSelfHostedRunner(resourceClass) {
+	if utils.IsSelfHostedRunner(resourceClass) {
 		return false
 	}
 	machineRange := doc.NodeToRange(child)
@@ -382,18 +354,19 @@ func (doc *YamlDocument) addedMachineTrueDeprecatedDiag(child *sitter.Node, reso
 }
 
 func (doc *YamlDocument) machineTrueFix(machineRange protocol.Range) {
-	img := utils.GetLatestUbuntu2204Image()
 	diagnostic := utils.CreateDiagnosticFromRange(
 		machineRange,
 		protocol.DiagnosticSeverityWarning,
-		utils.GetMachineTrueMessage(img),
+		utils.GetMachineTrueMessage(utils.CurrentLinuxImage),
 		[]protocol.CodeAction{
-			utils.CreateCodeActionTextEdit("Replace with most updated ubuntu image", doc.URI,
+			utils.CreateCodeActionTextEdit("Replace with current Ubuntu image", doc.URI,
 				[]protocol.TextEdit{
 					{
 						Range: machineRange,
-						NewText: `machine:
-` + strings.Repeat(" ", int(machineRange.Start.Character)) + `  image: ` + utils.GetLatestUbuntu2204Image(),
+						NewText: "machine:\n" +
+							strings.Repeat(" ", int(machineRange.Start.Character)) +
+							"  image: " +
+							utils.CurrentLinuxImage,
 					},
 				}, false),
 		},
@@ -402,9 +375,4 @@ func (doc *YamlDocument) machineTrueFix(machineRange protocol.Range) {
 		protocol.DiagnosticTagDeprecated,
 	}
 	doc.addDiagnostic(diagnostic)
-
-}
-
-func (doc *YamlDocument) IsSelfHostedRunner(resourceClass string) bool {
-	return len(strings.Split(resourceClass, "/")) > 1
 }

pkg/parser/validate/dockerImage_test.go

@@ -72,7 +72,7 @@ executors:
 			Diagnostics: []ComparableDiagnostic{
 				{
 					Severity: protocol.DiagnosticSeverityError,
-					Message:  "Docker image not found namespace/image:tag",
+					Message:  "Docker image not found \"namespace/image:tag\"",
 				},
 			},
 
@@ -93,7 +93,7 @@ executors:
 			Diagnostics: []ComparableDiagnostic{
 				{
 					Severity: protocol.DiagnosticSeverityError,
-					Message:  "Docker image namespace/image:tag has no tag tag",
+					Message:  "Docker image \"namespace/image:tag\" has no tag \"tag\"",
 				},
 			},
 
@@ -115,7 +115,7 @@ executors:
 			Diagnostics: []ComparableDiagnostic{
 				{
 					Severity: protocol.DiagnosticSeverityError,
-					Message:  "Docker image namespace/image has no tag latest",
+					Message:  "Docker image \"namespace/image\" has no tag \"latest\"",
 				},
 			},
 
@@ -134,7 +134,7 @@ executors:
 			Diagnostics: []ComparableDiagnostic{
 				{
 					Severity: protocol.DiagnosticSeverityError,
-					Message:  "Docker image namespace/image has no tag latest",
+					Message:  "Docker image \"namespace/image\" has no tag \"latest\"",
 					Actions: []ComparableAction{
 						{
 							Title:  "Use last tag",
@@ -266,6 +266,7 @@ func TestChooseTagToRecommend(t *testing.T) {
 		})
 	}
 }
+
 func TestCreateTagTextEdit(t *testing.T) {
 	tag := "16.20.1-browsers"
 	img := ast.DockerImage{