From e0c2b6bbb4815e2c139016e7012041022a6cc74a Mon Sep 17 00:00:00 2001 From: Ryan Brown Date: Thu, 12 Oct 2017 23:52:10 -0400 Subject: [PATCH] Rename ssm_parameter_store module and ssm lookup to be prefixed with aws (#31662) --- CHANGELOG.md | 5 ++++ ...er_store.py => aws_ssm_parameter_store.py} | 27 +++++------------ .../plugins/lookup/{ssm.py => aws_ssm.py} | 29 +++++-------------- 3 files changed, 21 insertions(+), 40 deletions(-) rename lib/ansible/modules/cloud/amazon/{ssm_parameter_store.py => aws_ssm_parameter_store.py} (88%) rename lib/ansible/plugins/lookup/{ssm.py => aws_ssm.py} (68%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 723b91fba6..f540dd4fc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,9 +27,14 @@ Ansible Changes By Release `ansible_diff_mode`, `ansible_inventory_sources`, `ansible_limit`, `ansible_run_tags` , `ansible_forks` and `ansible_skip_tags` * Updated the bundled copy of the six library to 1.11.0 * Added support to `become` `NT AUTHORITY\System`, `NT AUTHORITY\LocalService`, and `NT AUTHORITY\NetworkService` on Windows hosts +* Added `aws_ssm` lookup plugin ### New Modules +#### Cloud + + * aws_ssm_parameter_store + #### Windows * win_scheduled_task_stat diff --git a/lib/ansible/modules/cloud/amazon/ssm_parameter_store.py b/lib/ansible/modules/cloud/amazon/aws_ssm_parameter_store.py similarity index 88% rename from lib/ansible/modules/cloud/amazon/ssm_parameter_store.py rename to lib/ansible/modules/cloud/amazon/aws_ssm_parameter_store.py index 2419731866..50adaea56b 100644 --- a/lib/ansible/modules/cloud/amazon/ssm_parameter_store.py +++ b/lib/ansible/modules/cloud/amazon/aws_ssm_parameter_store.py @@ -1,25 +1,14 @@ #!/usr/bin/python -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . +# Copyright: (c) 2017, Ansible Project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) + ANSIBLE_METADATA = {'status': ['preview'], 'supported_by': 'community', 'metadata_version': '1.1'} DOCUMENTATION = ''' --- -module: ssm_parameter_store +module: aws_ssm_parameter_store short_description: Manage key-value pairs in aws parameter store. description: - Manage key-value pairs in aws parameter store. @@ -78,25 +67,25 @@ requirements: [ botocore, boto3 ] EXAMPLES = ''' - name: Create or update key/value pair in aws parameter store - ssm_parameter_store: + aws_ssm_parameter_store: name: "Hello" description: "This is your first key" value: "World" - name: Delete the key - ssm_parameter_store: + aws_ssm_parameter_store: name: "Hello" state: absent - name: Create or update secure key/value pair with default kms key (aws/ssm) - ssm_parameter_store: + aws_ssm_parameter_store: name: "Hello" description: "This is your first key" string_type: "SecureString" value: "World" - name: Create or update secure key/value pair with nominated kms key - ssm_parameter_store: + aws_ssm_parameter_store: name: "Hello" description: "This is your first key" string_type: "SecureString" diff --git a/lib/ansible/plugins/lookup/ssm.py b/lib/ansible/plugins/lookup/aws_ssm.py similarity index 68% rename from lib/ansible/plugins/lookup/ssm.py rename to lib/ansible/plugins/lookup/aws_ssm.py index 5fa4ebd3c9..c28b7704af 100644 --- a/lib/ansible/plugins/lookup/ssm.py +++ b/lib/ansible/plugins/lookup/aws_ssm.py @@ -1,19 +1,6 @@ # (c) 2016, Bill Wang -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . +# (c) 2017 Ansible Project +# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import (absolute_import, division, print_function) __metaclass__ = type @@ -34,22 +21,22 @@ class LookupModule(LookupBase): ''' # lookup sample: - name: lookup ssm parameter store in the current region - debug: msg="{{ lookup('ssm', 'Hello' ) }}" + debug: msg="{{ lookup('aws_ssm', 'Hello' ) }}" - name: lookup a key which doesn't exist, return "" - debug: msg="{{ lookup('ssm', 'NoKey') }}" + debug: msg="{{ lookup('aws_ssm', 'NoKey') }}" - name: lookup ssm parameter store in nominated region - debug: msg="{{ lookup('ssm', 'Hello', 'region=us-east-2' ) }}" + debug: msg="{{ lookup('aws_ssm', 'Hello', 'region=us-east-2' ) }}" - name: lookup ssm parameter store without decrypted - debug: msg="{{ lookup('ssm', 'Hello', 'decrypt=False' ) }}" + debug: msg="{{ lookup('aws_ssm', 'Hello', 'decrypt=False' ) }}" - name: lookup ssm parameter store in nominated aws profile - debug: msg="{{ lookup('ssm', 'Hello', 'aws_profile=myprofile' ) }}" + debug: msg="{{ lookup('aws_ssm', 'Hello', 'aws_profile=myprofile' ) }}" - name: lookup ssm parameter store with all options. - debug: msg="{{ lookup('ssm', 'Hello', 'decrypt=false', 'region=us-east-2', 'aws_profile=myprofile') }}" + debug: msg="{{ lookup('aws_ssm', 'Hello', 'decrypt=false', 'region=us-east-2', 'aws_profile=myprofile') }}" ''' ret = {}