Merge pull request #121 from gcs278/OCPBUGS-34619-TestImportOrdering

OCPBUGS-34619: UPSTREAM: 6692: openshift: Fix OCPBUGS-34619

directives_generate.go

@@ -58,10 +58,22 @@ func genImports(file, pack string, mi map[string]string) {
 		outs += "\n"
 	}
 
+	coreDnsImports := ""
+	thirdPartyImports := ""
+
 	outs += "// Include all plugins.\n"
 	for _, v := range mi {
-		outs += `_ "` + v + `"` + "\n"
+		if strings.HasPrefix(v, githubOrg) {
+			coreDnsImports += `_ "` + v + `"` + "\n"
+		} else {
+			thirdPartyImports += `_ "` + v + `"` + "\n"
+		}
 	}
+	outs += coreDnsImports
+	if thirdPartyImports != "" {
+		outs += "\n" + thirdPartyImports
+	}
+
 	outs += ")\n"
 
 	if err := formatAndWrite(file, outs); err != nil {
@@ -107,7 +119,8 @@ func formatAndWrite(file string, data string) error {
 }
 
 const (
-	pluginPath   = "github.com/coredns/coredns/plugin/"
+	githubOrg    = "github.com/coredns"
+	pluginPath   = githubOrg + "/coredns/plugin/"
 	pluginFile   = "plugin.cfg"
 	pluginFSPath = "plugin/" // Where the plugins are located on the file system
 	header       = "// generated by directives_generate.go; DO NOT EDIT\n\n"