Narrow-down the download TypeInstance details

cmd/terraform-runner/example-input/args.yml

@@ -11,7 +11,7 @@ env:
   # so setting it directly
   - GOOGLE_PROJECT=capact
 output:
-  goTemplate:
+  goTemplate: |
     host: "{{ .instance_ip_addr }}"
     port: 5432
     defaultDBName: postgres

cmd/ti-value-fetcher/main.go

@@ -3,13 +3,15 @@ package main
 import (
 	"fmt"
 	"log"
+	"time"
 
 	"google.golang.org/grpc"
 
-	"capact.io/capact/internal/logger"
-	tivaluefetcher "capact.io/capact/internal/ti-value-fetcher"
 	"github.com/vrischmann/envconfig"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+
+	"capact.io/capact/internal/logger"
+	tivaluefetcher "capact.io/capact/internal/ti-value-fetcher"
 )
 
 // Config holds TypeInstance Value resolver configuration.
@@ -26,6 +28,8 @@ type Config struct {
 const appName = "ti-value-fetcher"
 
 func main() {
+	start := time.Now()
+
 	var cfg Config
 	err := envconfig.InitWithPrefix(&cfg, "APP")
 	exitOnError(err, "while loading configuration")
@@ -48,6 +52,13 @@ func main() {
 
 	err = tiValueFetcher.SaveToFile(cfg.OutputFilePath, res)
 	exitOnError(err, fmt.Sprintf("while saving output to file %q", cfg.OutputFilePath))
+
+	// Argo doesn't like when a Pod exits too fast
+	// and this may happen when value already provided and no further logic is executed
+	minTime := start.Add(time.Second)
+	if time.Now().Before(minTime) {
+		time.Sleep(time.Second)
+	}
 }
 
 func exitOnError(err error, context string) {

internal/cli/manifestgen/templates/terraform-implementation.yaml.tmpl

@@ -137,7 +137,7 @@ spec:
                               - GOOGLE_PROJECT=<@ providercredentials.project_id @>
                               - GOOGLE_APPLICATION_CREDENTIALS=/additional{{else}}[]{{end}}
                             output:
-                              goTemplate:
+                              goTemplate: |
                                 {{- range $index, $output := .Outputs }}
                                 {{ $output.Name }}: "{{`{{`}} .{{ $output.Name }} {{`}}`}}"
                                 {{- end }}

internal/cli/manifestgen/testdata/cap.implementation.terraform.aws.test.yaml

@@ -105,7 +105,7 @@ spec:
                               - AWS_ACCESS_KEY_ID=<@ providercredentials.accessKeyID @>
                               - AWS_SECRET_ACCESS_KEY=<@ providercredentials.secretAccessKey @>
                             output:
-                              goTemplate:
+                              goTemplate: |
                                 instance_ids: "{{ .instance_ids }}"
                                 random_number: "{{ .random_number }}"
                             variables: |+

internal/cli/manifestgen/testdata/cap.implementation.terraform.gcp.test.yaml

@@ -112,7 +112,7 @@ spec:
                               - GOOGLE_PROJECT=<@ providercredentials.project_id @>
                               - GOOGLE_APPLICATION_CREDENTIALS=/additional
                             output:
-                              goTemplate:
+                              goTemplate: |
                                 instance_ids: "{{ .instance_ids }}"
                                 random_number: "{{ .random_number }}"
                             variables: |+

internal/cli/manifestgen/testdata/cap.implementation.terraform.generic.test.yaml

@@ -98,7 +98,7 @@ spec:
                               source: "https://example.com/module.tgz"
                             env: []
                             output:
-                              goTemplate:
+                              goTemplate: |
                                 instance_ids: "{{ .instance_ids }}"
                                 random_number: "{{ .random_number }}"
                             variables: |+

pkg/argo-actions/download_type_instances.go

@@ -4,11 +4,13 @@ import (
 	"context"
 	"fmt"
 
-	hubclient "capact.io/capact/pkg/hub/client"
-	"capact.io/capact/pkg/runner"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"sigs.k8s.io/yaml"
+
+	hubclient "capact.io/capact/pkg/hub/client"
+	"capact.io/capact/pkg/hub/client/local"
+	"capact.io/capact/pkg/runner"
 )
 
 // DownloadAction represents the download TypeInstance action.
@@ -52,7 +54,7 @@ func NewDownloadAction(log *zap.Logger, client *hubclient.Client, cfg []Download
 func (d *Download) Do(ctx context.Context) error {
 	for _, config := range d.cfg {
 		d.log.Info("Downloading TypeInstance", zap.String("ID", config.ID), zap.String("Path", config.Path))
-		typeInstance, err := d.client.FindTypeInstance(ctx, config.ID)
+		typeInstance, err := d.client.FindTypeInstance(ctx, config.ID, local.WithFields(local.TypeInstanceLatestResourceVersionFields))
 		if err != nil {
 			return err
 		}

pkg/runner/terraform/terraform.go

@@ -153,21 +153,14 @@ func (t *terraform) variables() ([]byte, error) {
 }
 
 func (t *terraform) renderOutput() ([]byte, error) {
-	if t.args.Output.GoTemplate == nil {
+	if t.args.Output.GoTemplate == "" {
 		return []byte{}, nil
 	}
 	if len(t.runOutput) == 0 {
 		return []byte{}, nil
 	}
 
-	// yaml.Unmarshal converts YAML to JSON then uses JSON to unmarshal into an object
-	// but the GoTemplate is defined via YAML, so we need to revert that change
-	artifactTemplate, err := yaml.JSONToYAML(t.args.Output.GoTemplate)
-	if err != nil {
-		return nil, errors.Wrap(err, "while converting GoTemplate property from JSON to YAML")
-	}
-
-	tmpl, err := template.New("output").Parse(string(artifactTemplate))
+	tmpl, err := template.New("output").Parse(t.args.Output.GoTemplate)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to load template")
 	}

pkg/runner/terraform/types.go

@@ -1,7 +1,5 @@
 package terraform
 
-import "encoding/json"
-
 // CommandType represents the operation type to be performed by the runner.
 type CommandType string
 
@@ -33,7 +31,7 @@ type Module struct {
 
 // AdditionalOutput stores input arguments for generating the additional output.
 type AdditionalOutput struct {
-	GoTemplate json.RawMessage `yaml:"goTemplate"`
+	GoTemplate string `yaml:"goTemplate"`
 }
 
 // Config holds Runner related configuration.