Skip to content

Commit 23d6724

Browse files
Fix d2d pipeline bugs from ecosytem configurations
Reference: #1715 Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent aa2c786 commit 23d6724

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

scanpipe/pipelines/deploy_to_develop.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def match_archives_to_purldb(self):
158158

159159
d2d.match_purldb_resources(
160160
project=self.project,
161-
extensions=self.matchable_package_extensions,
161+
extensions=self.ecosystem_config.matchable_package_extensions,
162162
matcher_func=d2d.match_purldb_package,
163163
logger=self.log,
164164
)
@@ -249,7 +249,7 @@ def match_resources_to_purldb(self):
249249

250250
d2d.match_purldb_resources(
251251
project=self.project,
252-
extensions=self.matchable_resource_extensions,
252+
extensions=self.ecosystem_config.matchable_resource_extensions,
253253
matcher_func=d2d.match_purldb_resource,
254254
logger=self.log,
255255
)

scanpipe/pipes/d2d_config.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ def load_ecosystem_config(pipeline, options):
154154
# Add default configurations which are common accross ecosystems
155155
pipeline.ecosystem_config = ECOSYSTEM_CONFIGS.get("Default")
156156

157+
if not options:
158+
return
159+
157160
# Add configurations for each selected ecosystem
158161
for selected_option in options:
159162
if selected_option not in ECOSYSTEM_CONFIGS:
@@ -184,6 +187,5 @@ def add_ecosystem_config(pipeline_ecosystem_config, ecosystem_config):
184187
if not pipeline_config_value:
185188
new_config_value = config_value
186189
else:
187-
new_config_value = pipeline_config_value.extend(config_value)
188-
190+
new_config_value = config_value + pipeline_config_value
189191
setattr(pipeline_ecosystem_config, config_name, new_config_value)

0 commit comments

Comments
 (0)