Repository navigation
Merge dev into test #560
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Merge dev into test #560
Changes from 22 commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
087cd4f
SD-3304: Update TD scenarios and validations
pedrocarvalhodcsa 0bf0545
SD-3304: Update missing details
pedrocarvalhodcsa 54eb05e
SD-3304: Fix tests and bugs
pedrocarvalhodcsa 11212c4
SD-3304: Rename suites from td and si only to td and si
pedrocarvalhodcsa 4ff49ba
SD-3304: Fix validation and test cases
pedrocarvalhodcsa e6c0b76
SD-3304: Update md file to reflect changes
pedrocarvalhodcsa d7d30da
Merge pull request #556 from dcsaorg/SD-3304_update-td
pedrocarvalhodcsa 4bcd66e
SD-3349: Update AN scenarios and validations
pedrocarvalhodcsa 0117d87
SD-3349: Fix issues
pedrocarvalhodcsa f2f8ae1
SD-3349: Update gitignore
pedrocarvalhodcsa bf533c3
SD-3349: Add specifications import script from confluence
pedrocarvalhodcsa 66beb9b
SD-3349: Fix AN tests
pedrocarvalhodcsa 01af6e9
SD-3349: Recover deleted files
pedrocarvalhodcsa 687678a
SD-3349: Remove useless file
pedrocarvalhodcsa 5cd7947
Merge pull request #557 from dcsaorg/SD-3349_refactor-an
pedrocarvalhodcsa dc46954
docs: auto-sync Confluence documentation
c64710c
SD-3349: Refactor scenarios and validations for endorsment chain
pedrocarvalhodcsa 654019a
SD-3349: Fix issue
pedrocarvalhodcsa 3e8fac4
SD-3349: Fix test
pedrocarvalhodcsa 4ab5bbe
SD-3349: Fix issues
pedrocarvalhodcsa 8e5882b
Merge pull request #558 from dcsaorg/SD-3327_ec-refactor
pedrocarvalhodcsa fd40914
Sd 3274 SI Update Conformance (#559)
palatsangeetha 7293f97
Merge branch 'test' into dev
pedrocarvalhodcsa bbf4d9b
SD-3401: Update TD scenarios and validations
pedrocarvalhodcsa d47493c
SD-3401: Update ebl UC6 instructions
pedrocarvalhodcsa 735bf63
SD-3401: Adjust TNT validations
pedrocarvalhodcsa ca549a8
SD-3401: Fix all in one sandbox runs
pedrocarvalhodcsa e8bbb80
Merge pull request #562 from dcsaorg/SD-3401_adjust-tnt-scenarios
pedrocarvalhodcsa 7b64263
Merge pull request #561 from dcsaorg/SD-3401_update-td-scenarios
pedrocarvalhodcsa 7e9ef3b
docs: auto-sync Confluence documentation
bfeeb7f
SD-3134 Add initial ZAP scan profiles
gj0dcsa 6cef5ad
SD-3134 Add initial ZAP scan profiles
gj0dcsa 9b5e254
SD-3134 Add clickjacking response headers
gj0dcsa 52a3ab8
SD-3134 Add clickjacking response headers
gj0dcsa e833671
SD-3134 Refine CSP scan handling
gj0dcsa b2eb83d
SD-3134 Refine CSP scan handling
gj0dcsa 1d0bf38
SD-3438: Update tnt schema (#568)
pedrocarvalhodcsa a618170
docs: auto-sync Confluence documentation
49a590b
no-issue: fix documentation sync script
pedrocarvalhodcsa d238051
no-issue: remove unwanted booking validation
pedrocarvalhodcsa 7977f8a
no-issue: fix CSP
pedrocarvalhodcsa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| name: Confluence Sync | ||
|
|
||
| on: | ||
| schedule: | ||
| # Runs every Monday at 02:00 UTC | ||
| - cron: '0 2 * * 1' | ||
|
|
||
| workflow_dispatch: | ||
| # Allow manual trigger from GitHub UI | ||
|
|
||
| # Optional: trigger on push to main branch if confluence-config.json changes | ||
| push: | ||
| paths: | ||
| - 'scripts/src/confluence/confluence-config.json' | ||
| - 'scripts/src/confluence/sync-confluence.py' | ||
| - 'scripts/src/confluence/requirements.txt' | ||
| - '.github/workflows/confluence-sync.yml' | ||
| branches: | ||
| - main | ||
|
|
||
| jobs: | ||
| sync: | ||
| runs-on: ubuntu-latest | ||
| name: Sync Confluence to Git | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Set up Python | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.11' | ||
| cache: 'pip' | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install -r scripts/src/confluence/requirements.txt | ||
|
|
||
| - name: Run converter self-test | ||
| run: | | ||
| python scripts/src/confluence/sync-confluence.py --self-test | ||
|
|
||
| - name: Configure git | ||
| run: | | ||
| git config --local user.email "bot@dcsa.org" | ||
| git config --local user.name "DCSA Bot" | ||
|
|
||
| - name: Run Confluence Sync | ||
| env: | ||
| CONFLUENCE_BASE_URL: ${{ secrets.CONFLUENCE_BASE_URL }} | ||
| CONFLUENCE_USERNAME: ${{ secrets.CONFLUENCE_USERNAME }} | ||
| CONFLUENCE_API_TOKEN: ${{ secrets.CONFLUENCE_API_TOKEN }} | ||
| CONFLUENCE_SPACE_KEY: SD | ||
| run: | | ||
| python scripts/src/confluence/sync-confluence.py | ||
|
|
||
| - name: Check for changes | ||
| id: git-check | ||
| run: | | ||
| if git diff --quiet; then | ||
| echo "has_changes=false" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "has_changes=true" >> $GITHUB_OUTPUT | ||
| fi | ||
|
|
||
| - name: Commit and push changes | ||
| if: steps.git-check.outputs.has_changes == 'true' | ||
| run: | | ||
| git add specifications/confluence-sync/ | ||
| git commit -m "docs: auto-sync Confluence documentation | ||
|
|
||
| - Synced specifications from Confluence space SD | ||
| - Timestamp: $(date -u +'%Y-%m-%dT%H:%M:%SZ') | ||
| - Workflow: Confluence Sync" | ||
| git push | ||
|
|
||
| - name: Create Pull Request | ||
| if: steps.git-check.outputs.has_changes == 'true' | ||
| uses: peter-evans/create-pull-request@v5 | ||
| with: | ||
| commit-message: 'docs: auto-sync Confluence documentation' | ||
| title: 'docs: Auto-sync Confluence documentation' | ||
| body: | | ||
| ## Automated Confluence Sync | ||
|
|
||
| This PR contains automatically synced documentation from Confluence. | ||
|
|
||
| **Sync Details:** | ||
| - Source: Confluence Space `SD` (Standards Development) | ||
| - Destination: `specifications/confluence-sync/` | ||
| - Timestamp: ${{ github.event.head_commit.timestamp }} | ||
| - Trigger: ${{ github.event_name }} | ||
|
|
||
| ### What to check: | ||
| - [ ] Files have expected content | ||
| - [ ] No sensitive data exposed | ||
| - [ ] Markdown formatting looks correct | ||
| - [ ] Links are preserved | ||
|
|
||
| ### Merge Instructions: | ||
| If everything looks good, merge this PR to keep specifications current. | ||
| branch: confluence-sync-${{ github.run_number }} | ||
| delete-branch: true | ||
| labels: | | ||
| documentation | ||
| automated | ||
| confluence-sync | ||
|
|
||
| - name: Workflow Status | ||
| if: always() | ||
| run: | | ||
| echo "## Confluence Sync Status" | ||
| echo "- Scheduled: Every Monday at 02:00 UTC" | ||
| echo "- Last Run: $(date -u +'%Y-%m-%d %H:%M:%S UTC')" | ||
| echo "- Changes Detected: ${{ steps.git-check.outputs.has_changes }}" | ||
| echo "- Configuration: scripts/src/confluence/confluence-config.json" | ||
|
|
||
| verify: | ||
| runs-on: ubuntu-latest | ||
| name: Verify Sync Output | ||
| needs: sync | ||
| if: always() | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Check sync directory exists | ||
| run: | | ||
| if [ -d "specifications/confluence-sync" ]; then | ||
| echo "✓ Sync directory exists" | ||
| ls -la specifications/confluence-sync/ | ||
| else | ||
| echo "⚠ Sync directory not found (may be first run)" | ||
| fi | ||
|
|
||
| - name: Validate markdown files | ||
| run: | | ||
| if find specifications/confluence-sync -type f -name '*.md' | grep -q .; then | ||
| count=$(find specifications/confluence-sync -type f -name '*.md' | wc -l) | ||
| echo "✓ Found ${count} markdown files" | ||
| while IFS= read -r file; do | ||
| if [ -s "$file" ]; then | ||
| echo " ✓ ${file} - $(wc -l < "$file") lines" | ||
| fi | ||
| done < <(find specifications/confluence-sync -type f -name '*.md' | sort) | ||
| else | ||
| echo "ℹ No markdown files found (check config or Confluence connectivity)" | ||
| fi | ||
|
|
||
| - name: Summary | ||
| run: | | ||
| echo "## Sync Verification Complete" | ||
| echo "- Documentation location: specifications/confluence-sync/" | ||
| echo "- Config file: scripts/src/confluence/confluence-config.json" | ||
| echo "- Next sync: Monday 02:00 UTC" | ||
| echo "" | ||
| echo "To manually trigger sync:" | ||
| echo " 1. Go to: Actions → Confluence Sync" | ||
| echo " 2. Click: Run workflow" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,3 +33,8 @@ build/ | |
| .vscode/ | ||
|
|
||
| .run | ||
|
|
||
| ### Environment variables ### | ||
| .env | ||
| .env.local | ||
| .env.*.local | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.