Skip to content

0.4.0 build: downloading resources from deployment directory #10

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.

Sign up for GitHub

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

Open
jrzeszutek wants to merge 6 commits into
base: 0.4.0-build
Choose a base branch
from
Open

0.4.0 build: downloading resources from deployment directory #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c4b32f
version 0.4 - added possibility of using zip archives, directories an…
jrzeszutek Aug 20, 2018
a7f49f9
0.4-build: README update
jrzeszutek Sep 3, 2018
8aede91
View #7: added requested changes
jrzeszutek Sep 27, 2018
75f39ad
added downloading resources from deployment directory
jrzeszutek Oct 24, 2018
24439d0
resolved conflicts
jrzeszutek Oct 24, 2018
bad53f5
Merge branch '0.4.0-build' into master
jrzeszutek Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 64 additions & 36 deletions exec_plugin/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,23 @@ def get_blueprint_directory():
ctx.tenant_name, ctx.blueprint.id))


def get_deployment_directory():
# In order to use update workflow, scripts should be taken from
# deployment directory. But to assure the possibility of using the
# plugin in install workflow (before the deployment directory is
# created), it returns this method returns blueprint directory,
# if deployment directory doesn't exist yet.
deployment_dir = get_directory_by_property_name(
'deployment_directory',
lambda: '/opt/manager/resources/deployments/{0}/{1}'.format(
ctx.tenant_name, ctx.deployment.id))

if deployment_dir:
return deployment_dir
else:
return get_blueprint_directory()


def extract_archive_from_path(archive_path,
target_directory,
intermediate_actions=None):
Expand Down Expand Up @@ -92,8 +109,8 @@ def get_package_dir_from_dir_and_list(resource_dir,
# Deal with ZIP files
filename, extension = os.path.splitext(resource_dir)
if extension == '.zip':
archive_path = os.path.join(get_blueprint_directory(), resource_dir)
target_directory = os.path.join(get_blueprint_directory(), filename)
archive_path = os.path.join(get_deployment_directory(), resource_dir)
target_directory = os.path.join(get_deployment_directory(), filename)
resource_dir = filename
extract_archive_from_path(archive_path, target_directory)

Expand All @@ -105,15 +122,16 @@ def get_package_dir_from_dir_and_list(resource_dir,
if extension == '.zip':
resource_list.remove(template_path)
archive_path = os.path.join(
get_blueprint_directory(), resource_dir, template_path)
get_deployment_directory(), resource_dir, template_path)
target_directory = os.path.join(
get_blueprint_directory(), resource_dir, filename)
get_deployment_directory(), resource_dir, filename)
extract_archive_from_path(archive_path, target_directory)

for extracted_template in os.walk(target_directory):
extracted_template_path = get_resource_relative_path(
extracted_template,
os.path.join(get_blueprint_directory(), resource_dir))
os.path.join(get_deployment_directory(), resource_dir))

if extracted_template[2]:
for filename in extracted_template[2]:
resource_list.append(
Expand All @@ -126,9 +144,10 @@ def get_package_dir_from_dir_and_list(resource_dir,
# This loop goes through a directory defined in resource_dir parameter
# and prepares a list of paths inside it.
for resource_path in os.walk(os.path.join(
get_blueprint_directory(), resource_dir)):
get_deployment_directory(), resource_dir)):
trimmed_resource_path = get_resource_relative_path(
resource_path, os.path.join(get_blueprint_directory()))
resource_path, os.path.join(get_deployment_directory()))

