Skip to content

Commit

Permalink
fix: generate-task-reference takes too long (issue #623) (#624)
Browse files Browse the repository at this point in the history
  • Loading branch information
eamonnfaherty committed Jan 23, 2023
1 parent 207a95e commit 6646280
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[tool.poetry]
name = "aws-service-catalog-puppet"
version = "0.213.1"
version = "0.214.0"
description = "Making it easier to deploy ServiceCatalog products"
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"]
homepage = "https://service-catalog-tools-workshop.com/"
Expand Down
19 changes: 14 additions & 5 deletions servicecatalog_puppet/workflow/workflow_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,19 @@ def ensure_no_cyclic_dependencies(name, tasks):
)
for duid in t.get("dependencies_by_reference", []):
g.add_edge(uid, duid)
try:
cycle = nx.find_cycle(g)

is_directed_acyclic_graph = nx.is_directed_acyclic_graph(g)
if not is_directed_acyclic_graph:
print(
f"Generated graph is not a DAG, looking for cycles to help debug (this may take 1 - 2 hours)"
)
try:
cycle = nx.find_cycle(g)
raise Exception(
f"found cyclic dependency task reference file {name} between: {cycle}"
)
except nx.exception.NetworkXNoCycle:
pass
raise Exception(
f"found cyclic dependency task reference file {name} between: {cycle}"
"Generated graph is not a DAG but could not find cycles to help debug."
)
except nx.exception.NetworkXNoCycle:
pass
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

setup_kwargs = {
'name': 'aws-service-catalog-puppet',
'version': '0.213.1',
'version': '0.214.0',
'description': 'Making it easier to deploy ServiceCatalog products',
'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',
'author': 'Eamonn Faherty',
Expand Down

0 comments on commit 6646280

Please sign in to comment.