Skip to content

Commit 418fe17

Browse files
mchekalovTvion
andauthored
fix: golangci lint editorconfig lints (#100)
* fix: editorconfig-checker lint * fix: golangci-lint check * fix: refactor corev1.Endpoints depricated * fix: new golangci-lint need ver 2 * fix: upd super-linter * fix: super-linter ver v8 * fix: upd and fix super-linter * fix: disable trivy check * fix: super-linter * fix: bash_exec sqlfluff * fix: tabs instead of spaces * fix: sqlfluff and bash lint * fix: lint editorconfig shfmt * Mnual resolution * fix: linter * fix: lint * fix: lint * fix: lint --------- Co-authored-by: Tvion <snakersu@gmail.com>
1 parent 7aa67bd commit 418fe17

101 files changed

Lines changed: 640 additions & 475 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,10 @@ profile = black
3333

3434
[*.sh]
3535
indent_size = 4
36+
indent_style = tab
37+
38+
[Makefile]
39+
indent_style = tab
40+
41+
[*entrypoint*]
42+
indent_style = tab

.github/linters/.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
version: "2"
12
run:
23
timeout: 10m

.github/super-linter.env

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ VALIDATE_JAVASCRIPT_STANDARD=false
88
VALIDATE_JSCPD=false
99
VALIDATE_JSON_PRETTIER=false
1010
VALIDATE_KUBERNETES_KUBECONFORM=false
11+
VALIDATE_MARKDOWN=false
1112
VALIDATE_MARKDOWN_PRETTIER=false
1213
VALIDATE_YAML=false
1314
VALIDATE_YAML_PRETTIER=false
@@ -19,4 +20,7 @@ VALIDATE_PYTHON_MYPY=false
1920
VALIDATE_PYTHON_PYINK=false
2021
VALIDATE_PYTHON_PYLINT=false
2122

23+
VALIDATE_DOCKERFILE_TRIVY=false
24+
VALIDATE_TRIVY=false
25+
2226
VALIDATE_GO=false

.github/workflows/build.yaml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ env:
2323

2424
jobs:
2525
multiplatform_build:
26+
permissions:
27+
contents: read
28+
packages: write
29+
actions: read
2630
strategy:
2731
fail-fast: false
2832
matrix:
@@ -39,35 +43,40 @@ jobs:
3943
runs-on: ubuntu-24.04
4044
steps:
4145
- name: Validate
46+
env:
47+
EVENT_NAME: ${{ github.event_name }}
48+
GITHUB_REF: ${{ github.ref }}
4249
run: |
43-
if [[ "${{ github.event_name }}" == "workflow_dispatch" && "${{ github.ref }}" == refs/tags* ]]; then
50+
if [[ "$EVENT_NAME" == "workflow_dispatch" && "$GITHUB_REF" == refs/tags/* ]]; then
4451
echo -e "\033[91mManual workflow run on tags is not allowed!\033[0m"
4552
exit 1
4653
fi
4754
- name: Checkout
48-
uses: actions/checkout@v4
55+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
56+
with:
57+
persist-credentials: false
4958
- name: Set up QEMU
50-
uses: docker/setup-qemu-action@v3
59+
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
5160
- name: Set up Docker Buildx
52-
uses: docker/setup-buildx-action@v3
61+
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
5362
- name: Login to Docker Hub
54-
uses: docker/login-action@v3
63+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
5564
with:
5665
registry: ghcr.io
5766
username: ${GITHUB_ACTOR}
5867
password: ${{secrets.GITHUB_TOKEN}}
5968
- name: Prepare Tag
6069
run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV
61-
- name: Get package IDs for delete
70+
- name: Get package IDs for delete
6271
id: get-ids-for-delete
63-
uses: Netcracker/get-package-ids@v0.0.1
72+
uses: Netcracker/get-package-ids@84bc8eb8bed50218be76e671b3a24c35a1300979
6473
with:
6574
component-name: ${{ matrix.component.name }}
6675
component-tag: ${{ env.TAG_NAME }}
67-
access-token: ${{secrets.GITHUB_TOKEN}}
76+
access-token: ${{secrets.GITHUB_TOKEN}}
6877
if: ${{ env.PUSH }}
6978
- name: Build and push
70-
uses: docker/build-push-action@v6
79+
uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
7180
with:
7281
no-cache: true
7382
context: ${{ matrix.component.context }}
@@ -76,8 +85,8 @@ jobs:
7685
push: ${{ env.PUSH }}
7786
tags: ghcr.io/netcracker/${{ matrix.component.name }}:${{ env.TAG_NAME }}
7887
provenance: false
79-
- uses: actions/delete-package-versions@v5
80-
with:
88+
- uses: actions/delete-package-versions@e5bc658cc4c965c472efe991f8beea3981499c55 # v5.0.0
89+
with:
8190
package-name: ${{ matrix.component.name }}
8291
package-type: 'container'
8392
package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }}

.github/workflows/clean.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ env:
88
jobs:
99
delete:
1010
if: github.event.ref_type == 'branch'
11+
permissions:
12+
packages: write
1113
runs-on: ubuntu-24.04
1214
strategy:
1315
fail-fast: false
@@ -23,20 +25,20 @@ jobs:
2325
- name: Prepare Tag
2426
run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV
2527
- name: Login to Docker Hub
26-
uses: docker/login-action@v3
28+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
2729
with:
2830
registry: ghcr.io
2931
username: ${GITHUB_ACTOR}
3032
password: ${{secrets.GITHUB_TOKEN}}
31-
- name: Get package IDs for delete
33+
- name: Get package IDs for delete
3234
id: get-ids-for-delete
33-
uses: Netcracker/get-package-ids@v0.0.1
35+
uses: Netcracker/get-package-ids@84bc8eb8bed50218be76e671b3a24c35a1300979
3436
with:
3537
component-name: ${{ matrix.component.name }}
3638
component-tag: ${{ env.TAG_NAME }}
3739
access-token: ${{secrets.GITHUB_TOKEN}}
38-
- uses: actions/delete-package-versions@v5
39-
with:
40+
- uses: actions/delete-package-versions@e5bc658cc4c965c472aba07bbc604b8e78b0e8e5 # v5.0.0
41+
with:
4042
package-name: ${{ matrix.component.name }}
4143
package-type: 'container'
4244
package-version-ids: ${{ steps.get-ids-for-delete.outputs.ids-for-delete }}

.github/workflows/license.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,24 @@ env:
88
COPYRIGHT_YEAR: '2024-2025'
99
jobs:
1010
license:
11+
permissions:
12+
contents: write
13+
pull-requests: write
1114
runs-on: ubuntu-24.04
1215
steps:
13-
- uses: actions/checkout@v4
14-
- run: docker run -v "${PWD}:/src" -i ghcr.io/google/addlicense -v -c "${{ env.COPYRIGHT_COMPANY }}" -y "${{ env.COPYRIGHT_YEAR }}" $(find . -type f -name "*.go" -o -type f -name "*.sh" -o -type f -name "*.py" | xargs echo)
16+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
17+
with:
18+
persist-credentials: false
19+
token: ${{ secrets.GITHUB_TOKEN }}
20+
- run: |
21+
find . -type f \( -name "*.go" -o -name "*.sh" -o -name "*.py" \) -print0 | \
22+
xargs -0 docker run -v "${PWD}:/src" -i ghcr.io/google/addlicense \
23+
-v -c "${{ env.COPYRIGHT_COMPANY }}" -y "${{ env.COPYRIGHT_YEAR }}"
1524
- name: Create Pull Request
16-
uses: peter-evans/create-pull-request@v7
25+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
1726
with:
1827
commit-message: Auto-update license header
1928
branch: license-update
2029
title: Add License Header
2130
body: Automated license header update
22-
delete-branch: true
31+
delete-branch: true

.github/workflows/super-linter.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
with:
3838
# Full git history is needed to get a proper list of changed files within `super-linter`
3939
fetch-depth: 0
40+
persist-credentials: false
4041

4142
- name: "Load super-linter environment file"
4243
run: |
@@ -47,7 +48,7 @@ jobs:
4748
fi
4849
4950
- name: Lint Code Base
50-
uses: super-linter/super-linter@v7
51+
uses: super-linter/super-linter@ffde3b2b33b745cb612d787f669ef9442b1339a6
5152
env:
5253
VALIDATE_ALL_CODEBASE: ${{ inputs.full_scan || false }}
5354
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ build/_output
33
extras/target/*
44
deployments
55
target/*
6-
charts/**/*.gz
6+
charts/**/*.gz

.sqlfluff

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[sqlfluff]
2+
# Specify the SQL dialect to use for linting
3+
dialect = postgres

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ vet:
5050

5151
compile:
5252
CGO_ENABLED=0 go build -o ./build/_output/bin/postgres-operator \
53-
-gcflags all=-trimpath=${GOPATH} -asmflags all=-trimpath=${GOPATH} ./cmd/pgskipper-operator
53+
-gcflags all=-trimpath=${GOPATH} -asmflags all=-trimpath=${GOPATH} ./cmd/pgskipper-operator
5454

5555
docker-build:
5656
$(foreach docker_tag,$(DOCKER_NAMES),docker build --file="${DOCKER_FILE}" --pull -t $(docker_tag) ./;)
@@ -67,18 +67,18 @@ clean:
6767
# Generate code
6868
generate: controller-gen
6969
$(CONTROLLER_GEN) crd:crdVersions={v1} \
70-
object:headerFile="generator/boilerplate.go.txt" \
71-
paths="./api/common/v1"
70+
object:headerFile="generator/boilerplate.go.txt" \
71+
paths="./api/common/v1"
7272

7373
$(CONTROLLER_GEN) crd:crdVersions={v1} \
74-
object:headerFile="generator/boilerplate.go.txt" \
75-
paths="./api/apps/v1" \
76-
output:crd:artifacts:config=charts/patroni-services/crds/
74+
object:headerFile="generator/boilerplate.go.txt" \
75+
paths="./api/apps/v1" \
76+
output:crd:artifacts:config=charts/patroni-services/crds/
7777

7878
$(CONTROLLER_GEN) crd:crdVersions={v1} \
79-
object:headerFile="generator/boilerplate.go.txt" \
80-
paths="./api/patroni/v1" \
81-
output:crd:artifacts:config=charts/patroni-core/crds/
79+
object:headerFile="generator/boilerplate.go.txt" \
80+
paths="./api/patroni/v1" \
81+
output:crd:artifacts:config=charts/patroni-core/crds/
8282
# Find or download controller-gen
8383
# download controller-gen if necessary
8484
controller-gen:

0 commit comments

Comments
 (0)