Skip to content

Commit abca997

Browse files
committed
Converting inputs from YAML to be strings instead of trusting user input
1 parent 758f38c commit abca997

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
[tool.poetry]
55
name = "aws-service-catalog-puppet"
6-
version = "0.254.3"
6+
version = "0.254.4"
77
description = "Making it easier to deploy ServiceCatalog products"
88
classifiers = ["Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Programming Language :: Python :: 3", "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Natural Language :: English"]
99
homepage = "https://service-catalog-tools-workshop.com/"

servicecatalog_puppet/workflow/dependencies/tasks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def get_parameter_values(self):
234234

235235
if param_details.get("s3"):
236236
requested_param_details = param_details.get("s3")
237-
key = requested_param_details.get("key")
237+
key = str(requested_param_details.get("key"))
238238
key = (
239239
key.replace("${AWS::Region}", self.region)
240240
.replace("${AWS::AccountId}", self.account_id)
@@ -249,13 +249,13 @@ def get_parameter_values(self):
249249
parameter_task_output = self.get_output_from_reference_dependency(
250250
task_ref
251251
)
252-
jmespath_location = requested_param_details.get("jmespath")
252+
jmespath_location = str(requested_param_details.get("jmespath"))
253253
jmespath_location = (
254254
jmespath_location.replace("${AWS::Region}", self.region)
255255
.replace("${AWS::AccountId}", self.account_id)
256256
.replace("${AWS::PuppetAccountId}", self.puppet_account_id)
257257
)
258-
default = requested_param_details.get("default")
258+
default = str(requested_param_details.get("default"))
259259
default = (
260260
default.replace("${AWS::Region}", self.region)
261261
.replace("${AWS::AccountId}", self.account_id)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
setup_kwargs = {
7676
'name': 'aws-service-catalog-puppet',
77-
'version': '0.254.3',
77+
'version': '0.254.4',
7878
'description': 'Making it easier to deploy ServiceCatalog products',
7979
'long_description': '# aws-service-catalog-puppet\n\n![logo](./docs/logo.png) \n\n## Badges\n\n[![codecov](https://codecov.io/gh/awslabs/aws-service-catalog-puppet/branch/master/graph/badge.svg?token=e8M7mdsmy0)](https://codecov.io/gh/awslabs/aws-service-catalog-puppet)\n\n\n## What is it?\nThis is a python3 framework that makes it easier to share multi region AWS Service Catalog portfolios and makes it \npossible to provision products into accounts declaratively using a metadata based rules engine.\n\nWith this framework you define your accounts in a YAML file. You give each account a set of tags, a default region and \na set of enabled regions.\n\nOnce you have done this you can define portfolios should be shared with each set of accounts using the tags and you \ncan specify which regions the shares occur in.\n\nIn addition to this, you can also define products that should be provisioned into accounts using the same tag based \napproach. The framework will assume role into the target account and provision the product on your behalf.\n\n\n## Getting started\n\nYou can read the [installation how to](https://service-catalog-tools-workshop.com/30-how-tos/10-installation/30-service-catalog-puppet.html)\nor you can read through the [every day use](https://service-catalog-tools-workshop.com/30-how-tos/50-every-day-use.html)\nguides.\n\nYou can read the [documentation](https://aws-service-catalog-puppet.readthedocs.io/en/latest/) to understand the inner \nworkings. \n\n\n## Going further\n\nThe framework is one of a pair. The other is [aws-service-catalog-factory](https://github.com/awslabs/aws-service-catalog-factory).\nWith Service Catalog Factory you can create pipelines that deploy multi region portfolios very easily. \n\n## License\n\nThis library is licensed under the Apache 2.0 License. \n \n',
8080
'author': 'Eamonn Faherty',

0 commit comments

Comments
 (0)