WIP

Author: Michael Sauter

cmd/taskdoc/main.go

@@ -0,0 +1,48 @@
+package main
+
+import (
+	"flag"
+	"log"
+	"os"
+	"text/template"
+
+	"github.com/opendevstack/ods-pipeline/internal/projectpath"
+	"github.com/opendevstack/ods-pipeline/pkg/taskdoc"
+)
+
+func main() {
+	taskFile := flag.String("task", "", "Task manifest")
+	descriptionFile := flag.String("description", "", "Description snippet")
+	templateFile := flag.String("template", projectpath.RootedPath("docs/tasks/template.adoc.tmpl"), "Template file")
+	destinationFile := flag.String("destination", "", "Destination file")
+	flag.Parse()
+	if err := render(*taskFile, *descriptionFile, *templateFile, *destinationFile); err != nil {
+		log.Fatal(err)
+	}
+}
+
+func render(taskFile, descriptionFile, templateFile, destinationFile string) error {
+	t, err := os.ReadFile(taskFile)
+	if err != nil {
+		return err
+	}
+	d, err := os.ReadFile(descriptionFile)
+	if err != nil {
+		return err
+	}
+	tmpl, err := template.ParseFiles(templateFile)
+	if err != nil {
+		return err
+	}
+
+	task, err := taskdoc.ParseTask(t, d)
+	if err != nil {
+		return err
+	}
+
+	w, err := os.Create(destinationFile)
+	if err != nil {
+		return err
+	}
+	return taskdoc.RenderTaskDocumentation(w, tmpl, task)
+}

cmd/taskmanifest/main.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+	"text/template"
+
+	"github.com/opendevstack/ods-pipeline/pkg/taskmanifest"
+	"github.com/opendevstack/ods-pipeline/pkg/tektontaskrun"
+)
+
+func main() {
+	templateFile := flag.String("template", "", "Template file")
+	destinationFile := flag.String("destination", "", "Destination file")
+	cc := tektontaskrun.NewClusterConfig()
+	mf := &MapFlag{v: cc.DefaultTaskTemplateData()}
+	flag.Var(mf, "data", "Key-value pairs")
+	flag.Parse()
+	if err := render(*templateFile, *destinationFile, mf.v); err != nil {
+		log.Fatal(err)
+	}
+}
+
+func render(templateFile, destinationFile string, data map[string]string) error {
+	tmpl, err := template.ParseFiles(templateFile)
+	if err != nil {
+		return err
+	}
+
+	w, err := os.Create(destinationFile)
+	if err != nil {
+		return err
+	}
+	return taskmanifest.RenderTask(w, tmpl, data)
+}
+
+type MapFlag struct {
+	v map[string]string
+}
+
+func (mf *MapFlag) String() string {
+	return fmt.Sprintf("%v", mf.v)
+}
+func (mf *MapFlag) Set(v string) error {
+	key, value, ok := strings.Cut(v, "=")
+	if !ok {
+		return fmt.Errorf("must have = sign")
+	}
+	mf.v[key] = value
+	return nil
+}

internal/docs/tasks.go

@@ -2,11 +2,12 @@ package docs
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
-	"strings"
 	"text/template"
 
 	"github.com/opendevstack/ods-pipeline/internal/command"
@@ -37,20 +38,11 @@ func renderTemplate(targetDir, targetFilename string, data Task) error {
 	if err != nil {
 		return err
 	}
-	templateFilename := filepath.Join(targetDir, "template.adoc.tmpl")
-	templateFileParts := strings.Split(templateFilename, "/")
-	templateDisplayname := templateFileParts[len(templateFileParts)-1]
-	_, err = targetFile.WriteString(
-		"// Document generated by internal/documentation/tasks.go from " + templateDisplayname + "; DO NOT EDIT.\n\n",
-	)
+	tmpl, err := template.ParseFiles(filepath.Join(targetDir, "template.adoc.tmpl"))
 	if err != nil {
 		return err
 	}
-	tmpl, err := template.ParseFiles(templateFilename)
-	if err != nil {
-		return err
-	}
-	return tmpl.Execute(targetFile, data)
+	return RenderTaskDocumentation(targetFile, tmpl, &data)
 }
 
 func parseTasks(helmTemplateOutput []byte) ([]*tekton.Task, error) {
@@ -131,3 +123,47 @@ func RenderTasks(tasksSourceDir, descriptionsSourceDir, targetDir string) error
 	}
 	return nil
 }
