lint fixes

collections/ansible_collections/demo/cloud/roles/aws/defaults/main.yml

@@ -10,10 +10,10 @@ aws_region: us-east-1
 aws_vm_name: "{{ vm_name }}"
 aws_vm_owner: "{{ vm_owner }}"
 aws_blueprint: "{{ vm_blueprint }}"
-#aws_image_filter: "{{ omit }}"
-#aws_instance_size: "{{ omit }}"
-#aws_image_architecture: "{{ omit }}"
-#aws_image_owners: "{{ omit }} "
+# aws_image_filter: "{{ omit }}"
+# aws_instance_size: "{{ omit }}"
+# aws_image_architecture: "{{ omit }}"
+# aws_image_owners: "{{ omit }} "
 aws_userdata_template: default
 aws_keypair_name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-demo-key"
 aws_securitygroup_name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-sec-group"
@@ -21,4 +21,3 @@ aws_env_tag: prod
 aws_purpose_tag: ansible_demo
 aws_ansiblegroup_tag: cloud
 aws_ec2_wait: true
-

collections/ansible_collections/demo/cloud/roles/aws/tasks/create_infra.yml

@@ -17,19 +17,19 @@
     vpc_id: "{{ aws_vpc.vpc.id }}"
     region: "{{ aws_region }}"
     tags:
-      Name: "{{ aws_vpc_name }}-{{aws_vpc_prefix }}-vpc-igw"
+      Name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-vpc-igw"
       owner: "{{ aws_vpc_name }}"
       purpose: "{{ aws_purpose_tag }}"
   register: aws_gateway
 
 - name: Create security group internal
-  amazon.aws.ec2_group: 
+  amazon.aws.ec2_security_group:
     state: present
-    name: "{{ aws_vpc_name }}-{{aws_vpc_prefix }}-sec-group"
+    name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-sec-group"
     region: "{{ aws_region }}"
-    description: Inbound WinRM and RDP, http for demo servers and internal AD ports 
+    description: Inbound WinRM and RDP, http for demo servers and internal AD ports
     rules:
-      - proto: tcp 
+      - proto: tcp
         ports:
           - 80 # HTTP
           - 443 # HTTPS
@@ -42,7 +42,7 @@
         from_port: -1
         cidr_ip: 0.0.0.0/0
       - proto: tcp
-        ports: 
+        ports:
           - 80 # HTTP
           - 5986 # WinRM
           - 3389 # RDP
@@ -55,27 +55,27 @@
           - 464 # Kerberos Authentication
           - 5432 # PostgreSQL
           - 636 # LDAPS (LDAP over TLS)
-          - 873 # Rsync 
-          - 3268-3269 # Global Catalog 
+          - 873 # Rsync
+          - 3268-3269 # Global Catalog
           - 1024-65535 # Ephemeral RPC ports
         cidr_ip: 10.0.0.0/16
-      - proto: udp 
-        ports: 
+      - proto: udp
+        ports:
           - 53 # DNS
           - 88 # Kerberos Authentication
           - 123 # NTP
-          - 137-138 # Netlogon 
-          - 389 # LDAP 
+          - 137-138 # Netlogon
+          - 389 # LDAP
           - 445 # SMB
           - 464 # Kerberos Authentication
           - 1024-65535 # Ephemeral RPC ports
         cidr_ip: 10.0.0.0/16
     rules_egress:
-      - proto: -1 
+      - proto: -1
         cidr_ip: 0.0.0.0/0
     vpc_id: "{{ aws_vpc.vpc.id }}"
     tags:
-      Name: "{{ aws_vpc_name }}-{{aws_vpc_prefix }}-sec-group"
+      Name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-sec-group"
       owner: "{{ aws_vpc_name }}"
       purpose: "{{ aws_purpose_tag }}"
 
