Skip to content

Commit e822f03

Browse files
authored
Merge pull request #169 from Infisical/adilsitos/feat/ENG-4525
feat(proxy): Add support for secret update using SSE
2 parents ef00ea3 + 46b37a7 commit e822f03

9 files changed

Lines changed: 1428 additions & 44 deletions

File tree

.github/workflows/run-cli-e2e-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
working-directory: ./e2e
4040
env:
4141
INFISICAL_BACKEND_DIR: ${{ github.workspace }}/infisical/backend
42+
INFISICAL_LICENSE_KEY: ${{ secrets.INFISICAL_LICENSE_KEY }}
4243
INFISICAL_CLI_EXECUTABLE: ${{ github.workspace }}/infisical-cli
4344
CLI_E2E_DEFAULT_RUN_METHOD: subprocess
4445

@@ -65,6 +66,7 @@ jobs:
6566
run: go test -v -timeout 30m -count=1 github.com/infisical/cli/e2e-tests/agent
6667
working-directory: ./e2e
6768
env:
69+
INFISICAL_LICENSE_KEY: ${{ secrets.INFISICAL_LICENSE_KEY }}
6870
INFISICAL_BACKEND_DIR: ${{ github.workspace }}/infisical/backend
6971
INFISICAL_CLI_EXECUTABLE: ${{ github.workspace }}/infisical-cli
7072
CLI_E2E_DEFAULT_RUN_METHOD: subprocess
@@ -100,6 +102,7 @@ jobs:
100102
working-directory: ./e2e
101103
env:
102104
INFISICAL_BACKEND_DIR: ${{ github.workspace }}/infisical/backend
105+
INFISICAL_LICENSE_KEY: ${{ secrets.INFISICAL_LICENSE_KEY }}
103106
INFISICAL_CLI_EXECUTABLE: ${{ github.workspace }}/infisical-cli
104107
CLI_E2E_DEFAULT_RUN_METHOD: subprocess
105108

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ infisical-merge
99
test/infisical-merge
1010
.DS_Store
1111

12+
infisical
13+
1214

1315
/agent-testing

e2e/packages/infisical/compose.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,14 @@ func WithPebbleService() StackOption {
301301
}
302302

303303
func WithBackendService(options BackendOptions) StackOption {
304+
305+
licenseKey, found := os.LookupEnv("INFISICAL_LICENSE_KEY")
306+
if !found {
307+
log.Println("INFISICAL_LICENSE_KEY not set, continuing without licensing.")
308+
} else {
309+
log.Println("INFISICAL_LICENSE_KEY set, continuing with licensing.")
310+
}
311+
304312
return func(s *Stack) {
305313
if s.Project.Services == nil {
306314
s.Project.Services = types.Services{}
@@ -329,6 +337,7 @@ func WithBackendService(options BackendOptions) StackOption {
329337
"SITE_URL=http://localhost:8080",
330338
"OTEL_TELEMETRY_COLLECTION_ENABLED=false",
331339
"ENABLE_MSSQL_SECRET_ROTATION_ENCRYPT=true",
340+
"LICENSE_KEY=" + licenseKey,
332341
}),
333342
Volumes: []types.ServiceVolumeConfig{
334343
{Source: filepath.Join(options.BackendDir, "src"), Target: "/app/src", Type: types.VolumeTypeBind},

0 commit comments

Comments
 (0)