patch of spindle: add environment variables to pipeline workflows · round #1 · pull #843 · tangled.org/core

+4 -5

spindle/engines/nixery/engine.go

···

       73
       73
        
       type addlFields struct {

     

       74
       74
        
       	image     string

     

       75
       75
        
       	container string

     

       76
       76
       -
       	env       map[string]string

     

       77
       76
        
       }

     

       78
       77
        
       

     

       79
       78
        
       func (e *Engine) InitWorkflow(twf tangled.Pipeline_Workflow, tpl tangled.Pipeline) (*models.Workflow, error) {

     
···

       103
       102
        
       		swf.Steps = append(swf.Steps, sstep)

     

       104
       103
        
       	}

     

       105
       104
        
       	swf.Name = twf.Name

     

       106
       106
       -
       	addl.env = dwf.Environment

     

       105
       105
       +
       	swf.Environment = dwf.Environment

     

       107
       106
        
       	addl.image = workflowImage(dwf.Dependencies, e.cfg.NixeryPipelines.Nixery)

     

       108
       107
        
       

     

       109
       108
        
       	setup := &setupSteps{}

     
···

       288
       287
        
       

     

       289
       288
        
       func (e *Engine) RunStep(ctx context.Context, wid models.WorkflowId, w *models.Workflow, idx int, secrets []secrets.UnlockedSecret, wfLogger *models.WorkflowLogger) error {

     

       290
       289
        
       	addl := w.Data.(addlFields)

     

       291
       291
       -
       	workflowEnvs := ConstructEnvs(addl.env)

     

       290
       290
       +
       	workflowEnvs := ConstructEnvs(w.Environment)

     

       292
       291
        
       	// TODO(winter): should SetupWorkflow also have secret access?

     

       293
       292
        
       	// IMO yes, but probably worth thinking on.

     

       294
       293
        
       	for _, s := range secrets {

     
···

       310
       309
        
       	envs.AddEnv("HOME", homeDir)

     

       311
       310
        
       

     

       312
       311
        
       	mkExecResp, err := e.docker.ContainerExecCreate(ctx, addl.container, container.ExecOptions{

     

       313
       313
       -
       		Cmd:          []string{"bash", "-c", step.command},

     

       312
       312
       +
       		Cmd:          []string{"bash", "-c", step.Command()},

     

       314
       313
        
       		AttachStdout: true,

     

       315
       314
        
       		AttachStderr: true,

     

       316
       315
        
       		Env:          envs,

     
···

       333
       332
        
       		// Docker doesn't provide an API to kill an exec run

     

       334
       333
        
       		// (sure, we could grab the PID and kill it ourselves,

     

       335
       334
        
       		// but that's wasted effort)

     

       336
       336
       -
       		e.l.Warn("step timed out", "step", step.Name)

     

       335
       335
       +
       		e.l.Warn("step timed out", "step", step.Name())

     

       337
       336
        
       

     

       338
       337
        
       		<-tailDone

     

       339
       338

+6 -7

spindle/models/clone.go

···

       55
       55
        
       		}

     

       56
       56
        
       	}

     

       57
       57
        
       

     

       58
       58
       -
       	repoURL := buildRepoURL(tr, dev)

     

       58
       58
       +
       	repoURL := BuildRepoURL(tr.Repo, dev)

     

       59
       59
        
       

     

       60
       60
        
       	var cloneOpts tangled.Pipeline_CloneOpts

     

       61
       61
        
       	if twf.Clone != nil {

     
···

       101
       101
        
       	}

     

       102
       102
        
       }

     

       103
       103
        
       

     

       104
       104
       -
       // buildRepoURL constructs the repository URL from trigger metadata

     

       105
       105
       -
       func buildRepoURL(tr tangled.Pipeline_TriggerMetadata, devMode bool) string {

     

       106
       106
       -
       	if tr.Repo == nil {

     

       104
       104
       +
       // BuildRepoURL constructs the repository URL from repo metadata.

     

       105
       105
       +
       func BuildRepoURL(repo *tangled.Pipeline_TriggerRepo, devMode bool) string {

     

       106
       106
       +
       	if repo == nil {

     

       107
       107
        
       		return ""

     

       108
       108
        
       	}

     

       109
       109
        
       

     

       110
       110
       -
       	// Determine protocol

     

       111
       110
        
       	scheme := "https://"

     

       112
       111
        
       	if devMode {

     

       113
       112
        
       		scheme = "http://"

     

       114
       113
        
       	}

     

       115
       114
        
       

     

       116
       115
        
       	// Get host from knot

     

       117
       117
       -
       	host := tr.Repo.Knot

     

       116
       116
       +
       	host := repo.Knot

     

       118
       117
        
       

     

       119
       118
        
       	// In dev mode, replace localhost with host.docker.internal for Docker networking

     

       120
       119
        
       	if devMode && strings.Contains(host, "localhost") {

     
···

       122
       121
        
       	}

     

       123
       122
        
       

     

       124
       123
        
       	// Build URL: {scheme}{knot}/{did}/{repo}

     

       125
       125
       -
       	return fmt.Sprintf("%s%s/%s/%s", scheme, host, tr.Repo.Did, tr.Repo.Repo)

     

       124
       124
       +
       	return fmt.Sprintf("%s%s/%s/%s", scheme, host, repo.Did, repo.Repo)

     

       126
       125
        
       }

     

       127
       126
        
       

     

       128
       127
        
       // buildFetchArgs constructs the arguments for git fetch based on clone options

+4 -3

spindle/models/pipeline.go

···

       22
       22
        
       )

     

       23
       23
        
       

     

       24
       24
        
       type Workflow struct {

     

       25
       25
       -
       	Steps []Step

     

       26
       26
       -
       	Name  string

     

       27
       27
       -
       	Data  any

     

       25
       25
       +
       	Steps       []Step

     

       26
       26
       +
       	Name        string

     

       27
       27
       +
       	Data        any

     

       28
       28
       +
       	Environment map[string]string

     

       28
       29
        
       }

+77

spindle/models/pipeline_env.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"strings"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/go-git/go-git/v5/plumbing"

     

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

     

       8
       8
       +
       	"tangled.org/core/workflow"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // PipelineEnvVars extracts environment variables from pipeline trigger metadata.

     

       12
       12
       +
       // These are framework-provided variables that are injected into workflow steps.

     

       13
       13
       +
       func PipelineEnvVars(tr *tangled.Pipeline_TriggerMetadata, pipelineId PipelineId, devMode bool) map[string]string {

     

       14
       14
       +
       	if tr == nil {

     

       15
       15
       +
       		return nil

     

       16
       16
       +
       	}

     

       17
       17
       +
       

     

       18
       18
       +
       	env := make(map[string]string)

     

       19
       19
       +
       

     

       20
       20
       +
       	// Standard CI environment variable

     

       21
       21
       +
       	env["CI"] = "true"

     

       22
       22
       +
       

     

       23
       23
       +
       	env["TANGLED_PIPELINE_ID"] = pipelineId.Rkey

     

       24
       24
       +
       

     

       25
       25
       +
       	// Repo info

     

       26
       26
       +
       	if tr.Repo != nil {

     

       27
       27
       +
       		env["TANGLED_REPO_KNOT"] = tr.Repo.Knot

     

       28
       28
       +
       		env["TANGLED_REPO_DID"] = tr.Repo.Did

     

       29
       29
       +
       		env["TANGLED_REPO_NAME"] = tr.Repo.Repo

     

       30
       30
       +
       		env["TANGLED_REPO_DEFAULT_BRANCH"] = tr.Repo.DefaultBranch

     

       31
       31
       +
       		env["TANGLED_REPO_URL"] = BuildRepoURL(tr.Repo, devMode)

     

       32
       32
       +
       	}

     

       33
       33
       +
       

     

       34
       34
       +
       	switch workflow.TriggerKind(tr.Kind) {

     

       35
       35
       +
       	case workflow.TriggerKindPush:

     

       36
       36
       +
       		if tr.Push != nil {

     

       37
       37
       +
       			refName := plumbing.ReferenceName(tr.Push.Ref)

     

       38
       38
       +
       			refType := "branch"

     

       39
       39
       +
       			if refName.IsTag() {

     

       40
       40
       +
       				refType = "tag"

     

       41
       41
       +
       			}

     

       42
       42
       +
       

     

       43
       43
       +
       			env["TANGLED_REF"] = tr.Push.Ref

     

       44
       44
       +
       			env["TANGLED_REF_NAME"] = refName.Short()

     

       45
       45
       +
       			env["TANGLED_REF_TYPE"] = refType

     

       46
       46
       +
       			env["TANGLED_SHA"] = tr.Push.NewSha

     

       47
       47
       +
       			env["TANGLED_COMMIT_SHA"] = tr.Push.NewSha

     

       48
       48
       +
       		}

     

       49
       49
       +
       

     

       50
       50
       +
       	case workflow.TriggerKindPullRequest:

     

       51
       51
       +
       		if tr.PullRequest != nil {

     

       52
       52
       +
       			// For PRs, the "ref" is the source branch

     

       53
       53
       +
       			env["TANGLED_REF"] = "refs/heads/" + tr.PullRequest.SourceBranch

     

       54
       54
       +
       			env["TANGLED_REF_NAME"] = tr.PullRequest.SourceBranch

     

       55
       55
       +
       			env["TANGLED_REF_TYPE"] = "branch"

     

       56
       56
       +
       			env["TANGLED_SHA"] = tr.PullRequest.SourceSha

     

       57
       57
       +
       			env["TANGLED_COMMIT_SHA"] = tr.PullRequest.SourceSha

     

       58
       58
       +
       

     

       59
       59
       +
       			// PR-specific variables

     

       60
       60
       +
       			env["TANGLED_PR_SOURCE_BRANCH"] = tr.PullRequest.SourceBranch

     

       61
       61
       +
       			env["TANGLED_PR_TARGET_BRANCH"] = tr.PullRequest.TargetBranch

     

       62
       62
       +
       			env["TANGLED_PR_SOURCE_SHA"] = tr.PullRequest.SourceSha

     

       63
       63
       +
       			env["TANGLED_PR_ACTION"] = tr.PullRequest.Action

     

       64
       64
       +
       		}

     

       65
       65
       +
       

     

       66
       66
       +
       	case workflow.TriggerKindManual:

     

       67
       67
       +
       		// Manual triggers may not have ref/sha info

     

       68
       68
       +
       		// Include any manual inputs if present

     

       69
       69
       +
       		if tr.Manual != nil {

     

       70
       70
       +
       			for _, pair := range tr.Manual.Inputs {

     

       71
       71
       +
       				env["TANGLED_INPUT_"+strings.ToUpper(pair.Key)] = pair.Value

     

       72
       72
       +
       			}

     

       73
       73
       +
       		}

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       76
       76
       +
       	return env

     

       77
       77
       +
       }

+260

spindle/models/pipeline_env_test.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"testing"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.org/core/api/tangled"

     

       7
       7
       +
       	"tangled.org/core/workflow"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func TestPipelineEnvVars_PushBranch(t *testing.T) {

     

       11
       11
       +
       	tr := &tangled.Pipeline_TriggerMetadata{

     

       12
       12
       +
       		Kind: string(workflow.TriggerKindPush),

     

       13
       13
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       14
       14
       +
       			NewSha: "abc123def456",

     

       15
       15
       +
       			OldSha: "000000000000",

     

       16
       16
       +
       			Ref:    "refs/heads/main",

     

       17
       17
       +
       		},

     

       18
       18
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       19
       19
       +
       			Knot:          "example.com",

     

       20
       20
       +
       			Did:           "did:plc:user123",

     

       21
       21
       +
       			Repo:          "my-repo",

     

       22
       22
       +
       			DefaultBranch: "main",

     

       23
       23
       +
       		},

     

       24
       24
       +
       	}

     

       25
       25
       +
       	id := PipelineId{

     

       26
       26
       +
       		Knot: "example.com",

     

       27
       27
       +
       		Rkey: "123123",

     

       28
       28
       +
       	}

     

       29
       29
       +
       	env := PipelineEnvVars(tr, id, false)

     

       30
       30
       +
       

     

       31
       31
       +
       	// Check standard CI variable

     

       32
       32
       +
       	if env["CI"] != "true" {

     

       33
       33
       +
       		t.Errorf("Expected CI='true', got '%s'", env["CI"])

     

       34
       34
       +
       	}

     

       35
       35
       +
       

     

       36
       36
       +
       	// Check ref variables

     

       37
       37
       +
       	if env["TANGLED_REF"] != "refs/heads/main" {

     

       38
       38
       +
       		t.Errorf("Expected TANGLED_REF='refs/heads/main', got '%s'", env["TANGLED_REF"])

     

       39
       39
       +
       	}

     

       40
       40
       +
       	if env["TANGLED_REF_NAME"] != "main" {

     

       41
       41
       +
       		t.Errorf("Expected TANGLED_REF_NAME='main', got '%s'", env["TANGLED_REF_NAME"])

     

       42
       42
       +
       	}

     

       43
       43
       +
       	if env["TANGLED_REF_TYPE"] != "branch" {

     

       44
       44
       +
       		t.Errorf("Expected TANGLED_REF_TYPE='branch', got '%s'", env["TANGLED_REF_TYPE"])

     

       45
       45
       +
       	}

     

       46
       46
       +
       

     

       47
       47
       +
       	// Check SHA variables

     

       48
       48
       +
       	if env["TANGLED_SHA"] != "abc123def456" {

     

       49
       49
       +
       		t.Errorf("Expected TANGLED_SHA='abc123def456', got '%s'", env["TANGLED_SHA"])

     

       50
       50
       +
       	}

     

       51
       51
       +
       	if env["TANGLED_COMMIT_SHA"] != "abc123def456" {

     

       52
       52
       +
       		t.Errorf("Expected TANGLED_COMMIT_SHA='abc123def456', got '%s'", env["TANGLED_COMMIT_SHA"])

     

       53
       53
       +
       	}

     

       54
       54
       +
       

     

       55
       55
       +
       	// Check repo variables

     

       56
       56
       +
       	if env["TANGLED_REPO_KNOT"] != "example.com" {

     

       57
       57
       +
       		t.Errorf("Expected TANGLED_REPO_KNOT='example.com', got '%s'", env["TANGLED_REPO_KNOT"])

     

       58
       58
       +
       	}

     

       59
       59
       +
       	if env["TANGLED_REPO_DID"] != "did:plc:user123" {

     

       60
       60
       +
       		t.Errorf("Expected TANGLED_REPO_DID='did:plc:user123', got '%s'", env["TANGLED_REPO_DID"])

     

       61
       61
       +
       	}

     

       62
       62
       +
       	if env["TANGLED_REPO_NAME"] != "my-repo" {

     

       63
       63
       +
       		t.Errorf("Expected TANGLED_REPO_NAME='my-repo', got '%s'", env["TANGLED_REPO_NAME"])

     

       64
       64
       +
       	}

     

       65
       65
       +
       	if env["TANGLED_REPO_DEFAULT_BRANCH"] != "main" {

     

       66
       66
       +
       		t.Errorf("Expected TANGLED_REPO_DEFAULT_BRANCH='main', got '%s'", env["TANGLED_REPO_DEFAULT_BRANCH"])

     

       67
       67
       +
       	}

     

       68
       68
       +
       	if env["TANGLED_REPO_URL"] != "https://example.com/did:plc:user123/my-repo" {

     

       69
       69
       +
       		t.Errorf("Expected TANGLED_REPO_URL='https://example.com/did:plc:user123/my-repo', got '%s'", env["TANGLED_REPO_URL"])

     

       70
       70
       +
       	}

     

       71
       71
       +
       }

     

       72
       72
       +
       

     

       73
       73
       +
       func TestPipelineEnvVars_PushTag(t *testing.T) {

     

       74
       74
       +
       	tr := &tangled.Pipeline_TriggerMetadata{

     

       75
       75
       +
       		Kind: string(workflow.TriggerKindPush),

     

       76
       76
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       77
       77
       +
       			NewSha: "abc123def456",

     

       78
       78
       +
       			OldSha: "000000000000",

     

       79
       79
       +
       			Ref:    "refs/tags/v1.2.3",

     

       80
       80
       +
       		},

     

       81
       81
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       82
       82
       +
       			Knot: "example.com",

     

       83
       83
       +
       			Did:  "did:plc:user123",

     

       84
       84
       +
       			Repo: "my-repo",

     

       85
       85
       +
       		},

     

       86
       86
       +
       	}

     

       87
       87
       +
       	id := PipelineId{

     

       88
       88
       +
       		Knot: "example.com",

     

       89
       89
       +
       		Rkey: "123123",

     

       90
       90
       +
       	}

     

       91
       91
       +
       	env := PipelineEnvVars(tr, id, false)

     

       92
       92
       +
       

     

       93
       93
       +
       	if env["TANGLED_REF"] != "refs/tags/v1.2.3" {

     

       94
       94
       +
       		t.Errorf("Expected TANGLED_REF='refs/tags/v1.2.3', got '%s'", env["TANGLED_REF"])

     

       95
       95
       +
       	}

     

       96
       96
       +
       	if env["TANGLED_REF_NAME"] != "v1.2.3" {

     

       97
       97
       +
       		t.Errorf("Expected TANGLED_REF_NAME='v1.2.3', got '%s'", env["TANGLED_REF_NAME"])

     

       98
       98
       +
       	}

     

       99
       99
       +
       	if env["TANGLED_REF_TYPE"] != "tag" {

     

       100
       100
       +
       		t.Errorf("Expected TANGLED_REF_TYPE='tag', got '%s'", env["TANGLED_REF_TYPE"])

     

       101
       101
       +
       	}

     

       102
       102
       +
       }

     

       103
       103
       +
       

     

       104
       104
       +
       func TestPipelineEnvVars_PullRequest(t *testing.T) {

     

       105
       105
       +
       	tr := &tangled.Pipeline_TriggerMetadata{

     

       106
       106
       +
       		Kind: string(workflow.TriggerKindPullRequest),

     

       107
       107
       +
       		PullRequest: &tangled.Pipeline_PullRequestTriggerData{

     

       108
       108
       +
       			SourceBranch: "feature-branch",

     

       109
       109
       +
       			TargetBranch: "main",

     

       110
       110
       +
       			SourceSha:    "pr-sha-789",

     

       111
       111
       +
       			Action:       "opened",

     

       112
       112
       +
       		},

     

       113
       113
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       114
       114
       +
       			Knot: "example.com",

     

       115
       115
       +
       			Did:  "did:plc:user123",

     

       116
       116
       +
       			Repo: "my-repo",

     

       117
       117
       +
       		},

     

       118
       118
       +
       	}

     

       119
       119
       +
       	id := PipelineId{

     

       120
       120
       +
       		Knot: "example.com",

     

       121
       121
       +
       		Rkey: "123123",

     

       122
       122
       +
       	}

     

       123
       123
       +
       	env := PipelineEnvVars(tr, id, false)

     

       124
       124
       +
       

     

       125
       125
       +
       	// Check ref variables for PR

     

       126
       126
       +
       	if env["TANGLED_REF"] != "refs/heads/feature-branch" {

     

       127
       127
       +
       		t.Errorf("Expected TANGLED_REF='refs/heads/feature-branch', got '%s'", env["TANGLED_REF"])

     

       128
       128
       +
       	}

     

       129
       129
       +
       	if env["TANGLED_REF_NAME"] != "feature-branch" {

     

       130
       130
       +
       		t.Errorf("Expected TANGLED_REF_NAME='feature-branch', got '%s'", env["TANGLED_REF_NAME"])

     

       131
       131
       +
       	}

     

       132
       132
       +
       	if env["TANGLED_REF_TYPE"] != "branch" {

     

       133
       133
       +
       		t.Errorf("Expected TANGLED_REF_TYPE='branch', got '%s'", env["TANGLED_REF_TYPE"])

     

       134
       134
       +
       	}

     

       135
       135
       +
       

     

       136
       136
       +
       	// Check SHA variables

     

       137
       137
       +
       	if env["TANGLED_SHA"] != "pr-sha-789" {

     

       138
       138
       +
       		t.Errorf("Expected TANGLED_SHA='pr-sha-789', got '%s'", env["TANGLED_SHA"])

     

       139
       139
       +
       	}

     

       140
       140
       +
       	if env["TANGLED_COMMIT_SHA"] != "pr-sha-789" {

     

       141
       141
       +
       		t.Errorf("Expected TANGLED_COMMIT_SHA='pr-sha-789', got '%s'", env["TANGLED_COMMIT_SHA"])

     

       142
       142
       +
       	}

     

       143
       143
       +
       

     

       144
       144
       +
       	// Check PR-specific variables

     

       145
       145
       +
       	if env["TANGLED_PR_SOURCE_BRANCH"] != "feature-branch" {

     

       146
       146
       +
       		t.Errorf("Expected TANGLED_PR_SOURCE_BRANCH='feature-branch', got '%s'", env["TANGLED_PR_SOURCE_BRANCH"])

     

       147
       147
       +
       	}

     

       148
       148
       +
       	if env["TANGLED_PR_TARGET_BRANCH"] != "main" {

     

       149
       149
       +
       		t.Errorf("Expected TANGLED_PR_TARGET_BRANCH='main', got '%s'", env["TANGLED_PR_TARGET_BRANCH"])

     

       150
       150
       +
       	}

     

       151
       151
       +
       	if env["TANGLED_PR_SOURCE_SHA"] != "pr-sha-789" {

     

       152
       152
       +
       		t.Errorf("Expected TANGLED_PR_SOURCE_SHA='pr-sha-789', got '%s'", env["TANGLED_PR_SOURCE_SHA"])

     

       153
       153
       +
       	}

     

       154
       154
       +
       	if env["TANGLED_PR_ACTION"] != "opened" {

     

       155
       155
       +
       		t.Errorf("Expected TANGLED_PR_ACTION='opened', got '%s'", env["TANGLED_PR_ACTION"])

     

       156
       156
       +
       	}

     

       157
       157
       +
       }

     

       158
       158
       +
       

     

       159
       159
       +
       func TestPipelineEnvVars_ManualWithInputs(t *testing.T) {

     

       160
       160
       +
       	tr := &tangled.Pipeline_TriggerMetadata{

     

       161
       161
       +
       		Kind: string(workflow.TriggerKindManual),

     

       162
       162
       +
       		Manual: &tangled.Pipeline_ManualTriggerData{

     

       163
       163
       +
       			Inputs: []*tangled.Pipeline_Pair{

     

       164
       164
       +
       				{Key: "version", Value: "1.0.0"},

     

       165
       165
       +
       				{Key: "environment", Value: "production"},

     

       166
       166
       +
       			},

     

       167
       167
       +
       		},

     

       168
       168
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       169
       169
       +
       			Knot: "example.com",

     

       170
       170
       +
       			Did:  "did:plc:user123",

     

       171
       171
       +
       			Repo: "my-repo",

     

       172
       172
       +
       		},

     

       173
       173
       +
       	}

     

       174
       174
       +
       	id := PipelineId{

     

       175
       175
       +
       		Knot: "example.com",

     

       176
       176
       +
       		Rkey: "123123",

     

       177
       177
       +
       	}

     

       178
       178
       +
       	env := PipelineEnvVars(tr, id, false)

     

       179
       179
       +
       

     

       180
       180
       +
       	// Check manual input variables

     

       181
       181
       +
       	if env["TANGLED_INPUT_VERSION"] != "1.0.0" {

     

       182
       182
       +
       		t.Errorf("Expected TANGLED_INPUT_VERSION='1.0.0', got '%s'", env["TANGLED_INPUT_VERSION"])

     

       183
       183
       +
       	}

     

       184
       184
       +
       	if env["TANGLED_INPUT_ENVIRONMENT"] != "production" {

     

       185
       185
       +
       		t.Errorf("Expected TANGLED_INPUT_ENVIRONMENT='production', got '%s'", env["TANGLED_INPUT_ENVIRONMENT"])

     

       186
       186
       +
       	}

     

       187
       187
       +
       

     

       188
       188
       +
       	// Manual triggers shouldn't have ref/sha variables

     

       189
       189
       +
       	if _, ok := env["TANGLED_REF"]; ok {

     

       190
       190
       +
       		t.Error("Manual trigger should not have TANGLED_REF")

     

       191
       191
       +
       	}

     

       192
       192
       +
       	if _, ok := env["TANGLED_SHA"]; ok {

     

       193
       193
       +
       		t.Error("Manual trigger should not have TANGLED_SHA")

     

       194
       194
       +
       	}

     

       195
       195
       +
       }

     

       196
       196
       +
       

     

       197
       197
       +
       func TestPipelineEnvVars_DevMode(t *testing.T) {

     

       198
       198
       +
       	tr := &tangled.Pipeline_TriggerMetadata{

     

       199
       199
       +
       		Kind: string(workflow.TriggerKindPush),

     

       200
       200
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       201
       201
       +
       			NewSha: "abc123",

     

       202
       202
       +
       			Ref:    "refs/heads/main",

     

       203
       203
       +
       		},

     

       204
       204
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       205
       205
       +
       			Knot: "localhost:3000",

     

       206
       206
       +
       			Did:  "did:plc:user123",

     

       207
       207
       +
       			Repo: "my-repo",

     

       208
       208
       +
       		},

     

       209
       209
       +
       	}

     

       210
       210
       +
       	id := PipelineId{

     

       211
       211
       +
       		Knot: "example.com",

     

       212
       212
       +
       		Rkey: "123123",

     

       213
       213
       +
       	}

     

       214
       214
       +
       	env := PipelineEnvVars(tr, id, true)

     

       215
       215
       +
       

     

       216
       216
       +
       	// Dev mode should use http:// and replace localhost with host.docker.internal

     

       217
       217
       +
       	expectedURL := "http://host.docker.internal:3000/did:plc:user123/my-repo"

     

       218
       218
       +
       	if env["TANGLED_REPO_URL"] != expectedURL {

     

       219
       219
       +
       		t.Errorf("Expected TANGLED_REPO_URL='%s', got '%s'", expectedURL, env["TANGLED_REPO_URL"])

     

       220
       220
       +
       	}

     

       221
       221
       +
       }

     

       222
       222
       +
       

     

       223
       223
       +
       func TestPipelineEnvVars_NilTrigger(t *testing.T) {

     

       224
       224
       +
       	id := PipelineId{

     

       225
       225
       +
       		Knot: "example.com",

     

       226
       226
       +
       		Rkey: "123123",

     

       227
       227
       +
       	}

     

       228
       228
       +
       	env := PipelineEnvVars(nil, id, false)

     

       229
       229
       +
       

     

       230
       230
       +
       	if env != nil {

     

       231
       231
       +
       		t.Error("Expected nil env for nil trigger")

     

       232
       232
       +
       	}

     

       233
       233
       +
       }

     

       234
       234
       +
       

     

       235
       235
       +
       func TestPipelineEnvVars_NilPushData(t *testing.T) {

     

       236
       236
       +
       	tr := &tangled.Pipeline_TriggerMetadata{

     

       237
       237
       +
       		Kind: string(workflow.TriggerKindPush),

     

       238
       238
       +
       		Push: nil,

     

       239
       239
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       240
       240
       +
       			Knot: "example.com",

     

       241
       241
       +
       			Did:  "did:plc:user123",

     

       242
       242
       +
       			Repo: "my-repo",

     

       243
       243
       +
       		},

     

       244
       244
       +
       	}

     

       245
       245
       +
       	id := PipelineId{

     

       246
       246
       +
       		Knot: "example.com",

     

       247
       247
       +
       		Rkey: "123123",

     

       248
       248
       +
       	}

     

       249
       249
       +
       	env := PipelineEnvVars(tr, id, false)

     

       250
       250
       +
       

     

       251
       251
       +
       	// Should still have repo variables

     

       252
       252
       +
       	if env["TANGLED_REPO_KNOT"] != "example.com" {

     

       253
       253
       +
       		t.Errorf("Expected TANGLED_REPO_KNOT='example.com', got '%s'", env["TANGLED_REPO_KNOT"])

     

       254
       254
       +
       	}

     

       255
       255
       +
       

     

       256
       256
       +
       	// Should not have ref/sha variables

     

       257
       257
       +
       	if _, ok := env["TANGLED_REF"]; ok {

     

       258
       258
       +
       		t.Error("Should not have TANGLED_REF when push data is nil")

     

       259
       259
       +
       	}

     

       260
       260
       +
       }