@@ -85,31 +85,31 @@
     vpc_id: "{{ aws_vpc.vpc.id }}"
     cidr: "{{ aws_subnet_cidr }}"
     region: "{{ aws_region }}"
-    map_public: yes
+    map_public: true
     tags:
-      Name: "{{ aws_vpc_name }}-{{aws_vpc_prefix }}-subnet"
+      Name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-subnet"
       owner: "{{ aws_vpc_name }}"
       purpose: "{{ aws_purpose_tag }}"
   register: aws_subnet
 
-- name: Create a subnet route table 
+- name: Create a subnet route table
   amazon.aws.ec2_vpc_route_table:
-    state: present 
+    state: present
     vpc_id: "{{ aws_vpc.vpc.id }}"
     region: "{{ aws_region }}"
     subnets:
       - "{{ aws_subnet.subnet.id }}"
     routes:
-      - dest: 0.0.0.0/0 
+      - dest: 0.0.0.0/0
         gateway_id: "{{ aws_gateway.gateway_id }}"
-    tags: 
-      Name: "{{ aws_vpc_name }}-{{aws_vpc_prefix }}-vpc-rtbl"
+    tags:
+      Name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-vpc-rtbl"
       owner: "{{ aws_vpc_name }}"
       purpose: "{{ aws_purpose_tag }}"
 
 - name: Create AWS keypair
   amazon.aws.ec2_key:
-    name: "{{ aws_vpc_name }}-{{aws_vpc_prefix }}-demo-key"
+    name: "{{ aws_vpc_name }}-{{ aws_vpc_prefix }}-demo-key"
     region: "{{ aws_region }}"
     key_material: "{{ aws_public_key }}"
     state: present

collections/ansible_collections/demo/cloud/roles/aws/tasks/create_vm.yml

@@ -7,27 +7,27 @@
   register: aws_subnet
 
 - name: AWS | CREATE VM | save subnet id
-  set_fact:
-    aws_subnet_id: "{{ aws_subnet.subnets|map(attribute='id')| list | last }}"
+  ansible.builtin.set_fact:
+    aws_subnet_id: "{{ aws_subnet.subnets | map(attribute='id') | list | last }}"
 
 - name: AWS| CREATE VM | find ami
   amazon.aws.ec2_ami_info:
     region: "{{ aws_region }}"
-    owners: "{{ aws_image_owners | default(omit)}}"
+    owners: "{{ aws_image_owners | default(omit) }}"
     filters:
       name: "{{ aws_image_filter }}"
       architecture: "{{ aws_image_architecture | default(omit) }}"
   register: amis
 
 - name: AWS| CREATE VM | save ami
-  set_fact:
+  ansible.builtin.set_fact:
     aws_instance_ami: >
       {{ (amis.images | selectattr('name', 'defined') | sort(attribute='creation_date'))[-2] }}
 
 - name: AWS| CREATE VM | create instance
   amazon.aws.ec2_instance:
     network:
-      assign_public_ip: yes
+      assign_public_ip: true
     key_name: "{{ aws_keypair_name }}"
     instance_type: "{{ aws_instance_size }}"
     image_id: "{{ aws_instance_ami.image_id }}"
@@ -43,5 +43,5 @@
       Name: "{{ aws_vm_name }}"
     wait: "{{ aws_ec2_wait }}"
     vpc_subnet_id: "{{ aws_subnet_id }}"
-    user_data: "{{ lookup('template', aws_userdata_template+'.j2', template_vars=dict(aws_vm_name=vm_name)) }}"
+    user_data: "{{ lookup('template', aws_userdata_template + '.j2', template_vars=dict(aws_vm_name=vm_name)) }}"
   register: aws_vm_output

collections/ansible_collections/demo/cloud/roles/aws/tasks/destroy_vm.yml

@@ -4,4 +4,4 @@
     state: absent
     instance_ids: "{{ instance_id }}"
     region: "{{ placement.region }}"
-  delegate_to: localhost
+  delegate_to: localhost