Organise template directories

provider-ci/internal/pkg/templates.go

@@ -10,18 +10,16 @@ type TemplateDir string
 
 // Template directories
 const (
-	// configuration to run the repository in a dev container
-	devContainer TemplateDir = "dev-container"
-	// git attributes, go config, CI reusable workflows
-	provider TemplateDir = "provider"
-	// CoC, upgrade-provider config, issue templates, command dispatch workflows
-	pulumiProvider TemplateDir = "pulumi-provider"
-	// ci-mgmt pull-based updates workflow
-	externalProvider TemplateDir = "external-provider"
+	// Globally relevant: git attributes, go config, CI reusable workflows
+	base TemplateDir = "base"
+	// Pulumi-managed providers only: CoC, upgrade-provider config, issue templates, command dispatch workflows
+	internal TemplateDir = "internal"
+	// 3rd party managed providers only: ci-mgmt pull-based updates workflow
+	external TemplateDir = "external"
 	// Generic provider CI templates
 	providerCi = "provider-ci"
 	// Makefile for bridged providers (internal & external)
-	bridgedProvider TemplateDir = "bridged-provider"
+	bridged TemplateDir = "bridged"
 )
 
 // getTemplateDirs returns a list of directories in the embedded filesystem that form the overall template.
@@ -34,13 +32,13 @@ func getTemplateDirs(templateName string) ([]TemplateDir, error) {
 	switch templateName {
 	case "bridged-provider":
 		// Any Pulumi-owned bridged provider
-		return []TemplateDir{devContainer, provider, pulumiProvider, providerCi, bridgedProvider}, nil
+		return []TemplateDir{base, internal, providerCi, bridged}, nil
 	case "external-bridged-provider":
 		// third-party bridged providers
-		return []TemplateDir{devContainer, provider, externalProvider, providerCi, bridgedProvider}, nil
+		return []TemplateDir{base, external, providerCi, bridged}, nil
 	case "generic":
 		// currently almost identical to the bridged-provider template
-		return []TemplateDir{provider, pulumiProvider, providerCi, bridgedProvider}, nil
+		return []TemplateDir{base, internal, providerCi, bridged}, nil
 	default:
 		return nil, fmt.Errorf("unknown template: %s", templateName)
 	}

provider-ci/test-providers/eks/.devcontainer/Dockerfile

@@ -0,0 +1,12 @@
+FROM jetpackio/devbox:latest
+
+# Installing your devbox project
+WORKDIR /code
+COPY devbox.json devbox.json
+COPY devbox.lock devbox.lock
+RUN sudo chown -R "${DEVBOX_USER}:${DEVBOX_USER}" /code
+
+
+RUN devbox run -- echo "Installed Packages."
+
+RUN devbox shellenv --init-hook >> ~/.profile

provider-ci/test-providers/eks/.devcontainer/devcontainer.json

@@ -0,0 +1,16 @@
+{
+  "name": "Devbox Remote Container",
+  "build": {
+    "dockerfile": "./Dockerfile",
+    "context": ".."
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {},
+      "extensions": [
+        "jetpack-io.devbox"
+      ]
+    }
+  },
+  "remoteUser": "devbox"
+}

provider-ci/test-providers/eks/devbox.json

@@ -0,0 +1,22 @@
+{
+  "packages": [
+    "yarn@latest",
+    "pulumictl@latest",
+    "[email protected].",
+    "nodejs@20.",
+    "[email protected]",
+    "[email protected].",
+    "[email protected]",
+    "curl@8"
+  ],
+  "shell": {
+    "init_hook": [
+      "export PATH=\"$(pwd)/bin/:$PATH\""
+    ],
+    "scripts": {
+      "test": [
+        "echo \"Error: no test specified\" && exit 1"
+      ]
+    }
+  }
+}

provider-ci/test-providers/eks/devbox.lock

@@ -0,0 +1 @@
+{}