+11

spindle/server.go

···

       6
       6
        
       	"encoding/json"

     

       7
       7
        
       	"fmt"

     

       8
       8
        
       	"log/slog"

     

       9
       9
       +
       	"maps"

     

       9
       10
        
       	"net/http"

     

       10
       11
        
       

     

       11
       12
        
       	"github.com/go-chi/chi/v5"

     
···

       311
       312
        
       

     

       312
       313
        
       		workflows := make(map[models.Engine][]models.Workflow)

     

       313
       314
        
       

     

       315
       315
       +
       		// Build pipeline environment variables once for all workflows

     

       316
       316
       +
       		pipelineEnv := models.PipelineEnvVars(tpl.TriggerMetadata, pipelineId, s.cfg.Server.Dev)

     

       317
       317
       +
       

     

       314
       318
        
       		for _, w := range tpl.Workflows {

     

       315
       319
        
       			if w != nil {

     

       316
       320
        
       				if _, ok := s.engs[w.Engine]; !ok {

     
···

       336
       340
        
       					return err

     

       337
       341
        
       				}

     

       338
       342
        
       

     

       343
       343
       +
       				// inject TANGLED_* env vars after InitWorkflow

     

       344
       344
       +
       				// This prevents user-defined env vars from overriding them

     

       345
       345
       +
       				if ewf.Environment == nil {

     

       346
       346
       +
       					ewf.Environment = make(map[string]string)

     

       347
       347
       +
       				}

     

       348
       348
       +
       				maps.Copy(ewf.Environment, pipelineEnv)

     

       349
       349
       +
       

     

       339
       350
        
       				workflows[eng] = append(workflows[eng], *ewf)

     

       340
       351
        
       

     

       341
       352
        
       				err = s.db.StatusPending(models.WorkflowId{