fix: Define default values for the contextPath or ModuleDirName when …

…not defined by BuilConfig. #147
halkyonio · Sep 11, 2019 · 88998cf · 88998cf
1 parent daa48a5
commit 88998cf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/pkg/controller/component/helpers.go b/pkg/controller/component/helpers.go
@@ -98,6 +98,24 @@ func (r *ReconcileComponent) baseImage(c *controller.Component) string {
 	}
 }
 
+func (r *ReconcileComponent) contextPath(c *controller.Component) string {
+	if c.Spec.BuildConfig.ContextPath != "" {
+		return c.Spec.BuildConfig.ContextPath
+	} else {
+		// We return the default value as defined within the Task
+		return "."
+	}
+}
+
+func (r *ReconcileComponent) moduleDirName(c *controller.Component) string {
+	if c.Spec.BuildConfig.ModuleDirName != "" {
+		return c.Spec.BuildConfig.ModuleDirName
+	} else {
+		// We return the default value as defined within the Task
+		return "."
+	}
+}
+
 func (r *ReconcileComponent) gitRevision(c *controller.Component) string {
 	if c.Spec.BuildConfig.Ref == "" {
 		return "master"

diff --git a/pkg/controller/component/taskruns.go b/pkg/controller/component/taskruns.go
@@ -49,8 +49,8 @@ func (res taskRun) Build() (runtime.Object, error) {
 					// See description of the parameters within the Tasks
 					// We only override parameters here. Defaults are defined within the Tasks
 					{Name: "baseImage", Value: res.reconciler.baseImage(c)},
-					{Name: "moduleDirName", Value: c.Spec.BuildConfig.ModuleDirName},
-					{Name: "contextPath", Value: c.Spec.BuildConfig.ContextPath},
+					{Name: "moduleDirName", Value: res.reconciler.moduleDirName(c)},
+					{Name: "contextPath", Value: res.reconciler.contextPath(c)},
 				},
 				Resources: []v1alpha1.TaskResourceBinding{
 					{