Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion cmpserver/plugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,16 @@ func (s *Service) generateManifestGeneric(stream GenerateManifestStream) error {
if !strings.HasPrefix(appPath, workDir) {
return errors.New("illegal appPath: out of workDir bound")
}
response, err := s.generateManifest(ctx, appPath, metadata.GetEnv())

log.Debugf("Plugin using workdir: %s", workDir)

envEntries := metadata.GetEnv()
envEntries = append(envEntries, &apiclient.EnvEntry{
Name: "ARGOCD_REPO_SERVER_CMP_WORKDIR",
Value: workDir,
})

response, err := s.generateManifest(ctx, appPath, envEntries)
if err != nil {
return fmt.Errorf("error generating manifests: %w", err)
}
Expand Down
22 changes: 22 additions & 0 deletions cmpserver/plugin/plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,28 @@ func TestService_GenerateManifest(t *testing.T) {
})
}

func TestService_EnvironmentVariables(t *testing.T) {
configFilePath := "./testdata/kustomize/config"
service, err := newService(configFilePath)
require.NoError(t, err)

t.Run("ARGOCD_REPO_SERVER_CMP_WORKDIR is set", func(t *testing.T) {
service.WithGenerateCommand(Command{
Command: []string{"sh", "-c"},
Args: []string{"echo -n $ARGOCD_REPO_SERVER_CMP_WORKDIR"},
})

s, err := NewMockGenerateManifestStream("./testdata/kustomize", "./testdata/kustomize", nil)
require.NoError(t, err)
err = service.generateManifestGeneric(s)
require.NoError(t, err)
require.NotNil(t, s.response)
require.NotEmpty(t, s.response.Manifests)
envWorkDir := s.response.Manifests[0]
assert.NotEmpty(t, envWorkDir, "Environment variable ARGOCD_REPO_SERVER_CMP_WORKDIR should not be empty")
})
}

type MockMatchRepositoryStream struct {
metadataSent bool
fileSent bool
Expand Down
Loading