refactor: receiver of renderInstanceIDtoOptions

Signed-off-by: Bird <[email protected]>

Author: aFlyBird0

internal/pkg/configmanager/config.go

@@ -11,15 +11,6 @@ type Config struct {
 	Tools  Tools          `yaml:"tools"`
 }
 
-func (c *Config) renderInstanceIDtoOptions() {
-	for _, t := range c.Tools {
-		if t.Options == nil {
-			t.Options = make(RawOptions)
-		}
-		t.Options["instanceID"] = t.InstanceID
-	}
-}
-
 func (c *Config) validate() error {
 	if c.Config.State == nil {
 		return fmt.Errorf("config.state is not defined")

internal/pkg/configmanager/config_test.go

@@ -6,31 +6,10 @@ import (
 )
 
 var _ = Describe("Config struct", func() {
-	var (
-		c                    *Config
-		toolName, instanceID string
-	)
+	var c *Config
+
 	BeforeEach(func() {
 		c = &Config{}
-		toolName = "test_tool"
-		instanceID = "test_instance"
-	})
-	Context("renderInstanceIDtoOptions method", func() {
-		When("tool option is null", func() {
-			BeforeEach(func() {
-				c.Tools = Tools{
-					{Name: toolName, InstanceID: instanceID},
-				}
-			})
-			It("should set nil to RawOptions", func() {
-				c.renderInstanceIDtoOptions()
-				Expect(len(c.Tools)).Should(Equal(1))
-				tool := c.Tools[0]
-				Expect(tool.Options).Should(Equal(RawOptions{
-					"instanceID": instanceID,
-				}))
-			})
-		})
 	})
 	Context("validate method", func() {
 		When("config state is null", func() {

internal/pkg/configmanager/configmanager.go

@@ -29,7 +29,7 @@ func (m *Manager) LoadConfig() (*Config, error) {
 		return nil, err
 	}
 	// set instanceID in options
-	c.renderInstanceIDtoOptions()
+	c.Tools.renderInstanceIDtoOptions()
 
 	// step 2: check config is valid
 	if err = c.validate(); err != nil {

internal/pkg/configmanager/tool.go

@@ -157,3 +157,12 @@ func (tools Tools) updateToolDepends(dependTools Tools) {
 		}
 	}
 }
+
+func (tools Tools) renderInstanceIDtoOptions() {
+	for _, t := range tools {
+		if t.Options == nil {
+			t.Options = make(RawOptions)
+		}
+		t.Options["instanceID"] = t.InstanceID
+	}
+}

internal/pkg/configmanager/tool_test.go

@@ -139,3 +139,29 @@ var _ = Describe("Tool struct", func() {
 		})
 	})
 })
+
+var _ = Describe("Tool struct", func() {
+	var tools Tools
+
+	const (
+		toolName   = "test_tool"
+		instanceID = "test_instance"
+	)
+	Context("renderInstanceIDtoOptions method", func() {
+		BeforeEach(func() {
+			tools = Tools{
+				{Name: toolName, InstanceID: instanceID},
+			}
+		})
+		When("tool option is null", func() {
+			It("should set nil to RawOptions", func() {
+				tools.renderInstanceIDtoOptions()
+				Expect(len(tools)).Should(Equal(1))
+				tool := tools[0]
+				Expect(tool.Options).Should(Equal(RawOptions{
+					"instanceID": instanceID,
+				}))
+			})
+		})
+	})
+})