Merge pull request #157 from rabbitmq/extra-apps-does-not-contain-deps

gazelle: erlang_app extra_apps will no longer contain deps

Author: HoloRin

gazelle/erlang_app.go

@@ -673,8 +673,11 @@ func (erlangApp *ErlangApp) ErlangAppRule(args language.GenerateArgs, explicitFi
 	if erlangApp.Description != "" {
 		r.SetAttr("app_description", erlangApp.Description)
 	}
-	if !erlangApp.ExtraApps.IsEmpty() {
-		r.SetAttr("extra_apps", erlangApp.ExtraApps.Values(strings.Compare))
+	extraApps := erlangApp.ExtraApps.Clone()
+	extraApps.Subtract(erlangConfig.ExcludedDeps)
+	extraApps.Subtract(erlangApp.Deps)
+	if !extraApps.IsEmpty() {
+		r.SetAttr("extra_apps", extraApps.Values(strings.Compare))
 	}
 
 	r.SetAttr("beam_files", []string{":beam_files"})
@@ -692,6 +695,7 @@ func (erlangApp *ErlangApp) ErlangAppRule(args language.GenerateArgs, explicitFi
 	if !deps.IsEmpty() {
 		r.SetAttr("deps", deps.Values(strings.Compare))
 	}
+
 	return r
 }
 
@@ -706,8 +710,11 @@ func (erlangApp *ErlangApp) testErlangAppRule(args language.GenerateArgs, explic
 	if erlangApp.Description != "" {
 		r.SetAttr("app_description", erlangApp.Description)
 	}
-	if !erlangApp.ExtraApps.IsEmpty() {
-		r.SetAttr("extra_apps", erlangApp.ExtraApps.Values(strings.Compare))
+	extraApps := erlangApp.ExtraApps.Clone()
+	extraApps.Subtract(erlangConfig.ExcludedDeps)
+	extraApps.Subtract(erlangApp.Deps)
+	if !extraApps.IsEmpty() {
+		r.SetAttr("extra_apps", extraApps.Values(strings.Compare))
 	}
 
 	r.SetAttr("beam_files", []string{":test_beam_files"})
@@ -725,6 +732,7 @@ func (erlangApp *ErlangApp) testErlangAppRule(args language.GenerateArgs, explic
 	if !deps.IsEmpty() {
 		r.SetAttr("deps", deps.Values(strings.Compare))
 	}
+
 	return r
 }
 

test/gazelle/erlang_test.go

@@ -102,6 +102,56 @@ var _ = Describe("an ErlangApp", func() {
 		})
 	})
 
+	Describe("ErlangAppRule", func() {
+		var fakeParser erlang.ErlParser
+
+		BeforeEach(func() {
+			app.AddFile("src/foo.erl")
+
+			fakeParser = fakeErlParser(map[string]*erlang.ErlAttrs{
+				"src/foo.erl": &erlang.ErlAttrs{
+					Call: map[string][]string{
+						"bar_lib": []string{"make_test_thing"},
+					},
+				},
+			})
+
+			erlangConfigs := args.Config.Exts["erlang"].(erlang.ErlangConfigs)
+			erlangConfig := erlangConfigs[args.Rel]
+			erlangConfig.ModuleMappings["bar_lib"] = "bar_lib"
+			erlangConfig.ExcludedDeps.Add("other_lib")
+		})
+
+		It("Does not contain extra_apps that are deps", func() {
+			// ExtraApps might be populated by the parsing of a
+			// precompiled .app file in the ebin dir
+			app.ExtraApps.Add("bar_lib")
+
+			app.BeamFilesRules(args, fakeParser)
+			r := app.ErlangAppRule(args, false)
+
+			Expect(r.Name()).To(Equal("erlang_app"))
+			Expect(r.AttrStrings("extra_apps")).ToNot(
+				ContainElement("bar_lib"),
+			)
+			Expect(r.AttrStrings("deps")).To(
+				ContainElement("bar_lib"),
+			)
+		})
+
+		It("Does not contain extra_apps that are excluded", func() {
+			app.ExtraApps.Add("other_lib")
+
+			app.BeamFilesRules(args, fakeParser)
+			r := app.ErlangAppRule(args, false)
+
+			Expect(r.Name()).To(Equal("erlang_app"))
+			Expect(r.AttrStrings("extra_apps")).ToNot(
+				ContainElement("other_lib"),
+			)
+		})
+	})
+
 	Describe("BeamFilesRules", func() {
 		BeforeEach(func() {
 			app.AddFile("src/foo.erl")