Skip to content

Commit 45adb76

Browse files
committed
revert download_path to dest
1 parent a986832 commit 45adb76

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

plugins/modules/maintenance_planner_stack_xml_download.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
- Transaction Name or Transaction Display ID from Maintenance Planner.
3131
required: true
3232
type: str
33-
download_path:
33+
dest:
3434
description:
3535
- Destination folder path.
3636
required: true
@@ -46,7 +46,7 @@
4646
suser_id: 'SXXXXXXXX'
4747
suser_password: 'password'
4848
transaction_name: 'MP_NEW_INST_20211015_044854'
49-
download_path: "/tmp/"
49+
dest: "/tmp/"
5050
register: sap_mp_register
5151
- name: Display the list of download links and filenames
5252
debug:
@@ -79,7 +79,7 @@ def run_module():
7979
suser_id=dict(type='str', required=True),
8080
suser_password=dict(type='str', required=True, no_log=True),
8181
transaction_name=dict(type='str', required=True),
82-
download_path=dict(type='str', required=True)
82+
dest=dict(type='str', required=True)
8383
)
8484

8585
# Define result dictionary objects to be passed back to Ansible
@@ -102,7 +102,7 @@ def run_module():
102102
username = module.params.get('suser_id')
103103
password = module.params.get('suser_password')
104104
transaction_name = module.params.get('transaction_name')
105-
download_path = module.params.get('download_path')
105+
dest = module.params.get('dest')
106106

107107
# Main run
108108

@@ -118,7 +118,7 @@ def run_module():
118118
transaction_id = get_transaction_id(transaction_name)
119119

120120
# EXEC: Download the MP Stack XML file
121-
get_transaction_stack_xml(transaction_id, download_path)
121+
get_transaction_stack_xml(transaction_id, dest)
122122

123123
# Process return dictionary for Ansible
124124
result['changed'] = True

plugins/modules/software_center_download.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
- Download filename of the SAP software.
4949
required: false
5050
type: str
51-
download_path:
51+
dest:
5252
description:
5353
- Destination folder path.
5454
required: true
@@ -80,14 +80,14 @@
8080
suser_password: 'password'
8181
search_query:
8282
- 'SAPCAR_1324-80000936.EXE'
83-
download_path: "/tmp/"
83+
dest: "/tmp/"
8484
- name: Download using direct link and filename
8585
community.sap_launchpad.software_center_download:
8686
suser_id: 'SXXXXXXXX'
8787
suser_password: 'password'
8888
download_link: 'https://softwaredownloads.sap.com/file/0010000000048502015'
8989
download_filename: 'IW_FNDGC100.SAR'
90-
download_path: "/tmp/"
90+
dest: "/tmp/"
9191
'''
9292

9393
RETURN = r'''
@@ -116,21 +116,21 @@
116116
from ..module_utils.sap_launchpad_software_center_download_runner import *
117117
from ..module_utils.sap_id_sso import sap_sso_login
118118

119-
def _check_similar_files(download_path, filename):
119+
def _check_similar_files(dest, filename):
120120
"""
121121
Checks for similar files in the download path based on the given filename.
122122
123123
Args:
124-
download_path (str): The path where files are downloaded.
124+
dest (str): The path where files are downloaded.
125125
filename (str): The filename to check for similar files.
126126
127127
Returns:
128128
bool: True if similar files exist, False otherwise.
129129
filename_similar_names: A list of similar filenames if they exist, empty list otherwise.
130130
"""
131-
# pattern = download_path + '/**/' + os.path.splitext(filename)[0]
131+
# pattern = dest + '/**/' + os.path.splitext(filename)[0]
132132
filename_base = os.path.splitext(filename)[0]
133-
filename_pattern = os.path.join(download_path, "**", filename_base)
133+
filename_pattern = os.path.join(dest, "**", filename_base)
134134
filename_similar = glob.glob(filename_pattern, recursive=True)
135135

