-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added resource_update constraint allowing tag_update_on_provisioned_p…
…roduct (issue #527) * Added resource_update constraint allowing tag_update_on_provisioned_product
- Loading branch information
1 parent
3db2550
commit 916ace7
Showing
10 changed files
with
216 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
servicecatalog_puppet/templates/update_resource_constraints.template.yaml.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| AWSTemplateFormatVersion: '2010-09-09' | ||
| Description: update resource constraints for {{portfolio.DisplayName}} | ||
|
|
||
| Conditions: | ||
| NoOpCondition: !Equals [ true, false] | ||
|
|
||
| Resources: | ||
| NoOpResource: | ||
| Type: AWS::S3::Bucket | ||
| Description: Resource to ensure that template contains a resource even when there are no shares | ||
| Condition: NoOpCondition | ||
|
|
||
| {% for update_resource_constraint in update_resource_constraints %}{% for product in update_resource_constraint.products %} | ||
| #{{ product }} | ||
| L{{ portfolio_id|replace("-", "") }}B{{ product_name_to_id_dict.get(product)|replace("-", "") }}C: | ||
| Type: AWS::ServiceCatalog::ResourceUpdateConstraint | ||
| Properties: | ||
| PortfolioId: {{ portfolio_id }} | ||
| ProductId: {{ product_name_to_id_dict.get(product) }} | ||
| Description: "TagUpdate = {{update_resource_constraint.get("tag_update_on_provisioned_product")}}" | ||
| TagUpdateOnProvisionedProduct: {{update_resource_constraint.get("tag_update_on_provisioned_product")}}{% endfor %}{% endfor %} | ||
|
|
||
|
|
154 changes: 154 additions & 0 deletions
154
...nstraints_management/create_resource_update_constraints_for_spoke_local_portfolio_task.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| # Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import re | ||
|
|
||
| import luigi | ||
|
|
||
| from servicecatalog_puppet import config | ||
| from servicecatalog_puppet import utils | ||
| from servicecatalog_puppet.workflow.general import delete_cloud_formation_stack_task | ||
| from servicecatalog_puppet.workflow.portfolio.portfolio_management import ( | ||
| copy_into_spoke_local_portfolio_task, | ||
| ) | ||
| from servicecatalog_puppet.workflow.portfolio.portfolio_management import ( | ||
| import_into_spoke_local_portfolio_task, | ||
| ) | ||
| from servicecatalog_puppet.workflow.portfolio.portfolio_management import ( | ||
| portfolio_management_task, | ||
| ) | ||
|
|
||
|
|
||
| class CreateUpdateResourceConstraintsForSpokeLocalPortfolioTask( | ||
| portfolio_management_task.PortfolioManagementTask | ||
| ): | ||
| spoke_local_portfolio_name = luigi.Parameter() | ||
| account_id = luigi.Parameter() | ||
| region = luigi.Parameter() | ||
| portfolio = luigi.Parameter() | ||
| puppet_account_id = luigi.Parameter() | ||
| organization = luigi.Parameter() | ||
| product_generation_method = luigi.Parameter() | ||
| update_resource_constraints = luigi.DictParameter() | ||
|
|
||
| sharing_mode = luigi.Parameter() | ||
|
|
||
| def params_for_results_display(self): | ||
| return { | ||
| "puppet_account_id": self.puppet_account_id, | ||
| "spoke_local_portfolio_name": self.spoke_local_portfolio_name, | ||
| "portfolio": self.portfolio, | ||
| "region": self.region, | ||
| "account_id": self.account_id, | ||
| "cache_invalidator": self.cache_invalidator, | ||
| } | ||
|
|
||
| def requires(self): | ||
| create_spoke_local_portfolio_task_klass = ( | ||
| import_into_spoke_local_portfolio_task.ImportIntoSpokeLocalPortfolioTask | ||
| if self.product_generation_method == "import" | ||
| else copy_into_spoke_local_portfolio_task.CopyIntoSpokeLocalPortfolioTask | ||
| ) | ||
|
|
||
| return dict( | ||
| create_spoke_local_portfolio_task=create_spoke_local_portfolio_task_klass( | ||
| spoke_local_portfolio_name=self.spoke_local_portfolio_name, | ||
| manifest_file_path=self.manifest_file_path, | ||
| account_id=self.account_id, | ||
| region=self.region, | ||
| portfolio=self.portfolio, | ||
| organization=self.organization, | ||
| puppet_account_id=self.puppet_account_id, | ||
| sharing_mode=self.sharing_mode, | ||
| ), | ||
| ) | ||
|
|
||
| def api_calls_used(self): | ||
| return [ | ||
| f"cloudformation.ensure_deleted_{self.account_id}_{self.region}", | ||
| f"cloudformation.describe_stacks_{self.account_id}_{self.region}", | ||
| f"cloudformation.create_or_update_{self.account_id}_{self.region}", | ||
| f"service_catalog.search_products_as_admin_{self.account_id}_{self.region}", | ||
| ] | ||
|
|
||
| def run(self): | ||
| dependency_output = self.load_from_input("create_spoke_local_portfolio_task") | ||
| spoke_portfolio = dependency_output.get("portfolio") | ||
| portfolio_id = spoke_portfolio.get("Id") | ||
|
|
||
| product_name_to_id_dict = dependency_output.get("products") | ||
| with self.spoke_regional_client("cloudformation") as cloudformation: | ||
| new_constraints = self.generate_new_constraints( | ||
| portfolio_id, product_name_to_id_dict | ||
| ) | ||
|
|
||
| template = config.env.get_template( | ||
| "update_resource_constraints.template.yaml.j2" | ||
| ).render( | ||
| portfolio={"DisplayName": self.portfolio,}, | ||
| portfolio_id=portfolio_id, | ||
| update_resource_constraints=new_constraints, | ||
| product_name_to_id_dict=product_name_to_id_dict, | ||
| ) | ||
| stack_name = f"update-resource-constraints-for-{utils.slugify_for_cloudformation_stack_name(self.spoke_local_portfolio_name)}" | ||
| cloudformation.create_or_update( | ||
| StackName=stack_name, | ||
| TemplateBody=template, | ||
| NotificationARNs=[ | ||
| f"arn:{config.get_partition()}:sns:{self.region}:{self.puppet_account_id}:servicecatalog-puppet-cloudformation-regional-events" | ||
| ] | ||
| if self.should_use_sns | ||
| else [], | ||
| ShouldDeleteRollbackComplete=self.should_delete_rollback_complete_stacks, | ||
| Tags=self.initialiser_stack_tags, | ||
| ) | ||
| result = cloudformation.describe_stacks(StackName=stack_name,).get( | ||
| "Stacks" | ||
| )[0] | ||
| self.write_output(result) | ||
|
|
||
| def generate_new_constraints(self, portfolio_id, product_name_to_id_dict): | ||
| new_constraints = [] | ||
| for constraint in self.update_resource_constraints: | ||
| new_constraint = { | ||
| "products": [], | ||
| "tag_update_on_provisioned_product": constraint.get( | ||
| "tag_update_on_provisioned_product" | ||
| ), | ||
| } | ||
| if constraint.get("products", None) is not None: | ||
| if isinstance(constraint.get("products"), tuple): | ||
| new_constraint["products"] += constraint.get("products") | ||
| elif isinstance(constraint.get("products"), str): | ||
| with self.spoke_regional_client( | ||
| "servicecatalog" | ||
| ) as service_catalog: | ||
| response = service_catalog.search_products_as_admin_single_page( | ||
| PortfolioId=portfolio_id | ||
| ) | ||
| for product_view_details in response.get( | ||
| "ProductViewDetails", [] | ||
| ): | ||
| product_view_summary = product_view_details.get( | ||
| "ProductViewSummary" | ||
| ) | ||
| product_name_to_id_dict[ | ||
| product_view_summary.get("Name") | ||
| ] = product_view_summary.get("ProductId") | ||
| if re.match( | ||
| constraint.get("products"), | ||
| product_view_summary.get("Name"), | ||
| ): | ||
| new_constraint["products"].append( | ||
| product_view_summary.get("Name") | ||
| ) | ||
| else: | ||
| raise Exception( | ||
| f'Unexpected launch constraint type {type(constraint.get("products"))}' | ||
| ) | ||
|
|
||
| if constraint.get("product", None) is not None: | ||
| new_constraint["products"].append(constraint.get("product")) | ||
|
|
||
| new_constraints.append(new_constraint) | ||
| return new_constraints |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters