mirror of
https://github.com/trailofbits/algo.git
synced 2025-09-09 21:44:13 +02:00
* Fix AWS Lightsail deployment error by removing deprecated boto3 parameter Remove the deprecated boto3 parameter from get_aws_connection_info() call in the lightsail_region_facts module. This parameter has been non-functional since amazon.aws collection 4.0.0 and was removed in recent versions bundled with Ansible 11.x, causing deployment failures. The function works correctly without this parameter as the module already properly imports and validates boto3 availability. Closes #14822 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Update uv.lock to fix Docker build failure The lockfile was out of sync after the Ansible 11.8.0 to 11.9.0 upgrade. This regenerates the lockfile to include: - ansible 11.9.0 (was 11.8.0) - ansible-core 2.18.8 (was 2.18.7) This fixes the Docker build CI failure where uv sync --locked was failing due to lockfile mismatch. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix Jinja spacing linter issues correctly - Add spacing in lookup('env', 'VAR') calls - Fix spacing around pipe operators within Jinja expressions only - Preserve YAML block scalar syntax (prompt: |) - Fix array indexing spacing within Jinja expressions - All changes pass yamllint and ansible-lint tests 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Add algo.egg-info to .gitignore * Add unit test for AWS Lightsail boto3 parameter fix - Tests that get_aws_connection_info() is called without boto3 parameter - Verifies the module can be imported successfully - Checks source code doesn't contain boto3=True - Regression test specifically for issue #14822 - All 4 test cases pass This ensures the fix remains in place and prevents regression. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix Python linting issues in test file - Sort imports according to ruff standards - Remove trailing whitespace from blank lines - Remove unnecessary 'r' mode argument from open() - Add trailing newline at end of file All tests still pass after linting fixes. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
103 lines
2.7 KiB
Python
103 lines
2.7 KiB
Python
#!/usr/bin/python
|
|
# Copyright: Ansible Project
|
|
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
|
|
|
|
|
|
|
|
ANSIBLE_METADATA = {'metadata_version': '1.1',
|
|
'status': ['preview'],
|
|
'supported_by': 'community'}
|
|
|
|
DOCUMENTATION = '''
|
|
---
|
|
module: lightsail_region_facts
|
|
short_description: Gather facts about AWS Lightsail regions.
|
|
description:
|
|
- Gather facts about AWS Lightsail regions.
|
|
version_added: "2.5.3"
|
|
author: "Jack Ivanov (@jackivanov)"
|
|
options:
|
|
requirements:
|
|
- "python >= 2.6"
|
|
- boto3
|
|
|
|
extends_documentation_fragment:
|
|
- aws
|
|
- ec2
|
|
'''
|
|
|
|
|
|
EXAMPLES = '''
|
|
# Gather facts about all regions
|
|
- lightsail_region_facts:
|
|
'''
|
|
|
|
RETURN = '''
|
|
regions:
|
|
returned: on success
|
|
description: >
|
|
Each element consists of a dict with all the information related
|
|
to that region.
|
|
type: list
|
|
sample: "[{
|
|
"availabilityZones": [],
|
|
"continentCode": "NA",
|
|
"description": "This region is recommended to serve users in the eastern United States",
|
|
"displayName": "Virginia",
|
|
"name": "us-east-1"
|
|
}]"
|
|
'''
|
|
|
|
import traceback
|
|
|
|
try:
|
|
import botocore
|
|
HAS_BOTOCORE = True
|
|
except ImportError:
|
|
HAS_BOTOCORE = False
|
|
|
|
try:
|
|
import boto3
|
|
except ImportError:
|
|
# will be caught by imported HAS_BOTO3
|
|
pass
|
|
|
|
from ansible.module_utils.basic import AnsibleModule
|
|
from ansible.module_utils.ec2 import (
|
|
HAS_BOTO3,
|
|
boto3_conn,
|
|
ec2_argument_spec,
|
|
get_aws_connection_info,
|
|
)
|
|
|
|
|
|
def main():
|
|
argument_spec = ec2_argument_spec()
|
|
module = AnsibleModule(argument_spec=argument_spec)
|
|
|
|
if not HAS_BOTO3:
|
|
module.fail_json(msg='Python module "boto3" is missing, please install it')
|
|
|
|
if not HAS_BOTOCORE:
|
|
module.fail_json(msg='Python module "botocore" is missing, please install it')
|
|
|
|
try:
|
|
region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module)
|
|
|
|
client = None
|
|
try:
|
|
client = boto3_conn(module, conn_type='client', resource='lightsail',
|
|
region=region, endpoint=ec2_url, **aws_connect_kwargs)
|
|
except (botocore.exceptions.ClientError, botocore.exceptions.ValidationError) as e:
|
|
module.fail_json(msg='Failed while connecting to the lightsail service: %s' % e, exception=traceback.format_exc())
|
|
|
|
response = client.get_regions(
|
|
includeAvailabilityZones=False
|
|
)
|
|
module.exit_json(changed=False, data=response)
|
|
except (botocore.exceptions.ClientError, Exception) as e:
|
|
module.fail_json(msg=str(e), exception=traceback.format_exc())
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|