Bug 1516458 - code beautification - fix alphabetical ordering of prop…

…erty names in bulk property activities
taskcluster · Jan 4, 2019 · b8cc67a · b8cc67a
1 parent 38297d1
commit b8cc67a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/aws.go b/aws.go
@@ -210,12 +210,13 @@ func updateConfigWithAmazonSettings(c *gwconfig.Config) error {
 	if removeErr != nil {
 		return removeErr
 	}
+
 	c.AccessToken = secToken.Credentials.AccessToken
-	c.ClientID = secToken.Credentials.ClientID
 	c.Certificate = secToken.Credentials.Certificate
+	c.ClientID = secToken.Credentials.ClientID
+	c.RootURL = userData.TaskclusterRootURL
 	c.WorkerGroup = userData.Region
 	c.WorkerType = userData.WorkerType
-	c.RootURL = userData.TaskclusterRootURL
 
 	awsMetadata := map[string]interface{}{}
 	for _, url := range []string{

diff --git a/gwconfig/config.go b/gwconfig/config.go
@@ -101,10 +101,10 @@ func (c *Config) Validate() error {
 		{value: c.LiveLogSecret, name: "livelogSecret", disallowed: ""},
 		{value: c.ProvisionerID, name: "provisionerId", disallowed: ""},
 		{value: c.PublicIP, name: "publicIP", disallowed: net.IP(nil)},
+		{value: c.RootURL, name: "rootURL", disallowed: ""},
 		{value: c.SigningKeyLocation, name: "signingKeyLocation", disallowed: ""},
 		{value: c.Subdomain, name: "subdomain", disallowed: ""},
 		{value: c.TasksDir, name: "tasksDir", disallowed: ""},
-		{value: c.RootURL, name: "rootURL", disallowed: ""},
 		{value: c.WorkerGroup, name: "workerGroup", disallowed: ""},
 		{value: c.WorkerID, name: "workerId", disallowed: ""},
 		{value: c.WorkerType, name: "workerType", disallowed: ""},