Skip to content

Commit bc30d28

Browse files
committed
Trim down test app, test secret receiver logic
1 parent 06889fa commit bc30d28

15 files changed

Lines changed: 110 additions & 127 deletions

.github/workflows/test-pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ jobs:
4646
vscode-docker:
4747
filters:
4848
- 'features/src/workbench-tools/**'
49-
vscode-secrets:
49+
test-app-secrets:
5050
filters:
51-
- 'features/src/workbench-tools/**'
51+
- 'src/common/**'
5252
workbench-jupyter:
5353
template: custom-workbench-jupyter-template
5454
maximize_build_space: true
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "test-app-secrets",
3+
"dockerComposeFile": "docker-compose.yaml",
4+
"service": "app",
5+
"runServices": ["app"],
6+
"shutdownAction": "none",
7+
"workspaceFolder": "/workspace",
8+
"remoteUser": "root"
9+
}

src/test-app-secrets/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM docker/getting-started
2+
3+
COPY --from=wb-secret-receiver /dist/wb-secret-receiver /wb-secret-receiver
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"id": "test-app-secrets",
3+
"version": "1.0.0",
4+
"name": "test-app-secrets",
5+
"description": "Test app demonstrating secret receiver integration",
6+
"options": {
7+
"cloud": {
8+
"type": "string",
9+
"enum": ["gcp", "aws"],
10+
"default": "gcp",
11+
"description": "Cloud provider (gcp or aws)"
12+
},
13+
"login": {
14+
"type": "string",
15+
"description": "Whether to log in to workbench CLI",
16+
"proposals": ["true", "false"],
17+
"default": "false"
18+
}
19+
}
20+
}
Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@ services:
77
context: .
88
additional_contexts:
99
wb-secret-receiver: service:common-secret-receiver-builder
10-
entrypoint: ["/wb-secret-receiver", "/init"]
10+
entrypoint: ["/wb-secret-receiver", "/docker-entrypoint.sh"]
11+
command: ["nginx", "-g", "daemon off;"]
1112
restart: always
1213
volumes:
1314
- .:/workspace:cached
14-
- work:/home/vscode:cached
1515
ports:
16-
- "8443:8443"
17-
environment:
18-
USER: "abc"
19-
DEFAULT_WORKSPACE: "/config"
20-
SUDO_PASSWORD: "pwd"
16+
- 8001:80
2117
networks:
2218
- app-network
2319
cap_add:
@@ -29,5 +25,3 @@ services:
2925
networks:
3026
app-network:
3127
external: true
32-
volumes:
33-
work:

src/test-app-secrets/secrets.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
secrets:
2+
- name: "example-secret"
3+
valueVar: "EXAMPLE_SECRET"
4+
- name: "pipe-secret"
5+
pipeVar: "PIPE_SECRET"
6+
- name: "path-secret"
7+
pathVar: "PATH_SECRET"
8+
- name: "docker-registry-secret"
9+
dockerRegistry: "secret.docker.registry"

src/vscode-secrets/.devcontainer.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/vscode-secrets/Dockerfile

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/vscode-secrets/README.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/vscode-secrets/devcontainer-template.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)