post plugin fixes, remove flattening until I can Phone a Friend

cueblox · Sep 7, 2021 · a9322ab · a9322ab
1 parent 48e0a8f
commit a9322ab
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/cmd/images/images_impl.go b/cmd/images/images_impl.go
@@ -71,7 +71,7 @@ func (g *ImageScanner) processImages(staticDir string) error {
 				return err
 			}
 
-			g.logger.Debug("Processing", "path", path)
+			g.logger.Info("Processing", "path", path)
 			if !info.IsDir() {
 				buf, err := ioutil.ReadFile(path)
 				if err != nil {

diff --git a/content/postplugins.go b/content/postplugins.go
@@ -45,7 +45,7 @@ func (s *Service) runPostPlugins() error {
 		if err != nil {
 			return err
 		}
-		prePluginMap[n] = &plugins.PostbuildPlugin{}
+		postPluginMap[n] = &plugins.PostbuildPlugin{}
 		pterm.Info.Println("Calling Plugin", n, e)
 		err = s.callPostPlugin(n, e)
 		if err != nil {
@@ -69,6 +69,7 @@ func (s *Service) callPostPlugin(name, executable string) error {
 		pterm.Error.Println("plugin not found in path", executable)
 		log.Fatal(err)
 	}
+	pterm.Info.Println("found plugin at path", executable, executablePath)
 	// We're a host! Start by launching the plugin process.
 	client := plugin.NewClient(&plugin.ClientConfig{
 		HandshakeConfig: shared.PostbuildHandshakeConfig,
@@ -79,12 +80,14 @@ func (s *Service) callPostPlugin(name, executable string) error {
 	defer client.Kill()
 
 	// Connect via RPC
+	log.Println("Connecting to client")
 	rpcClient, err := client.Client()
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Request the plugin
+	log.Println("Getting Plugin")
 	raw, err := rpcClient.Dispense(name)
 	if err != nil {
 		log.Fatal(err)
@@ -93,5 +96,7 @@ func (s *Service) callPostPlugin(name, executable string) error {
 	// We should have a Postbuild plugin now! This feels like a normal interface
 	// implementation but is in fact over an RPC connection.
 	postplug := raw.(plugins.Postbuild)
+	log.Println("Making the call")
+	log.Println(s.rawConfig)
 	return postplug.Process(s.rawConfig)
 }
diff --git a/content/render.go b/content/render.go
@@ -105,5 +105,11 @@ func (s *Service) RenderAndSave() error {
 	}
 
 	pterm.Success.Printf("Data blox written to '%s'\n", filePath)
+
+	pterm.Info.Println("Running Postbuild Plugins")
+	err = s.runPostPlugins()
+	if err != nil {
+		return err
+	}
 	return nil
 }
diff --git a/content/repository.go b/content/repository.go
@@ -116,6 +116,7 @@ func (s *Service) build() error {
 		return err
 	}
 
+	pterm.Info.Println("Running Prebuild Plugins")
 	err = s.runPrePlugins()
 	if err != nil {
 		return err
@@ -210,10 +211,6 @@ func (s *Service) build() error {
 
 	pterm.Success.Println("Validation Complete")
 	s.built = true
-	err = s.runPostPlugins()
-	if err != nil {
-		return err
-	}
 	return nil
 }
 

diff --git a/internal/cuedb/engine.go b/internal/cuedb/engine.go
@@ -431,17 +431,19 @@ func (r *Engine) GetOutput() (cue.Value, error) {
 		r.Database = r.Database.FillPath(cue.Path{}, inst.Value())
 
 		// begin flattening
-		if true { // TODO: flag later
-			err := r.flatten(dataSet)
-			if err != nil {
-				fmt.Println(err)
+		/*	if true { // TODO: flag later
+				err := r.flatten(dataSet)
+				if err != nil {
+					fmt.Println(err)
+				}
 			}
-		}
-		// end flattening
+			// end flattening
+		*/
 	}
 	return r.Database.LookupPath(cue.ParsePath("output")), nil
 }
 
+/*
 func (r *Engine) flatten(d DataSet) error {
 	for _, rel := range d.relationships {
 
@@ -468,3 +470,4 @@ func (r *Engine) flatten(d DataSet) error {
 	}
 	return nil
 }
+*/