Skip to content

Commit 7e95008

Browse files
electrocucarachaelectrocucaracha
committedMar 11, 2022
Fix yaml lint issues
·
v1.4.41.2.0-dev2
1 parent a62dba1 commit 7e95008

25 files changed

+160
-81
lines changed
 

‎.github/workflows/release.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1+
---
2+
# Copyright 2022
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
name: release
217

18+
# yamllint disable-line rule:truthy
319
on:
420
release:
521
types: [published]
@@ -16,7 +32,7 @@ jobs:
1632
outputs:
1733
included: ${{ steps.release_info.outputs.included }}
1834
matrix_os: ${{ steps.release_info.outputs.matrix_os }}
19-
upload_url: ${{ steps.release_info.outputs.upload_url }}
35+
upload_url: ${{ steps.release_info.outputs.upload_url }}
2036

2137
steps:
2238
- uses: actions/checkout@v2

‎.github/workflows/spell.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
name: Run markdown-link-check tool to verify link issues
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@master
33-
- uses: gaurav-nelson/github-action-markdown-link-check@v1
32+
- uses: actions/checkout@master
33+
- uses: gaurav-nelson/github-action-markdown-link-check@v1
3434
check-spellcheck:
3535
name: Run PySpelling tool to verify spelling issues
3636
runs-on: ubuntu-latest

‎.github/workflows/verify.yml

+23-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
1+
---
2+
# Copyright 2022
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
name: Go
2-
#name: verify TODO rename (requires repo settings update)
17+
# name: verify TODO rename (requires repo settings update)
318

19+
# yamllint disable-line rule:truthy
420
on:
521
push:
6-
branches: [ master ]
22+
branches: [master]
723
pull_request:
8-
branches: [ master, issue-99-cosmos-upgrade-v0.44 ]
24+
branches: [master, issue-99-cosmos-upgrade-v0.44]
925
workflow_dispatch:
1026

1127
jobs:
@@ -87,19 +103,19 @@ jobs:
87103
steps:
88104

89105
- name: Set up Go 1.x
90-
if: false # TODO issue 99
106+
if: false # TODO issue 99
91107
uses: actions/setup-go@v2
92108
with:
93109
go-version: ^1.16
94110

95111
- name: Get google/addlicense
96-
if: false # TODO issue 99
112+
if: false # TODO issue 99
97113
run: go get -u github.com/google/addlicense
98114

99115
- name: Check out code into the Go module directory
100-
if: false # TODO issue 99
116+
if: false # TODO issue 99
101117
uses: actions/checkout@v2
102118

103119
- name: Check license
104-
if: false # TODO issue 99
120+
if: false # TODO issue 99
105121
run: make license-check

‎.golangci.yml

+52-37
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,53 @@
1+
---
2+
# Copyright 2022
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
linters:
2-
enable-all: true
3-
disable:
4-
- golint
5-
- unparam
6-
- gochecknoinits
7-
- gochecknoglobals
8-
- gomnd
9-
- nolintlint
10-
- dupl
11-
- varnamelen
12-
- tagliatelle
13-
- wrapcheck
14-
- thelper
15-
- testpackage
16-
- paralleltest
17-
- ireturn
18-
- nlreturn
19-
- goerr113
20-
- exhaustivestruct
21-
- wsl
22-
- forcetypeassert
23-
- exhaustive
24-
- scopelint
25-
- revive
26-
- lll
27-
- interfacer
28-
- gosec
29-
- funlen
30-
- stylecheck
31-
- cyclop
32-
- forbidigo
33-
- gocognit
34-
- godox
35-
- gomoddirectives
36-
- maligned
37-
- gci
38-
- whitespace
17+
enable-all: true
18+
disable:
19+
- golint
20+
- unparam
21+
- gochecknoinits
22+
- gochecknoglobals
23+
- gomnd
24+
- nolintlint
25+
- dupl
26+
- varnamelen
27+
- tagliatelle
28+
- wrapcheck
29+
- thelper
30+
- testpackage
31+
- paralleltest
32+
- ireturn
33+
- nlreturn
34+
- goerr113
35+
- exhaustivestruct
36+
- wsl
37+
- forcetypeassert
38+
- exhaustive
39+
- scopelint
40+
- revive
41+
- lll
42+
- interfacer
43+
- gosec
44+
- funlen
45+
- stylecheck
46+
- cyclop
47+
- forbidigo
48+
- gocognit
49+
- godox
50+
- gomoddirectives
51+
- maligned
52+
- gci
53+
- whitespace

‎.yaml-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
extends: default
1717

1818
ignore: |
19-
.tox/
19+
openapi.yml
2020
2121
rules:
2222
line-length: disable

‎bench/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ By that reason load test uses prepared load data which can be generated as follo
4141
* Generate test transactions:
4242

