Skip to content

IaC: Update CatalogPlugin class and common catalog plugins logic #13184

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

Jump to bottom
Merged
k-a-il merged 5 commits into from
Oct 6, 2025
Merged

IaC: Update CatalogPlugin class and common catalog plugins logic #13184

k-a-il merged 5 commits into from
Oct 6, 2025

Conversation

@k-a-il
Copy link
Contributor

@k-a-il k-a-il commented Sep 23, 2025 •
edited
Loading

Motivation

This is a companion branch, the changes in this PR are primarily needed for the pro catalog.

The logic to retrieve CloudFormation resources available at runtime has been moved to CatalogPlugin, renamed private methods for better readability, added new state CloudFormationResourcesSupportAtRuntime.NOT_IMPLEMENTED

Changes

  • Moved logic to obtain CloudFormation resources available at runtime to CatalogPlugin
  • Renamed method get_aws_services_at_runtime
  • Added new argument is_pro_resource to the get_cloudformation_resource_status, this logic is needed in pro catalog

@k-a-il k-a-il requested a review from a team September 23, 2025 09:11
@k-a-il k-a-il self-assigned this Sep 23, 2025
@k-a-il k-a-il added semver: patch Non-breaking changes which can be included in patch releases docs: skip Pull request does not require documentation changes labels Sep 23, 2025
@k-a-il k-a-il changed the title IaC: Move common CFN logic to parent class IaC: Move common CFN logic to base catalog class Sep 23, 2025
@k-a-il k-a-il changed the title IaC: Move common CFN logic to base catalog class IaC: Move common logic to base catalog class Sep 23, 2025
@github-actions
Copy link

github-actions bot commented Sep 23, 2025 •
edited
Loading

Test Results - Preflight, Unit

22 271 tests  +1   20 530 ✅ +1   15m 25s ⏱️ -4s
     1 suites ±0    1 741 💤 ±0 
     1 files   ±0        0 ❌ ±0 

Results for commit b1bbde2. ± Comparison against base commit 15fc427.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Sep 23, 2025 •
edited
Loading

Test Results (amd64) - Acceptance

7 tests  ±0   5 ✅ ±0   3m 16s ⏱️ -16s
1 suites ±0   2 💤 ±0 
1 files   ±0   0 ❌ ±0 

Results for commit b1bbde2. ± Comparison against base commit 15fc427.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Sep 23, 2025 •
edited
Loading

Test Results (amd64) - Integration, Bootstrap

    5 files  ±0      5 suites  ±0   2h 38m 36s ⏱️ - 1m 4s
5 155 tests ±0  4 659 ✅ ±0  496 💤 ±0  0 ❌ ±0 
5 161 runs  ±0  4 659 ✅ ±0  502 💤 ±0  0 ❌ ±0 

Results for commit b1bbde2. ± Comparison against base commit 15fc427.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Sep 23, 2025 •
edited
Loading

LocalStack Community integration with Pro

    2 files  ±0      2 suites  ±0   2h 3m 9s ⏱️ + 2m 8s
4 781 tests ±0  4 445 ✅ ±0  336 💤 ±0  0 ❌ ±0 
4 783 runs  ±0  4 445 ✅ ±0  338 💤 ±0  0 ❌ ±0 

Results for commit b1bbde2. ± Comparison against base commit 15fc427.

♻️ This comment has been updated with latest results.

@k-a-il k-a-il marked this pull request as ready for review September 23, 2025 12:59
@k-a-il k-a-il added the review: merge when ready Signals to the reviewer that a PR can be merged if accepted label Sep 23, 2025
@k-a-il k-a-il added this to the Playground milestone Sep 23, 2025
@k-a-il k-a-il requested a review from bentsku September 23, 2025 14:58
@k-a-il k-a-il changed the title IaC: Move common logic to base catalog class IaC: Updated CatalogPlugin methods and commo logic Sep 23, 2025
@k-a-il k-a-il changed the title IaC: Updated CatalogPlugin methods and commo logic IaC: Updated CatalogPlugin class and common catalog plugins logic Sep 23, 2025
@k-a-il k-a-il changed the title IaC: Updated CatalogPlugin class and common catalog plugins logic IaC: Update CatalogPlugin class and common catalog plugins logic Sep 23, 2025
@alexrashed alexrashed added the notes: skip Pull request does not have to be mentioned in the release notes label Sep 24, 2025
@bentsku bentsku force-pushed the iac/license-catalog branch from 88b7da3 to b1bbde2 Compare September 25, 2025 13:26
bentsku
bentsku approved these changes Sep 25, 2025
View reviewed changes
Copy link
Contributor

@bentsku bentsku left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I pushed a change to fix the CFN catalog as it was overriding the previous entries, and added typing

Very nice work, this looks really nice 🚀

localstack-core/localstack/utils/catalog/catalog.py Outdated

@staticmethod
def get_cfn_resources_catalog(cloudformation_resources: dict):
def _get_cfn_resources_catalog(cloudformation_resources: dict):
Copy link
Contributor

@bentsku bentsku Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: we're missing return types

@bentsku bentsku self-requested a review September 25, 2025 14:48
@k-a-il k-a-il merged commit 928f470 into main Oct 6, 2025
39 checks passed
@k-a-il k-a-il deleted the iac/license-catalog branch October 6, 2025 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bentsku bentsku bentsku approved these changes

Assignees

@k-a-il k-a-il

Labels

docs: skip Pull request does not require documentation changes notes: skip Pull request does not have to be mentioned in the release notes review: merge when ready Signals to the reviewer that a PR can be merged if accepted semver: patch Non-breaking changes which can be included in patch releases

Projects

None yet

Milestone

Playground

Development

Successfully merging this pull request may close these issues.

4 participants

@k-a-il @bentsku @alexrashed