136136
if filename_similar:
@@ -150,7 +150,7 @@ def run_module():
150150
search_query=dict(type='str', required=False, default=''),
151151
download_link=dict(type='str', required=False, default=''),
152152
download_filename=dict(type='str', required=False, default=''),
153-
download_path=dict(type='str', required=True),
153+
dest=dict(type='str', required=True),
154154
dry_run=dict(type='bool', required=False, default=False),
155155
deduplicate=dict(type='str', required=False, default=''),
156156
search_alternatives=dict(type='bool', required=False, default=False)
@@ -174,7 +174,7 @@ def run_module():
174174
else:
175175
query = None
176176

177-
download_path = module.params['download_path']
177+
dest = module.params['dest']
178178
download_link= module.params.get('download_link')
179179
download_filename= module.params.get('download_filename')
180180
dry_run = module.params.get('dry_run')
@@ -207,7 +207,7 @@ def run_module():
207207

208208
# Search for existing files using exact filename
209209
filename = query if query else download_filename
210-
filename_exact = os.path.join(download_path, filename)
210+
filename_exact = os.path.join(dest, filename)
211211
result['filename'] = filename
212212

213213
if os.path.exists(filename_exact):
@@ -216,7 +216,7 @@ def run_module():
216216
module.exit_json(**result)
217217
else:
218218
# Exact file not found, search for similar files with pattern
219-
filename_similar_exists, filename_similar_names = _check_similar_files(download_path, filename)
219+
filename_similar_exists, filename_similar_names = _check_similar_files(dest, filename)
220220
if filename_similar_exists and not (query and search_alternatives):
221221
result['skipped'] = True
222222
result['msg'] = f"Similar file(s) already exist: {', '.join(filename_similar_names)}"
@@ -235,14 +235,14 @@ def run_module():
235235
result['filename'] = download_filename
236236
result['alternative'] = True
237237

238-
filename_alternative_exact = os.path.join(download_path, download_filename)
238+
filename_alternative_exact = os.path.join(dest, download_filename)
239239
if os.path.exists(filename_alternative_exact):
240240
result['skipped'] = True
241241
result['msg'] = f"Alternative file already exists: {download_filename} - original file {query} is not available to download"
242242
module.exit_json(**result)
243243
else:
244244
# Exact file not found, search for similar files with pattern
245-
filename_similar_exists, filename_similar_names = _check_similar_files(download_path, download_filename)
245+
filename_similar_exists, filename_similar_names = _check_similar_files(dest, download_filename)
246246
if filename_similar_exists:
247247
result['skipped'] = True
248248
result['msg'] = f"Similar alternative file(s) already exist: {', '.join(filename_similar_names)}"
@@ -252,13 +252,13 @@ def run_module():
252252
elif filename != download_filename and not alternative_found:
253253
result['filename'] = download_filename
254254

255-
if os.path.exists(os.path.join(download_path, download_filename)):
255+
if os.path.exists(os.path.join(dest, download_filename)):
256256
result['skipped'] = True
257257
result['msg'] = f"File already exists with correct name: {download_filename}"
258258
module.exit_json(**result)
259259
else:
260260
# Exact file not found, search for similar files with pattern
261-
filename_similar_exists, filename_similar_names = _check_similar_files(download_path, download_filename)
261+
filename_similar_exists, filename_similar_names = _check_similar_files(dest, download_filename)
262262
if filename_similar_exists:
263263
result['skipped'] = True
264264
result['msg'] = f"Similar file(s) already exist for correct name {download_filename}: {', '.join(filename_similar_names)}"
@@ -281,7 +281,7 @@ def run_module():
281281
else:
282282
module.fail_json(msg="Download link {} is not available".format(download_link))
283283

284-
download_software(download_link, download_filename, download_path)
284+
download_software(download_link, download_filename, dest)
285285

286286
# Update final results json
287287
result['changed'] = True

roles/.gitkeep

Whitespace-only changes.

