Skip to content

Commit

Permalink
Merge pull request #516 from atsign-foundation/remove-file-system-bin…
Browse files Browse the repository at this point in the history
…dings

refactor: Remove file system bindings
  • Loading branch information
gkc committed Oct 9, 2023
2 parents 72dd483 + 659f604 commit 982bb5a
Show file tree
Hide file tree
Showing 55 changed files with 2,245 additions and 1,205 deletions.
20 changes: 16 additions & 4 deletions .github/composite/setup_entrypoints/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ inputs:
devicename:
description: Unique sshnp devicename
required: true
legacy_daemon:
description: Legacy daemon
args:
description: Arguments to pass to the entrypoint
required: false

runs:
Expand All @@ -33,14 +33,26 @@ runs:
working-directory: tests/end2end_tests/contexts/_init_
run: |
case "${{ inputs.sshnp }}" in
"installer")
installer|v3.*.*)
# legacy client
args="-s id_ed25519.pub -v"
entrypoint_filename="sshnp_installer_entrypoint.sh"
;;
*)
entrypoint_filename="sshnp_entrypoint.sh"
case "${{inputs.sshnpd}}" in
installer|v3.*.*)
# v4 client, legacy daemon
args="-i ~/.ssh/id_ed25519 -s -v --legacy-daemon"
;;
*)
# v4 client, v4 daemon
args="-i ~/.ssh/id_ed25519 -s -v"
;;
esac
;;
esac
./setup-sshnp-entrypoint.sh ${{ inputs.devicename }} ${{ inputs.sshnp_atsign }} ${{ inputs.sshnpd_atsign }} ${{ inputs.sshrvd_atsign }} "$entrypoint_filename" ${{ inputs.legacy_daemon || false }}
./setup-sshnp-entrypoint.sh ${{ inputs.devicename }} ${{ inputs.sshnp_atsign }} ${{ inputs.sshnpd_atsign }} ${{ inputs.sshrvd_atsign }} "$entrypoint_filename" "$args ${{ inputs.args }}"
- name: Setup NPD entrypoint
shell: bash
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/end2end_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ env:
DOCKER_COMPOSE_UP_CMD: "docker compose up --abort-on-container-exit"

RELEASES: |
latest
v3.1.2
v3.2.0
v3.3.0
v3.4.0
v3.4.2
BRANCHES: |
trunk
Expand Down Expand Up @@ -244,7 +244,6 @@ jobs:
sshnpd_atsign: ${{ env.SSHNPD_ATSIGN }}
sshrvd_atsign: ${{ env[env.PROD_RVD_ATSIGN] }}
devicename: ${{ env.DEVICENAME }}
legacy_daemon: ${{ matrix.np == 'local' && matrix.npd == 'installer' }}

- name: Ensure entrypoints exist
working-directory: tests/end2end_tests/contexts
Expand Down Expand Up @@ -370,13 +369,11 @@ jobs:
include:
- np: local
npd: v3.4.2
legacy_daemon: true
- np: v3.4.2
npd: local

- np: local
npd: v3.3.0
legacy_daemon: true
- np: v3.3.0
npd: local

Expand Down Expand Up @@ -418,7 +415,7 @@ jobs:
sshnpd_atsign: ${{ env.SSHNPD_ATSIGN }}
sshrvd_atsign: ${{ env[env.PROD_RVD_ATSIGN] }}
devicename: ${{ env.DEVICENAME }}
legacy_daemon: ${{ matrix.legacy_daemon || false }}
args: "-P 55"

- name: Ensure entrypoints exist
working-directory: tests/end2end_tests/contexts
Expand Down Expand Up @@ -551,7 +548,7 @@ jobs:
- name: Set up entrypoints
working-directory: tests/end2end_tests/contexts/_init_
run: |
./setup-sshnp-entrypoint.sh ${{ env.DEVICENAME }} ${{ env.SSHNP_ATSIGN }} ${{ env.SSHNPD_ATSIGN }} ${{ env[env.PROD_RVD_ATSIGN] }} alternate_port_test/sshnp_entrypoint.sh
./setup-sshnp-entrypoint.sh ${{ env.DEVICENAME }} ${{ env.SSHNP_ATSIGN }} ${{ env.SSHNPD_ATSIGN }} ${{ env[env.PROD_RVD_ATSIGN] }} sshnp_entrypoint.sh "-i ~/.ssh/id_ed25519 -s -v -P 55"
./setup-sshnpd-entrypoint.sh ${{ env.DEVICENAME }} ${{ env.SSHNP_ATSIGN }} ${{ env.SSHNPD_ATSIGN }} sshnpd_entrypoint.sh
- name: Ensure entrypoints exist
Expand Down
1 change: 0 additions & 1 deletion examples/.gitignore

This file was deleted.

Loading

0 comments on commit 982bb5a

Please sign in to comment.