4343
```bash
44-
# DCLBENCH_WRITE_USERS_COUNT=<NUM-USERS> DCLBENCH_WRITE_USERS_Q_COUNT=<NUM-REQ-PER-USER> DCLBENCH_ADD_NEW_MODELS_COUNT=<NUM-NEW-MODELS> python bench/generate.py bench/test.spec.yaml bench/txns
45-
python bench/generate.py bench/test.spec.yaml bench/txns
44+
# DCLBENCH_WRITE_USERS_COUNT=<NUM-USERS> DCLBENCH_WRITE_USERS_Q_COUNT=<NUM-REQ-PER-USER> DCLBENCH_ADD_NEW_MODELS_COUNT=<NUM-NEW-MODELS> python bench/generate.py bench/test.spec.yaml.j2 bench/txns
45+
python bench/generate.py bench/test.spec.yaml.j2 bench/txns
4646
```
4747

4848
Here the following (**optional**) inputs are considered:

‎bench/prometheus.rules.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,5 +18,5 @@ groups:
1718
rules:
1819
- record: dcl_tendermint_mempool
1920
expr: '{__name__=~"^tendermint_mempool_(size|failed_txs)"}'
20-
# - record: dcl_tendermint_consensus
21-
# expr: '{__name__=~"^tendermint_consensus_(num_txs|total_txs)"}'
21+
# - record: dcl_tendermint_consensus
22+
# expr: '{__name__=~"^tendermint_consensus_(num_txs|total_txs)"}'

‎bench/prometheus.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +14,7 @@
1314
# limitations under the License.
1415

1516
global:
16-
scrape_interval: 1s # By default, scrape targets every 1 seconds.
17+
scrape_interval: 1s # By default, scrape targets every 1 seconds.
1718

1819
# Attach these labels to any time series or alerts when communicating with
1920
# external systems (federation, remote storage, Alertmanager).

‎bench/test.spec.yaml ‎bench/test.spec.yaml.j2

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +13,17 @@
1213
# See the License for the specific language governing permissions and
1314
# limitations under the License.
1415

15-
---
1616
templates:
1717
add-model: &add-model-tmpl
18-
vid: 1
19-
pid: 1
20-
deviceTypeID: 1
21-
productName: Device
22-
productLabel: decription
23-
partNumber: SKU12FS
24-
#hardware-version: 1.0
25-
#firmware-version: 2.0
26-
#tis-or-trp-testing-completed: "true"
18+
vid: 1
19+
pid: 1
20+
deviceTypeID: 1
21+
productName: Device
22+
productLabel: decription
23+
partNumber: SKU12FS
24+
# hardware-version: 1.0
25+
# firmware-version: 2.0
26+
# tis-or-trp-testing-completed: "true"
2727

2828
defaults:
2929
account-number-start: 4

‎config.yml

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
---
2+
# Copyright 2022
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
accounts:
217
- name: alice
318
coins: ["20000token", "200000000stake"]

‎dcl-ui/ansible/config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +15,7 @@
1415

1516
- hosts: clients
1617
user: ubuntu
17-
become: yes
18+
become: true
1819
tasks:
1920
- name: Remove default config
2021
file:

‎dcl-ui/ansible/content.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +15,7 @@
1415

1516
- hosts: clients
1617
user: ubuntu
17-
become: yes
18+
become: true
1819
tasks:
1920
- name: Remove existing content
2021
file:

‎dcl-ui/ansible/nginx.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,10 +15,10 @@
1415

1516
- hosts: clients
1617
user: ubuntu
17-
become: yes
18+
become: true
1819
tasks:
1920
- name: Install nginx
2021
apt:
2122
name: nginx
2223
state: present
23-
update_cache: yes
24+
update_cache: true

‎dcl-ui/ansible/reload.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +15,7 @@
1415

1516
- hosts: clients
1617
user: ubuntu
17-
become: yes
18+
become: true
1819
tasks:
1920
- name: Reload nginx
2021
service: "name=nginx state=reloaded enabled=yes"

‎deployment/ansible/nodes/binary.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,10 +15,10 @@
1415

1516
- hosts: nodes
1617
user: ubuntu
17-
become: yes
18+
become: true
1819
tasks:
1920
- name: Copy binary
2021
copy:
2122
src: "./../../build/dcld"
2223
dest: "/usr/bin/"
23-
mode: 0755
24+
mode: 0755

‎deployment/ansible/nodes/config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,4 +27,4 @@
2627
dest: "/home/ubuntu/.dcl/"
2728
owner: "ubuntu"
2829
group: "ubuntu"
29-
loop: [ 0, 1, 2, 3 ]
30+
loop: [0, 1, 2, 3]

‎deployment/ansible/nodes/firewall.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
# Copyright 2020 DSR Corporation
23
#
34
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +15,7 @@
1415

1516
- hosts: nodes
1617
user: ubuntu
17-
become: yes
18+
become: true
1819
tasks:
1920
- name: Open p2p port
2021
ufw:
@@ -25,4 +26,4 @@
2526
ufw:
2627
to_port: 26657
2728
proto: tcp
28-
rule: allow
29+
rule: allow

0 commit comments

Comments
 (0)
Please sign in to comment.