Merge pull request #534 from ulucinar/fix-monolith

Do not duplicate base package controllers in the monolithic provider

Author: ulucinar

pkg/config/provider.go

@@ -52,7 +52,11 @@ func (cc ResourceConfiguratorChain) Configure(r *Resource) {
 type BasePackages struct {
 	APIVersion []string
 	// Deprecated: Use ControllerMap instead.
-	Controller    []string
+	Controller []string
+	// ControllerMap is a map from:
+	// <API group name>/<resource name> to <provider package name>.
+	// An example is "azure/resourcegroup: config", where "config" represents
+	// the config package (provider family package).
 	ControllerMap map[string]string
 }
 

pkg/pipeline/run.go

@@ -207,7 +207,11 @@ func (r *PipelineRunner) Run(pc *config.Provider) []string { //nolint:gocyclo
 					panic(errors.Wrapf(err, "cannot generate controller for resource %s", name))
 				}
 				controllerPkgMap[shortGroup] = append(controllerPkgMap[shortGroup], ctrlPkgPath)
-				controllerPkgMap[config.PackageNameMonolith] = append(controllerPkgMap[config.PackageNameMonolith], ctrlPkgPath)
+				// if the controller is not already added as a base package controller
+				// to the monolith provider.
+				if len(pc.BasePackages.ControllerMap[strings.TrimPrefix(ctrlPkgPath, strings.TrimSuffix(r.ModulePathControllers, "/")+"/")]) == 0 {
+					controllerPkgMap[config.PackageNameMonolith] = append(controllerPkgMap[config.PackageNameMonolith], ctrlPkgPath)
+				}
 				if err := exampleGen.Generate(group, version, resources[name]); err != nil {
 					panic(errors.Wrapf(err, "cannot generate example manifest for resource %s", name))
 				}