Fix workflow mocks and check

uber · Sep 27, 2019 · 80b8df0 · 80b8df0
1 parent 4ae0a85
commit 80b8df0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/codegen/module.go b/codegen/module.go
@@ -1154,8 +1154,10 @@ func (system *ModuleSystem) IncrementalBuild(
 	}
 
 	for i, hook := range system.postGenHook {
-		if err := hook(toBeBuiltModules); err != nil {
-			return toBeBuiltModules, errors.Wrapf(err, "error running %dth post generation hook", i)
+		if hook != nil {
+			if err := hook(toBeBuiltModules); err != nil {
+				return toBeBuiltModules, errors.Wrapf(err, "error running %dth post generation hook", i)
+			}
 		}
 	}
 

diff --git a/codegen/module_system.go b/codegen/module_system.go
@@ -240,27 +240,26 @@ func NewDefaultModuleSystemWithMockHook(
 		return nil, err
 	}
 
-	var allHooks []PostGenHook
 	var clientMockGenHook, workflowMockGenHook, serviceMockGenHook PostGenHook
 	if clientsMock {
 		clientMockGenHook, err = ClientMockGenHook(h, t)
 		if err != nil {
 			return nil, errors.Wrap(err, "error creating client mock gen hook")
 		}
-
-		allHooks = append([]PostGenHook{clientMockGenHook}, hooks...)
+		hooks = append(hooks, clientMockGenHook)
 	}
 
 	if workflowMock {
 		workflowMockGenHook = WorkflowMockGenHook(h, t)
-		allHooks = append([]PostGenHook{workflowMockGenHook}, hooks...)
+		hooks = append(hooks, workflowMockGenHook)
 	}
+
 	if serviceMock {
 		serviceMockGenHook = ServiceMockGenHook(h, t)
-		allHooks = append([]PostGenHook{serviceMockGenHook}, hooks...)
+		hooks = append(hooks, serviceMockGenHook)
 	}
 
-	return NewDefaultModuleSystem(h, allHooks...)
+	return NewDefaultModuleSystem(h, hooks...)
 }
 
 // NewDefaultModuleSystem creates a fresh instance of the default zanzibar