Skip to content

Commit c47274e

Browse files
committed
fix: scan single image action, arg split not needed
1 parent 62b8d96 commit c47274e

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

stack_scanner/main.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ def main():
4747
secobserve_api_token = sys.argv[2]
4848
image = sys.argv[3]
4949
product_name = sys.argv[4]
50-
product_version, arch = sys.argv[5].split("-")
51-
scan_image(secobserve_api_token, image, product_name, product_version, arch)
50+
scan_image(secobserve_api_token, image, product_name, sys.argv[5])
5251
sys.exit(0)
5352
else:
5453
secobserve_api_token = sys.argv[2]
@@ -89,8 +88,7 @@ def main():
8988
secobserve_api_token,
9089
f"{REGISTRY_URL}/stackable/{product_name}:{release}-{arch}",
9190
product_name,
92-
release,
93-
arch,
91+
f"{release}-{arch}",
9492
)
9593

9694
# Load product versions from that file using the image-tools functionality
@@ -109,17 +107,15 @@ def main():
109107
secobserve_api_token,
110108
f"{REGISTRY_URL}/stackable/{product_name}:{product_version}-{arch}",
111109
product_name,
112-
product_version,
113-
arch,
110+
f"{product_version}-{arch}",
114111
)
115112

116113

117114
def scan_image(
118115
secobserve_api_token: str,
119116
image: str,
120117
product_name: str,
121-
product_version: str,
122-
architecture: str,
118+
branch_name: str,
123119
) -> None:
124120
mode = "sbom"
125121
extract_sbom_cmd = [
@@ -161,7 +157,7 @@ def scan_image(
161157
env["SO_PRODUCT_NAME"] = product_name
162158
env["SO_API_BASE_URL"] = "https://secobserve-backend.stackable.tech"
163159
env["SO_API_TOKEN"] = secobserve_api_token
164-
env["SO_BRANCH_NAME"] = product_version + "-" + architecture
160+
env["SO_BRANCH_NAME"] = branch_name
165161
env["TMPDIR"] = "/tmp/trivy_tmp"
166162
env["TRIVY_CACHE_DIR"] = "/tmp/trivy_cache"
167163
env["REPORT_NAME"] = "trivy.json"

0 commit comments

Comments
 (0)