+
+func ParseTask(f []byte, desc []byte) (*Task, error) {
+	var t tekton.Task
+	err := yaml.Unmarshal(f, &t)
+	if err != nil {
+		return nil, err
+	}
+	if t.Name == "" {
+		return nil, errors.New("encountered empty name, something is wrong with the task")
+	}
+	task := &Task{
+		Name:        t.Name,
+		Description: string(desc),
+		Params:      []Param{},
+		Results:     []Result{},
+	}
+	for _, p := range t.Spec.Params {
+		defaultValue := ""
+		if p.Default != nil {
+			defaultValue = p.Default.StringVal
+		}
+		task.Params = append(task.Params, Param{
+			Name:        p.Name,
+			Default:     defaultValue,
+			Description: p.Description,
+		})
+	}
+	for _, r := range t.Spec.Results {
+		task.Results = append(task.Results, Result{
+			Name:        r.Name,
+			Description: r.Description,
+		})
+	}
+	return task, nil
+}
+
+func RenderTaskDocumentation(w io.Writer, tmpl *template.Template, task *Task) error {
+	if _, err := w.Write(
+		[]byte("// File is generated; DO NOT EDIT.\n\n"),
+	); err != nil {
+		return err
+	}
+	return tmpl.Execute(w, task)
+}

internal/projectpath/root.go

@@ -11,3 +11,7 @@ var (
 	// Root folder of this project
 	Root = filepath.Join(filepath.Dir(b), "../..")
 )
+
+func RootedPath(path string) string {
+	return filepath.Join(Root, path)
+}

pkg/odstasktest/assertions.go

@@ -0,0 +1,40 @@
+package odstasktest
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+// AssertFilesExist checks that all files named by wantFiles exist in wsDir.
+// Any files that do not exist will report a test error.
+func AssertFilesExist(t *testing.T, wsDir string, wantFiles ...string) {
+	for _, wf := range wantFiles {
+		filename := filepath.Join(wsDir, wf)
+		if _, err := os.Stat(filename); os.IsNotExist(err) {
+			t.Errorf("Want %s, but got nothing", filename)
+		}
+	}
+}
+
+// AssertFileContent checks that the file named by filename in the directory
+// wsDir has the exact context specified by want.
+func AssertFileContent(t *testing.T, wsDir, filename, want string) {
+	got, err := getTrimmedFileContent(filepath.Join(wsDir, filename))
+	if err != nil {
+		t.Errorf("get content of %s: %s", filename, err)
+		return
+	}
+	if got != want {
+		t.Errorf("got '%s', want '%s' in file %s", got, want, filename)
+	}
+}
+
+func getTrimmedFileContent(filename string) (string, error) {
+	content, err := os.ReadFile(filename)
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(string(content)), nil
+}

pkg/odstasktest/install.go

@@ -0,0 +1,45 @@
+package odstasktest
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/opendevstack/ods-pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/internal/projectpath"
+	ttr "github.com/opendevstack/ods-pipeline/pkg/tektontaskrun"
+)
+
+var privateCertFlag = flag.Bool("ods-private-cert", false, "Whether to use a private cert")
+
+// InstallODSPipeline installs the ODS Pipeline Helm chart in the namespace
+// given in NamespaceConfig.
+func InstallODSPipeline() ttr.NamespaceOpt {
+	flag.Parse()
+	return func(cc *ttr.ClusterConfig, nc *ttr.NamespaceConfig) error {
+		return installCDNamespaceResources(nc.Name, "pipeline", *privateCertFlag)
+	}
+}
+
+func installCDNamespaceResources(ns, serviceaccount string, privateCert bool) error {
+	scriptArgs := []string{filepath.Join(projectpath.Root, "scripts/install-inside-kind.sh"), "-n", ns, "-s", serviceaccount, "--no-diff"}
+	// if testing.Verbose() {
+	// 	scriptArgs = append(scriptArgs, "-v")
+	// }
+	if privateCert {
+		// Insert as first flag because install-inside-kind.sh won't recognize it otherwise.
+		scriptArgs = append(
+			[]string{fmt.Sprintf("--private-cert=%s", filepath.Join(projectpath.Root, "test/testdata/private-cert/tls.crt"))},
+			scriptArgs...,
+		)
+	}
+
+	return command.Run(
+		"sh",
+		scriptArgs,
+		[]string{},
+		os.Stdout,
+		os.Stderr,
+	)
+}

pkg/odstasktest/services.go

