Merge pull request #25 from CISA-SBOM-Community/reorg

chore: merging Python and keycloak files into a common directory structure
CISA-SBOM-Community · Sep 17, 2024 · 8717d3e · 8717d3e
2 parents 201fa1a + e166c90
commit 8717d3e
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/phase_1_python.yml b/.github/workflows/phase_1_python.yml
@@ -17,7 +17,7 @@ jobs:
  # than 'docker/build-push-action' to make the run
  # more pipeline agnostic.
  - name: Build Docker image
- working-directory: "Phase 1/Python"
+ working-directory: "phase_1/Python"
  run: |
  docker build -t phase-1-python .
 
@@ -29,7 +29,7 @@ jobs:
  chmod +x /tmp/trivy
 
  - name: Generate SBOM with Trivy
- working-directory: "Phase 1/Python"
+ working-directory: "phase_1/Python"
  run: |
  /tmp/trivy image \
  --format cyclonedx \
@@ -66,15 +66,15 @@ jobs:
  chmod +x /tmp/trivy
 
  - name: "CycloneDX: Generate SBOM"
- working-directory: "Phase 1/Python"
+ working-directory: "phase_1/Python"
  run: |
  /tmp/trivy fs \
  --format cyclonedx \
  --output /tmp/application-sbom.cdx.json \
  requirements.txt
 
  - name: "SPDX: Generate SBOM"
- working-directory: "Phase 1/Python"
+ working-directory: "phase_1/Python"
  run: |
  /tmp/trivy fs \
  --format spdx-json \
@@ -108,7 +108,7 @@ jobs:
  # We're using `envsubst` here to populate the metadata
  # template from environment variables
  export SBOM_NAME='phase1-python-container'
- cat "Phase 1/Python/sbom/metadata.cdx.json.tmpl" | jq | \
+ cat "phase_1/Python/sbom/metadata.cdx.json.tmpl" | jq | \
  envsubst > metadata.cdx.json
  unset SBOM_NAME
 
@@ -123,7 +123,7 @@ jobs:
  # We're using `envsubst` here to populate the metadata
  # template from environment variables
  export SBOM_NAME='phase1-python-application'
- cat "Phase 1/Python/sbom/metadata.cdx.json.tmpl" | jq | \
+ cat "phase_1/Python/sbom/metadata.cdx.json.tmpl" | jq | \
  envsubst > metadata.cdx.json
  unset SBOM_NAME
 
@@ -138,7 +138,7 @@ jobs:
  # We're using `envsubst` here to populate the metadata
  # template from environment variables
  export SBOM_NAME='phase1-python-container'
- cat "Phase 1/Python/sbom/metadata.spdx.json.tmpl" | jq | \
+ cat "phase_1/Python/sbom/metadata.spdx.json.tmpl" | jq | \
  envsubst > metadata.spdx.json
  unset SBOM_NAME
 
@@ -153,7 +153,7 @@ jobs:
  # We're using `envsubst` here to populate the metadata
  # template from environment variables
  export SBOM_NAME='phase1-python-application'
- cat "Phase 1/Python/sbom/metadata.cdx.json.tmpl" | jq | \
+ cat "phase_1/Python/sbom/metadata.cdx.json.tmpl" | jq | \
  envsubst > metadata.cdx.json
  unset SBOM_NAME
 
@@ -195,7 +195,7 @@ jobs:
 
  # We're using `envsubst` here to populate the metadata
  # template from environment variables
- cat "Phase 1/Python/sbom/top-level.cdx.json.tmpl" | jq | \
+ cat "phase_1/Python/sbom/top-level.cdx.json.tmpl" | jq | \
  envsubst > top-level-sbom.cdx.json.tmp
 
  # Set GITHUB_RUN_NUMBER as the version of the SBOM

diff --git a/Phase 1/Python/.dockerignore → phase_1/Python/.dockerignore b/Phase 1/Python/.dockerignore → phase_1/Python/.dockerignore
diff --git a/Phase 1/Python/Dockerfile → phase_1/Python/Dockerfile b/Phase 1/Python/Dockerfile → phase_1/Python/Dockerfile
diff --git a/Phase 1/Python/README.md → phase_1/Python/README.md b/Phase 1/Python/README.md → phase_1/Python/README.md
diff --git a/Phase 1/Python/manage.py → phase_1/Python/manage.py b/Phase 1/Python/manage.py → phase_1/Python/manage.py
diff --git a/Phase 1/Python/phase_1/__init__.py → phase_1/Python/phase_1/__init__.py b/Phase 1/Python/phase_1/__init__.py → phase_1/Python/phase_1/__init__.py
diff --git a/Phase 1/Python/phase_1/asgi.py → phase_1/Python/phase_1/asgi.py b/Phase 1/Python/phase_1/asgi.py → phase_1/Python/phase_1/asgi.py
diff --git a/Phase 1/Python/phase_1/settings.py → phase_1/Python/phase_1/settings.py b/Phase 1/Python/phase_1/settings.py → phase_1/Python/phase_1/settings.py
diff --git a/Phase 1/Python/phase_1/urls.py → phase_1/Python/phase_1/urls.py b/Phase 1/Python/phase_1/urls.py → phase_1/Python/phase_1/urls.py
diff --git a/Phase 1/Python/phase_1/wsgi.py → phase_1/Python/phase_1/wsgi.py b/Phase 1/Python/phase_1/wsgi.py → phase_1/Python/phase_1/wsgi.py
diff --git a/Phase 1/Python/requirements.txt → phase_1/Python/requirements.txt b/Phase 1/Python/requirements.txt → phase_1/Python/requirements.txt
diff --git a/Phase 1/Python/sbom/metadata.cdx.json.tmpl → phase_1/Python/sbom/metadata.cdx.json.tmpl b/Phase 1/Python/sbom/metadata.cdx.json.tmpl → phase_1/Python/sbom/metadata.cdx.json.tmpl
diff --git a/Phase 1/Python/sbom/metadata.spdx.json.tmpl → phase_1/Python/sbom/metadata.spdx.json.tmpl b/Phase 1/Python/sbom/metadata.spdx.json.tmpl → phase_1/Python/sbom/metadata.spdx.json.tmpl
diff --git a/Phase 1/Python/sbom/top-level.cdx.json.tmpl → phase_1/Python/sbom/top-level.cdx.json.tmpl b/Phase 1/Python/sbom/top-level.cdx.json.tmpl → phase_1/Python/sbom/top-level.cdx.json.tmpl
diff --git a/...ision-records/001-sbom-generation-tool.md → ...ision-records/001-sbom-generation-tool.md b/...ision-records/001-sbom-generation-tool.md → ...ision-records/001-sbom-generation-tool.md