wip

taskcluster · May 16, 2023 · f8ab742 · f8ab742
1 parent 871e120
commit f8ab742
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/workers/generic-worker/azure.go b/workers/generic-worker/azure.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -30,10 +29,14 @@ type (
 
 	AzureMetaData struct {
 		Compute struct {
-			CustomData string `json:"customData"`
-			Location   string `json:"location"`
-			VMID       string `json:"vmId"`
-			VMSize     string `json:"vmSize"`
+			Location string `json:"location"`
+			Name     string `json:"name"`
+			VMID     string `json:"vmId"`
+			VMSize   string `json:"vmSize"`
+			TagsList []struct {
+				Name  string `json:"name"`
+				Value string `json:"value"`
+			} `json:"tagsList"`
 		} `json:"compute"`
 		Network struct {
 			Interface []struct {
@@ -85,15 +88,16 @@ func (g *AzureConfigProvider) UpdateConfig(c *gwconfig.Config) error {
 		return fmt.Errorf("Could not unmarshal instance metadata %q into AzureMetaData struct - is it valid JSON? %v", string(instanceMetaData), err)
 	}
 
-	taskclusterConfig, err := base64.StdEncoding.DecodeString(azureMetaData.Compute.CustomData)
-	if err != nil {
-		return fmt.Errorf("Custom data %q is not valid base64: %v", azureMetaData.Compute.CustomData, err)
+	tags := map[string]string{}
+	for _, i := range azureMetaData.Compute.TagsList {
+		tags[i.Name] = i.Value
 	}
 
-	userData := new(WorkerManagerUserData)
-	err = json.Unmarshal(taskclusterConfig, userData)
-	if err != nil {
-		return fmt.Errorf("Could not parse base64 decoded custom data %q as JSON: %v", taskclusterConfig, err)
+	userData := &WorkerManagerUserData{
+		WorkerPoolID: tags["worker-pool-id"],
+		ProviderID:   tags["provider-id"],
+		WorkerGroup:  tags["worker-group"],
+		RootURL:      tags["root-url"],
 	}
 
 	c.WorkerTypeMetadata["azure"] = map[string]interface{}{

diff --git a/workers/generic-worker/workermanager.go b/workers/generic-worker/workermanager.go
@@ -12,11 +12,10 @@ import (
 )
 
 type WorkerManagerUserData struct {
-	WorkerPoolID string          `json:"workerPoolId"`
-	ProviderID   string          `json:"providerId"`
-	WorkerGroup  string          `json:"workerGroup"`
-	RootURL      string          `json:"rootUrl"`
-	WorkerConfig BootstrapConfig `json:"workerConfig"`
+	WorkerPoolID string `json:"workerPoolId"`
+	ProviderID   string `json:"providerId"`
+	WorkerGroup  string `json:"workerGroup"`
+	RootURL      string `json:"rootUrl"`
 }
 
 type Provider uint
@@ -66,7 +65,7 @@ func (userData *WorkerManagerUserData) UpdateConfig(c *gwconfig.Config, provider
 
 	// TODO: process reg.Expires
 
-	return Bootstrap(c, &userData.WorkerConfig, "worker-pool")
+	return Bootstrap(c, &BootstrapConfig{GenericWorker: reg.WorkerConfig}, "worker-pool")
 }
 
 func WMDeploymentID() (string, error) {