roles/sap_software_download/tasks/download_files.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
suser_id: "{{ sap_software_download_suser_id }}"
77
suser_password: "{{ sap_software_download_suser_password }}"
88
search_query: "{{ item }}"
9-
download_path: "{{ sap_software_download_directory }}"
9+
dest: "{{ sap_software_download_directory }}"
1010
search_alternatives: "{{ sap_software_download_find_alternatives | d(true) }}"
1111
deduplicate: "{{ sap_software_download_deduplicate | d('') }}"
1212
# Loop condition acts as when conditional
@@ -30,7 +30,7 @@
3030
suser_id: "{{ sap_software_download_suser_id }}"
3131
suser_password: "{{ sap_software_download_suser_password }}"
3232
search_query: "{{ item }}"
33-
download_path: "{{ sap_software_download_directory }}"
33+
dest: "{{ sap_software_download_directory }}"
3434
search_alternatives: "{{ sap_software_download_find_alternatives | d(true) }}"
3535
deduplicate: "{{ sap_software_download_deduplicate | d('') }}"
3636
# Loop condition acts as when conditional

roles/sap_software_download/tasks/download_plan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
suser_password: "{{ sap_software_download_suser_password }}"
88
download_link: "{{ item.DirectLink }}"
99
download_filename: "{{ item.Filename }}"
10-
download_path: "{{ sap_software_download_directory }}"
10+
dest: "{{ sap_software_download_directory }}"
1111
# Loop condition acts as when conditional
1212
loop: "{{ __sap_software_download_mp_transaction_results.download_basket if sap_software_download_use_venv | d(true) else [] }}"
1313
loop_control:
@@ -30,7 +30,7 @@
3030
suser_password: "{{ sap_software_download_suser_password }}"
3131
download_link: "{{ item.DirectLink }}"
3232
download_filename: "{{ item.Filename }}"
33-
download_path: "{{ sap_software_download_directory }}"
33+
dest: "{{ sap_software_download_directory }}"
3434
# Loop condition acts as when conditional
3535
loop: "{{ __sap_software_download_mp_transaction_results.download_basket if not sap_software_download_use_venv | d(true) else [] }}"
3636
loop_control:

roles/sap_software_download/tasks/pre_steps/03_validate_credentials.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
suser_id: "{{ sap_software_download_suser_id }}"
99
suser_password: "{{ sap_software_download_suser_password }}"
1010
search_query: "SAPCAR"
11-
download_path: "{{ sap_software_download_directory }}"
11+
dest: "{{ sap_software_download_directory }}"
1212
search_alternatives: true
1313
deduplicate: "last"
1414
dry_run: true
@@ -29,7 +29,7 @@
2929
suser_id: "{{ sap_software_download_suser_id }}"
3030
suser_password: "{{ sap_software_download_suser_password }}"
3131
search_query: "SAPCAR"
32-
download_path: "{{ sap_software_download_directory }}"
32+
dest: "{{ sap_software_download_directory }}"
3333
search_alternatives: true
3434
deduplicate: "last"
3535
dry_run: true

roles/sap_software_download/tasks/pre_steps/05_validate_relations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
suser_id: "{{ sap_software_download_suser_id }}"
1111
suser_password: "{{ sap_software_download_suser_password }}"
1212
search_query: "{{ item }}"
13-
download_path: "{{ sap_software_download_directory }}"
13+
dest: "{{ sap_software_download_directory }}"
1414
search_alternatives: "{{ sap_software_download_find_alternatives | d(true) }}"
1515
deduplicate: "{{ sap_software_download_deduplicate | d('') }}"
1616
dry_run: true
@@ -35,7 +35,7 @@
3535
suser_id: "{{ sap_software_download_suser_id }}"
3636
suser_password: "{{ sap_software_download_suser_password }}"
3737
search_query: "{{ item }}"
38-
download_path: "{{ sap_software_download_directory }}"
38+
dest: "{{ sap_software_download_directory }}"
3939
search_alternatives: "{{ sap_software_download_find_alternatives | d(true) }}"
4040
deduplicate: "{{ sap_software_download_deduplicate | d('') }}"
4141
dry_run: true

0 commit comments

Comments
 (0)