Merge pull request #1257 from aFlyBird0/feat-apps-depends

feat: all tools from apps depend on origin tools

Author: daniel-hutao

internal/pkg/configmanager/config.go

@@ -73,6 +73,14 @@ func (c *Config) getToolsWithVarsFromApp(a app) (Tools, error) {
 		tools = append(tools, repoScaffoldingTool)
 	}
 
+	// 5. all tools from apps should depend on the original tools,
+	//    because dtm will execute all original tools first, then execute all tools from apps
+	for _, toolFromApps := range tools {
+		for _, t := range c.Tools {
+			toolFromApps.DependsOn = append(toolFromApps.DependsOn, t.KeyWithNameAndInstanceID())
+		}
+	}
+
 	log.Debugf("Have got %d tools from app %s.", len(tools), rawApp.Name)
 	for i, t := range tools {
 		log.Debugf("Tool %d: %v", i+1, t)

internal/pkg/configmanager/configmanager_test.go

@@ -122,6 +122,8 @@ var _ = Describe("LoadConfig", func() {
 		InstanceID: "service-a",
 		DependsOn: []string{
 			"repo-scaffolding.service-a",
+			"plugin1.default",
+			"plugin2.tluafed",
 		},
 		Options: RawOptions{
 			"instanceID": "service-a",
@@ -152,6 +154,8 @@ var _ = Describe("LoadConfig", func() {
 		InstanceID: "service-a",
 		DependsOn: []string{
 			"repo-scaffolding.service-a",
+			"plugin1.default",
+			"plugin2.tluafed",
 		},
 		Options: RawOptions{
 			"instanceID": "service-a",
@@ -184,7 +188,10 @@ var _ = Describe("LoadConfig", func() {
 	tool5 := &Tool{
 		Name:       "repo-scaffolding",
 		InstanceID: "service-a",
-		DependsOn:  []string{},
+		DependsOn: []string{
+			"plugin1.default",
+			"plugin2.tluafed",
+		},
 		Options: RawOptions{
 			"instanceID": "service-a",
 			"destinationRepo": RawOptions{