if resource_path[2]:
for filename in resource_path[2]:
merged_list.append(
Expand Down Expand Up @@ -157,13 +176,16 @@ def get_package_dir_from_dir_and_list(resource_dir,
if e.errno != errno.EEXIST:
raise

ctx.download_resource_and_render(
download_from_file,
download_to_file,
template_variables.copy())

if os.path.splitext(download_to_file)[1] == '.py':
os.chmod(download_to_file, 0755)
try:
ctx.download_resource_and_render(
download_from_file,
download_to_file,
template_variables.copy())
if os.path.splitext(download_to_file)[1] == '.py':
os.chmod(download_to_file, 0755)
except IOError as e:
if e.errno != errno.EISDIR:
raise

if download_from_file in merged_list:
merged_list.remove(download_from_file)
Expand All @@ -187,13 +209,12 @@ def get_package_dir_from_dir_and_list(resource_dir,
ctx.download_resource(
resource_path,
download_to_file)
except OSError as e:
if os.path.splitext(download_to_file)[1] == '.py':
os.chmod(download_to_file, 0755)
except IOError as e:
if e.errno != errno.EISDIR:
raise

if os.path.splitext(download_to_file)[1] == '.py':
os.chmod(download_to_file, 0755)

return get_current_working_directory()


Expand All @@ -206,8 +227,8 @@ def get_package_dir_from_dir(resource_dir, template_variables={}):
# Deal with ZIP files
filename, extension = os.path.splitext(resource_dir)
if extension == '.zip':
archive_path = os.path.join(get_blueprint_directory(), resource_dir)
target_directory = os.path.join(get_blueprint_directory(), filename)
archive_path = os.path.join(get_deployment_directory(), resource_dir)
target_directory = os.path.join(get_deployment_directory(), filename)
resource_dir = filename
extract_archive_from_path(archive_path, target_directory)

Expand All @@ -216,9 +237,9 @@ def get_package_dir_from_dir(resource_dir, template_variables={}):
# This loop goes through a directory defined in resource_dir parameter
# and prepares a list of paths inside it.
for resource_path in os.walk(
os.path.join(get_blueprint_directory(), resource_dir)):
os.path.join(get_deployment_directory(), resource_dir)):
trimmed_resource_path = get_resource_relative_path(
resource_path, os.path.join(get_blueprint_directory()))
resource_path, os.path.join(get_deployment_directory()))

if resource_path[2]:
for filename in resource_path[2]:
Expand All @@ -243,13 +264,16 @@ def get_package_dir_from_dir(resource_dir, template_variables={}):
if e.errno != errno.EEXIST:
raise

ctx.download_resource_and_render(
download_from_file,
download_to_file,
template_variables.copy())

if os.path.splitext(download_to_file)[1] == '.py':
os.chmod(download_to_file, 0755)
try:
ctx.download_resource_and_render(
download_from_file,
download_to_file,
template_variables.copy())
if os.path.splitext(download_to_file)[1] == '.py':
os.chmod(download_to_file, 0755)
except IOError as e:
if e.errno != errno.EISDIR:
raise

return get_current_working_directory()

Expand All @@ -270,14 +294,14 @@ def get_package_dir_from_list(resource_list, template_variables={}):
resource_list.remove(template_path)

archive_path = os.path.join(
get_blueprint_directory(), template_path)
get_deployment_directory(), template_path)
target_directory = os.path.join(
get_blueprint_directory(), filename)
get_deployment_directory(), filename)
extract_archive_from_path(archive_path, target_directory)

for extracted_template in os.walk(target_directory):
extracted_template_path = get_resource_relative_path(
extracted_template, get_blueprint_directory())
extracted_template, get_deployment_directory())
if extracted_template[2]:
for filename in extracted_template[2]:
resource_list.append(
Expand All @@ -289,10 +313,14 @@ def get_package_dir_from_list(resource_list, template_variables={}):
resource_name = os.path.basename(template_path)
download_to = os.path.join(
get_current_working_directory(), resource_name)
ctx.download_resource_and_render(
template_path,
download_to,
template_variables.copy())
try:
ctx.download_resource_and_render(
template_path,
download_to,
template_variables.copy())
except IOError as e:
if e.errno != errno.EISDIR:
raise

return get_current_working_directory()

Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
license='LICENSE',
description='Execute something.',
install_requires=[
'cloudify-common'
'cloudify-common',
'Jinja2>=2.9.0'
]
)