@@ -0,0 +1,52 @@
+package odstasktest
+
+import (
+	"flag"
+	"os"
+
+	"github.com/opendevstack/ods-pipeline/internal/command"
+	"github.com/opendevstack/ods-pipeline/internal/projectpath"
+	ttr "github.com/opendevstack/ods-pipeline/pkg/tektontaskrun"
+)
+
+var restartNexusFlag = flag.Bool("ods-restart-nexus", false, "Whether to force a restart of Nexus")
+var restartSonarQubeFlag = flag.Bool("ods-restart-sonarqube", false, "Whether to force a restart of SonarQube")
+var restartBitbucketFlag = flag.Bool("ods-restart-bitbucket", false, "Whether to force a restart of Bitbucket")
+var skipSonarQubeFlag = flag.Bool("ods-skip-sonar", false, "Whether to skip SonarQube steps")
+
+// StartNexus starts a Nexus instance in a Docker container (named
+// ods-test-nexus). If a container of the same name already exists, it will be
+// reused unless -ods-restart-nexus is passed.
+func StartNexus() ttr.NamespaceOpt {
+	flag.Parse()
+	return runService("run-nexus.sh", *restartNexusFlag)
+}
+
+// StartSonarQube starts a SonarQube instance in a Docker container (named
+// ods-test-sonarqube). If a container of the same name already exists, it will
+// be reused unless -ods-restart-sonarqube is passed.
+func StartSonarQube() ttr.NamespaceOpt {
+	flag.Parse()
+	if *skipSonarQubeFlag {
+		return func(cc *ttr.ClusterConfig, nc *ttr.NamespaceConfig) error { return nil }
+	}
+	return runService("run-sonarqube.sh", *restartSonarQubeFlag)
+}
+
+// StartBitbucket starts a Bitbucket instance in a Docker container (named
+// ods-test-bitbucket-server). If a container of the same name already exists,
+// it will be reused unless -ods-restart-bitbucket is passed.
+func StartBitbucket() ttr.NamespaceOpt {
+	flag.Parse()
+	return runService("run-bitbucket.sh", *restartBitbucketFlag)
+}
+
+func runService(script string, restart bool) ttr.NamespaceOpt {
+	return func(cc *ttr.ClusterConfig, nc *ttr.NamespaceConfig) error {
+		args := []string{projectpath.RootedPath("scripts/" + script)}
+		if !restart {
+			args = append(args, "--reuse")
+		}
+		return command.Run("sh", args, []string{}, os.Stdout, os.Stderr)
+	}
+}

pkg/odstasktest/workspace.go

@@ -0,0 +1,45 @@
+package odstasktest
+
+import (
+	"testing"
+
+	"github.com/opendevstack/ods-pipeline/pkg/pipelinectxt"
+	"github.com/opendevstack/ods-pipeline/pkg/tasktesting"
+	ttr "github.com/opendevstack/ods-pipeline/pkg/tektontaskrun"
+)
+
+func GetSourceWorkspaceContext(t *testing.T, config *ttr.TaskRunConfig) (dir string, ctxt *pipelinectxt.ODSContext) {
+	dir = config.WorkspaceConfigs["source"].Dir
+	ctxt, err := pipelinectxt.NewFromCache(dir)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return
+}
+
+// InitGitRepo initialises a Git repository inside the given workspace.
+// The workspace will also be setup with an ODS context directory in .ods.
+func InitGitRepo(t *testing.T) ttr.WorkspaceOpt {
+	return func(c *ttr.WorkspaceConfig) error {
+		// TODO: namespace is not the real name of the namespace ...
+		// TODO: do we need the ODS context later? if so, how to transport?
+		_ = tasktesting.SetupGitRepo(t, "namespace", c.Dir)
+		return nil
+	}
+}
+
+// WithGitSourceWorkspace configures the task run with a workspace named
+// "source", mapped to the directory sourced from sourceDir. The directory is
+// initialised as a Git repository with an ODS context.
+func WithGitSourceWorkspace(t *testing.T, sourceDir string, opts ...ttr.WorkspaceOpt) ttr.TaskRunOpt {
+	return WithSourceWorkspace(
+		t, sourceDir,
+		append([]ttr.WorkspaceOpt{InitGitRepo(t)}, opts...)...,
+	)
+}
+
+// WithSourceWorkspace configures the task run with a workspace named
+// "source", mapped to the directory sourced from sourceDir.
+func WithSourceWorkspace(t *testing.T, sourceDir string, opts ...ttr.WorkspaceOpt) ttr.TaskRunOpt {
+	return ttr.WithWorkspace("source", sourceDir, opts...)
+}

pkg/pipelinectxt/context.go

@@ -60,6 +60,12 @@ func (o *ODSContext) WriteCache(wsDir string) error {
 	return nil
 }
 
+func NewFromCache(wsDir string) (o *ODSContext, err error) {
+	o = &ODSContext{}
+	err = o.ReadCache(wsDir)
+	return
+}
+
 // ReadCache reads ODS context from .ods
 // TODO: test that this works
 func (o *ODSContext) ReadCache(wsDir string) error {