interdiff of round #1 and #0 · pull #423 · tangled.org/core

ERROR

api/tangled/cbor_gen.go

Failed to calculate interdiff for this file.

ERROR

api/tangled/tangledpipeline.go

Failed to calculate interdiff for this file.

ERROR

cmd/gen.go

Failed to calculate interdiff for this file.

ERROR

lexicons/pipeline/pipeline.json

Failed to calculate interdiff for this file.

ERROR

nix/modules/spindle.nix

Failed to calculate interdiff for this file.

ERROR

spindle/config/config.go

Failed to calculate interdiff for this file.

ERROR

spindle/engine/engine.go

Failed to calculate interdiff for this file.

ERROR

spindle/engine/errors.go

Failed to calculate interdiff for this file.

REVERTED

spindle/engine/logger.go

···

       80
        
       	if err := w.logger.encoder.Encode(entry); err != nil {

     

       81
        
       		return 0, err

     

       82
        
       	}

     

       0
        
       
     

       83
       -
       	return len(w.step.Name()), nil

     

       84
        
       }

···

       80
        
       	if err := w.logger.encoder.Encode(entry); err != nil {

     

       81
        
       		return 0, err

     

       82
        
       	}

     

       83
       +
       	return len(w.step.Name), nil

     

       0
        
       
     

       84
        
       }

ERROR

spindle/engines/nixery/ansi_stripper.go

Failed to calculate interdiff for this file.

ERROR

spindle/engines/nixery/engine.go

Failed to calculate interdiff for this file.

ERROR

spindle/engines/nixery/envs.go

Failed to calculate interdiff for this file.

ERROR

spindle/engines/nixery/envs_test.go

Failed to calculate interdiff for this file.

ERROR

spindle/engines/nixery/errors.go

Failed to calculate interdiff for this file.

ERROR

spindle/engines/nixery/setup_steps.go

Failed to calculate interdiff for this file.

ERROR

spindle/models/models.go

Failed to calculate interdiff for this file.

ERROR

spindle/models/pipeline.go

Failed to calculate interdiff for this file.

ERROR

spindle/server.go

Failed to calculate interdiff for this file.

ERROR

spindle/stream.go

Failed to calculate interdiff for this file.

ERROR

spindle/xrpc/xrpc.go

Failed to calculate interdiff for this file.

ERROR

workflow/compile.go

Failed to calculate interdiff for this file.

ERROR

workflow/compile_test.go

Failed to calculate interdiff for this file.

ERROR

workflow/def.go

Failed to calculate interdiff for this file.

ERROR

workflow/def_test.go

Failed to calculate interdiff for this file.

NEW

spindle/models/engine.go

···

       1
       +
       package models

     

       2
       +
       

     

       3
       +
       import (

     

       4
       +
       	"context"

     

       5
       +
       	"time"

     

       6
       +
       

     

       7
       +
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       8
       +
       	"tangled.sh/tangled.sh/core/spindle/secrets"

     

       9
       +
       )

     

       10
       +
       

     

       11
       +
       type Engine interface {

     

       12
       +
       	InitWorkflow(twf tangled.Pipeline_Workflow, tpl tangled.Pipeline) (*Workflow, error)

     

       13
       +
       	SetupWorkflow(ctx context.Context, wid WorkflowId, wf *Workflow) error

     

       14
       +
       	WorkflowTimeout() time.Duration

     

       15
       +
       	DestroyWorkflow(ctx context.Context, wid WorkflowId) error

     

       16
       +
       	RunStep(ctx context.Context, wid WorkflowId, w *Workflow, idx int, secrets []secrets.UnlockedSecret, wfLogger *WorkflowLogger) error

     

       17
       +
       }

NEW

spindle/models/logger.go

···

       1
       -
       package engine

     

       2
        
       

     

       3
        
       import (

     

       4
        
       	"encoding/json"

     
···

       7
        
       	"os"

     

       8
        
       	"path/filepath"

     

       9
        
       	"strings"

     

       10
       -
       

     

       11
       -
       	"tangled.sh/tangled.sh/core/spindle/models"

     

       12
        
       )

     

       13
        
       

     

       14
        
       type WorkflowLogger struct {

     
···

       16
        
       	encoder *json.Encoder

     

       17
        
       }

     

       18
        
       

     

       19
       -
       func NewWorkflowLogger(baseDir string, wid models.WorkflowId) (*WorkflowLogger, error) {

     

       20
        
       	path := LogFilePath(baseDir, wid)

     

       21
        
       

     

       22
        
       	file, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)

     
