use interfaces version

Author: RetGal

.github/workflows/dagger.yaml

@@ -8,6 +8,7 @@ on:
       - dagger-generic-pipeline-int
       - dagger-generic-pipeline-status
       - dagger-generic-pipeline-flex
+      - dagger-generic-pipeline-flex-interfaces
 jobs:
   pipeline:
     runs-on: 'ubuntu-latest'
@@ -24,7 +25,7 @@ jobs:
           DT_API_KEY: ${{ secrets.DT_API_KEY }}
         with:
           # Dagger Version
-          version: 0.17.1
+          version: 0.18.6
           # Dagger CLI Flags
           #dagger-flags: # optional, default is --progress plain
           # CLI verb (call, run, download, up, functions, shell, query)
@@ -54,7 +55,7 @@ jobs:
         uses: dagger/[email protected]
         with:
           # Dagger Version
-          version: 0.17.1
+          version: 0.18.6
           # Dagger CLI Flags
           #dagger-flags: # optional, default is --progress plain
           # CLI verb (call, run, download, up, functions, shell, query)

ci/implementation/main.go

@@ -117,7 +117,6 @@ func (m *Implementation) Postgres(
 	// +default="latest"
 	version string,
 ) *dagger.Service {
-
 	return dag.Container().
 		From(fmt.Sprintf("postgres:%s", version)).
 		WithEnvVariable("POSTGRES_PASSWORD", "postgres").
@@ -131,7 +130,6 @@ func (m *Implementation) Memcached(
 	// +default="latest"
 	version string,
 ) *dagger.Service {
-
 	return dag.Container().
 		From(fmt.Sprintf("memcached:%s", version)).
 		WithExposedPort(11211).

ci/main.go

@@ -21,106 +21,6 @@ import (
 
 type Ci struct{}
 
-/*
-// Returns a lint container
-func (m *Ci) BuildLintContainer(
-	dir *dagger.Directory,
-	// +optional
-	// +default=false
-	pass bool,
-) *dagger.Container {
-	return dag.Container().
-		From("ruby:latest").
-		WithMountedDirectory("/mnt", dir).
-		WithWorkdir("/mnt").
-		WithExec([]string{"gem", "install", "haml-lint"}).
-        WithExec([]string{"sh", "-c", "mkdir -p /mnt/lint"}).
-		WithExec(m.lintCommand(pass))
-}
-
-// Returns the lint command
-func (m *Ci) lintCommand(pass bool) []string {
-	if pass {
-		return []string{"sh", "-c", "haml-lint -r json . > lint/lint.json || true"}
-	}
-	return []string{"sh", "-c", "haml-lint -r json . > lint/lint.json"}
-}
-
-// Returns a sast container
-func (m *Ci) BuildSastContainer(dir *dagger.Directory) *dagger.Container {
-	return dag.Container().
-		From("presidentbeef/brakeman:latest").
-		WithMountedDirectory("/app", dir).
-		WithWorkdir("/app").
-        WithExec([]string{"sh", "-c", "mkdir -p /app/sast"}).
-		WithExec([]string{"sh", "-c", "/usr/src/app/bin/brakeman -o /app/sast/brakeman-output.tabs"})
-}
-
-// Creates a PostgreSQL service for local testing based on the official image with the provided version. If no version is provided, 'latest' will be used.
-func (m *Ci) Postgres(
-	_ context.Context,
-	// +optional
-	// +default="latest"
-	version string) *dagger.Service {
-
-	return dag.Container().
-		From(fmt.Sprintf("postgres:%s", version)).
-		WithEnvVariable("POSTGRES_PASSWORD", "postgres").
-		WithExposedPort(5432).
-		AsService()
-}
-
-// Creates a memcached service for local testing based on the official image with the provided version. If no version is provided, 'latest' will be used.
-func (m *Ci) Memcached(
-	_ context.Context,
-	// +optional
-	// +default="latest"
-	version string) *dagger.Service {
-
-	return dag.Container().
-		From(fmt.Sprintf("memcached:%s", version)).
-		WithExposedPort(11211).
-		AsService()
-}
-
-// Returns a test container
-func (m *Ci) BuildTestContainer(ctx context.Context, dir *dagger.Directory) *dagger.Container {
-	return m.BaseTestContainer(ctx, dir).
-		WithServiceBinding("postgresql", m.Postgres(ctx, "11")).
-		WithServiceBinding("memcached", m.Memcached(ctx, "latest")).
-		WithExec([]string{"bundle", "exec", "rails", "db:create"}).
-		WithExec([]string{"bundle", "exec", "rails", "db:migrate"}).
-		WithExec([]string{"bundle", "exec", "rails", "assets:precompile"}).
-		WithExec([]string{"sh", "-c", "bundle exec rails test test/controllers test/domain test/fabricators test/fixtures test/helpers test/mailers test/models test/presenters test/support test/tarantula"})
-}
-
-// Returns a Container with the base setup for running the rails test suite
-func (m *Ci) BaseTestContainer(_ context.Context, dir *dagger.Directory) *dagger.Container {
-	return dag.Container().
-		From("registry.puzzle.ch/docker.io/ruby:3.2").
-		WithExec([]string{"useradd", "-m", "-u", "1001", "ruby"}).
-		WithMountedDirectory("/mnt", dir, dagger.ContainerWithMountedDirectoryOpts{Owner: "ruby"}).
-		WithWorkdir("/mnt").
-		WithEnvVariable("RAILS_DB_HOST", "postgresql"). // This is the service name of the postgres container called by rails
-		WithEnvVariable("RAILS_TEST_DB_HOST", "postgresql").
-		WithEnvVariable("RAILS_TEST_DB_NAME", "postgres").
-		WithEnvVariable("RAILS_TEST_DB_USERNAME", "postgres").
-		WithEnvVariable("RAILS_TEST_DB_PASSWORD", "postgres").
-		WithEnvVariable("RAILS_ENV", "test").
-		WithEnvVariable("CI", "true").
-		WithEnvVariable("PGDATESTYLE", "German").
-		WithEnvVariable("TZ", "Europe/Zurich").
-		WithEnvVariable("DEBIAN_FRONTEND", "noninteractive").
-		WithEnvVariable("TEST_REPORTS", "true").
-		WithExec([]string{"apt-get", "update"}).
-		WithExec([]string{"apt-get", "-yqq", "install", "libpq-dev", "libvips-dev", "chromium", "graphviz", "imagemagick"}).
-		WithUser("ruby").
-		//WithExec([]string{"gem", "update", "--system"}).
-		WithExec([]string{"gem", "install", "bundler", "--version", `~>2`}).
-		WithExec([]string{"bundle", "install", "--jobs", "4", "--retry", "3"})
-}
-
-
 // Executes all the steps and returns a directory with the results
 func (m *Ci) CiIntegration(
 	ctx context.Context,
@@ -143,90 +43,14 @@ func (m *Ci) CiIntegration(
 	// +default=false
 	pass bool,
 ) *dagger.Directory {
-	var wg sync.WaitGroup
-	wg.Add(3)
-
-	var lintContainer = func() *dagger.Container {
-		defer wg.Done()
-		return m.BuildLintContainer(dir, pass)
-	}()
-
-	var sastContainer = func() *dagger.Container {
-		defer wg.Done()
-		return m.BuildSastContainer(dir)
-	}()
-
-	var testContainer = func() *dagger.Container {
-		defer wg.Done()
-		return m.BuildTestContainer(ctx, dir)
-	}()
-
-	// This Blocks the execution until its counter become 0
-	wg.Wait()
-
-	return dag.PitcFlow().Flex(
-        // source directory
-        dir,
-        dagger.PitcFlowFlexOpts{
-        // lint container
-        LintContainer: lintContainer,
-        // lint report directory name "lint/lint.json"
-        LintReportDir: "/mnt/lint",
-        // sast container
-        SastContainer: sastContainer,
-        // security scan report directory name "/app/sast/brakeman-output.tabs"
-        SastReportDir: "/app/sast",
-        // test container
-        TestContainer: testContainer,
-        // test report folder name "/mnt/test/reports"
-        TestReportDir: "/mnt/test/reports",
-        // registry username for publishing the container image
-        RegistryUsername: registryUsername,
-        // registry password for publishing the container image
-        RegistryPassword: registryPassword,
-        // registry address registry/repository/image:tag
-        RegistryAddress: registryAddress,
-        // deptrack address for publishing the SBOM https://deptrack.example.com/api/v1/bom
-        DtAddress: dtAddress,
-        // deptrack project UUID
-        DtProjectUUID: dtProjectUUID,
-        // deptrack API key
-        DtAPIKey: dtApiKey},
-	)
-}
-*/
-
-// Executes all the steps and returns a directory with the results
-func (m *Ci) CiInterface(
-	ctx context.Context,
-	// source directory
-	dir *dagger.Directory,
-	// registry username for publishing the contaner image
-	registryUsername string,
-	// registry password for publishing the container image
-	registryPassword *dagger.Secret,
-	// registry address registry/repository/image:tag
-	registryAddress string,
-	// deptrack address for publishing the SBOM https://deptrack.example.com/api/v1/bom
-	dtAddress string,
-	// deptrack project UUID
-	dtProjectUUID string,
-	// deptrack API key
-	dtApiKey *dagger.Secret,
-	// ignore linter failures
-	// +optional
-	// +default=false
-	pass bool,
-) *dagger.Directory {
-
-	return dag.PitcFlow().Flexi(
+	return dag.PitcFlow().Iflex(
         // source directory
         dir,
-        dagger.PitcFlowFlexiOpts{
-        LintReports: dag.PitcFlow().Lint(dir, true, dag.Implementation().AsPitcFlowLinting()),
+        dagger.PitcFlowIflexOpts{
+        LintReports: dag.PitcFlow().Lint(dir, pass, dag.Implementation().AsPitcFlowLinting()),
         SecurityReports: dag.PitcFlow().SecurityScan(dir, dag.Implementation().AsPitcFlowSecurityScanning()),
         TestReports: dag.PitcFlow().Test(dir, dag.Implementation().AsPitcFlowTesting()),
-        IntegrationTestReports: dag.PitcFlow().IntegrationTest(dir, dag.Implementation().AsPitcFlowIntegrationTesting()),
+        //IntegrationTestReports: dag.PitcFlow().IntegrationTest(dir, dag.Implementation().AsPitcFlowIntegrationTesting()),
         // registry username for publishing the container image
         RegistryUsername: registryUsername,
         // registry password for publishing the container image

dagger.json

@@ -7,8 +7,8 @@
   "dependencies": [
     {
       "name": "pitc-flow",
-      "source": "github.com/puzzle/dagger-module-pitc-flow/pitc-flow@e0f6ec342f0797de171c16346f90a8fce945ad3f",
-      "pin": "e0f6ec342f0797de171c16346f90a8fce945ad3f"
+      "source": "github.com/puzzle/dagger-module-pitc-flow/pitc-flow@ee7b3325f2ac3ef40c3a2d1253203dd534de3e70",
+      "pin": "ee7b3325f2ac3ef40c3a2d1253203dd534de3e70"
     },
     {
       "name": "implementation",