Fix pull_request syntax in ansible lint GH Action (#995)

* Fix pull_request syntax in ansible lint GH Action

* Only lint Digital Ocean playbook for now

* fix: pass ansible lint

---------

Co-authored-by: Anish Lakhwara <anish+git@lakhwara.com>
This commit is contained in:
Tessa Walsh 2023-07-20 06:13:52 -04:00 committed by GitHub
parent 85913112a2
commit 577416024b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions

View File

@ -1,11 +1,11 @@
name: ansible-lint name: ansible-lint
on: on:
push: push:
branches: paths:
- ansible-* - 'ansible/**'
pull-request: pull_request:
branches: paths:
- main - 'ansible/**'
jobs: jobs:
build: build:
@ -32,4 +32,4 @@ jobs:
- name: Lint - name: Lint
run: | run: |
cd ansible cd ansible
pipenv run ansible-lint -c ./lint-cfg.yml ./playbooks/ pipenv run ansible-lint -c ./lint-cfg.yml ./playbooks/do_setup.yml

View File

@ -54,6 +54,7 @@ skip_list:
- skip_this_tag - skip_this_tag
- name[casing] - name[casing]
- yaml[line-length] - yaml[line-length]
- fqcn[canonical] # we're using community.aws.aws_s3_cors instead of community.aws.s3_cors, but using the other package made everything break
# Ansible-lint does not automatically load rules that have the 'opt-in' tag. # Ansible-lint does not automatically load rules that have the 'opt-in' tag.
# You must enable opt-in rules by listing each rule 'id' below. # You must enable opt-in rules by listing each rule 'id' below.

View File

@ -42,27 +42,26 @@
- name: d_ocean | db | set db id - name: d_ocean | db | set db id
ansible.builtin.set_fact: ansible.builtin.set_fact:
db_uuid: "{{ db_create.stdout if db_create.changed == true else db_check.stdout | from_json | json_query(name_query) | json_query('[0].id')}}" db_uuid: "{{ db_create.stdout if db_create.changed else db_check.stdout | from_json | json_query(name_query) | json_query('[0].id') }}"
vars: vars:
name_query: '[?name==`{{ db_name }}`]' name_query: '[?name==`{{ db_name }}`]'
- name: d_ocean | db | reset db user password - name: d_ocean | db | reset db user password
ansible.builtin.command: doctl databases user reset {{ db_uuid }} doadmin -o json ansible.builtin.command: doctl databases user reset {{ db_uuid }} doadmin -o json
register: db_user register: db_user
when: db_create.changed == false when: not db_create.changed
changed_when: true
- name: d_ocean | db | set db config - name: d_ocean | db | set db config
ansible.builtin.set_fact: ansible.builtin.set_fact:
db_uuid: "{{ db_create.stdout if db_create.changed == true else db_check.stdout | from_json | json_query(name_query) | json_query('[0].id') }}" db_uuid: "{{ db_create.stdout if db_create.changed else db_check.stdout | from_json | json_query(name_query) | json_query('[0].id') }}"
vars: vars:
name_query: '[?name==`{{ db_name }}`]' name_query: '[?name==`{{ db_name }}`]'
- name: d_ocean | db | set db config - name: d_ocean | db | set db config
ansible.builtin.set_fact: ansible.builtin.set_fact:
db_url: "{{ db_check.stdout | from_json | json_query(name_query) | json_query('[0].private_connection.uri') | replace(old, new)}}" db_url: "{{ db_check.stdout | from_json | json_query(name_query) | json_query('[0].private_connection.uri') | replace(old, new) }}"
when: db_create.changed == false when: not db_create.changed
vars: vars:
name_query: '[?name==`{{ db_name }}`]' name_query: '[?name==`{{ db_name }}`]'
old: ":@" old: ":@"
@ -87,7 +86,6 @@
bucket_endpoint_url: "{{ db_space_result.data.space.endpoint_url }}/{{ db_space_result.data.space.name }}/{{ bucket_path }}/" bucket_endpoint_url: "{{ db_space_result.data.space.endpoint_url }}/{{ db_space_result.data.space.name }}/{{ bucket_path }}/"
- name: d_ocean | space | set bucket cors - name: d_ocean | space | set bucket cors
# skip_ansible_lint
community.aws.aws_s3_cors: community.aws.aws_s3_cors:
name: "{{ bucket_name }}" name: "{{ bucket_name }}"
aws_access_key: "{{ lookup('env', 'DO_AWS_ACCESS_KEY') }}" aws_access_key: "{{ lookup('env', 'DO_AWS_ACCESS_KEY') }}"
@ -277,6 +275,7 @@
../../chart/admin/logging/scripts/eck_install.sh ../../chart/admin/logging/scripts/eck_install.sh
register: addons_init register: addons_init
when: enable_admin_addons when: enable_admin_addons
changed_when: true
# Helm Output + Deploy # Helm Output + Deploy
# =========================================== # ===========================================