···

       30
        
       	}, nil

     

       31
        
       }

     

       32
        
       

     

       33
       -
       func LogFilePath(baseDir string, workflowID models.WorkflowId) string {

     

       34
        
       	logFilePath := filepath.Join(baseDir, fmt.Sprintf("%s.log", workflowID.String()))

     

       35
        
       	return logFilePath

     

       36
        
       }

     
···

       47
        
       	}

     

       48
        
       }

     

       49
        
       

     

       50
       -
       func (l *WorkflowLogger) ControlWriter(idx int, step models.Step) io.Writer {

     

       51
        
       	return &controlWriter{

     

       52
        
       		logger: l,

     

       53
        
       		idx:    idx,

     
···

       62
        
       

     

       63
        
       func (w *dataWriter) Write(p []byte) (int, error) {

     

       64
        
       	line := strings.TrimRight(string(p), "\r\n")

     

       65
       -
       	entry := models.NewDataLogLine(line, w.stream)

     

       66
        
       	if err := w.logger.encoder.Encode(entry); err != nil {

     

       67
        
       		return 0, err

     

       68
        
       	}

     
···

       72
        
       type controlWriter struct {

     

       73
        
       	logger *WorkflowLogger

     

       74
        
       	idx    int

     

       75
       -
       	step   models.Step

     

       76
        
       }

     

       77
        
       

     

       78
        
       func (w *controlWriter) Write(_ []byte) (int, error) {

     

       79
       -
       	entry := models.NewControlLogLine(w.idx, w.step)

     

       80
        
       	if err := w.logger.encoder.Encode(entry); err != nil {

     

       81
        
       		return 0, err

     

       82
        
       	}

     

       83
       -
       	return len(w.step.Name), nil

     

       84
        
       }

···

       1
       +
       package models

     

       2
        
       

     

       3
        
       import (

     

       4
        
       	"encoding/json"

     
···

       7
        
       	"os"

     

       8
        
       	"path/filepath"

     

       9
        
       	"strings"

     

       0
        
       
     

       0
        
       
     

       10
        
       )

     

       11
        
       

     

       12
        
       type WorkflowLogger struct {

     
···

       14
        
       	encoder *json.Encoder

     

       15
        
       }

     

       16
        
       

     

       17
       +
       func NewWorkflowLogger(baseDir string, wid WorkflowId) (*WorkflowLogger, error) {

     

       18
        
       	path := LogFilePath(baseDir, wid)

     

       19
        
       

     

       20
        
       	file, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)

     
···

       28
        
       	}, nil

     

       29
        
       }

     

       30
        
       

     

       31
       +
       func LogFilePath(baseDir string, workflowID WorkflowId) string {

     

       32
        
       	logFilePath := filepath.Join(baseDir, fmt.Sprintf("%s.log", workflowID.String()))

     

       33
        
       	return logFilePath

     

       34
        
       }

     
···

       45
        
       	}

     

       46
        
       }

     

       47
        
       

     

       48
       +
       func (l *WorkflowLogger) ControlWriter(idx int, step Step) io.Writer {

     

       49
        
       	return &controlWriter{

     

       50
        
       		logger: l,

     

       51
        
       		idx:    idx,

     
···

       60
        
       

     

       61
        
       func (w *dataWriter) Write(p []byte) (int, error) {

     

       62
        
       	line := strings.TrimRight(string(p), "\r\n")

     

       63
       +
       	entry := NewDataLogLine(line, w.stream)

     

       64
        
       	if err := w.logger.encoder.Encode(entry); err != nil {

     

       65
        
       		return 0, err

     

       66
        
       	}

     
···

       70
        
       type controlWriter struct {

     

       71
        
       	logger *WorkflowLogger

     

       72
        
       	idx    int

     

       73
       +
       	step   Step

     

       74
        
       }

     

       75
        
       

     

       76
        
       func (w *controlWriter) Write(_ []byte) (int, error) {

     

       77
       +
       	entry := NewControlLogLine(w.idx, w.step)

     

       78
        
       	if err := w.logger.encoder.Encode(entry); err != nil {

     

       79
        
       		return 0, err

     

       80
        
       	}

     

       81
       +
       	return len(w.step.Name()), nil

     

       82
        
       }