Skip to content

Commit e56b868

Browse files
dborovcanindborovcanin
authored
NOISSUE - Rename YAML files extension (#2782)
Signed-off-by: Dusan Borovcanin <borovcanindusan1@gmail.com>
1 parent 878860d commit e56b868

Some content is hidden

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

48 files changed

+244
-244
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml‎ renamed to ‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

File renamed without changes.

‎.github/ISSUE_TEMPLATE/config.yml‎ renamed to ‎.github/ISSUE_TEMPLATE/config.yaml‎

File renamed without changes.

‎.github/ISSUE_TEMPLATE/feature_request.yml‎ renamed to ‎.github/ISSUE_TEMPLATE/feature_request.yaml‎

File renamed without changes.

‎.github/dependabot.yml‎ renamed to ‎.github/dependabot.yaml‎

File renamed without changes.

‎.github/workflows/api-tests.yml‎ renamed to ‎.github/workflows/api-tests.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- main
1010
paths:
11-
- ".github/workflows/api-tests.yml"
11+
- ".github/workflows/api-tests.yaml"
1212
- "api/**"
1313
- "auth/api/http/**"
1414
- "certs/api/**"
@@ -69,55 +69,55 @@ jobs:
6969
with:
7070
filters: |
7171
journal:
72-
- ".github/workflows/api-tests.yml"
73-
- "apidocs/openapi/journal.yml"
72+
- ".github/workflows/api-tests.yaml"
73+
- "apidocs/openapi/journal.yaml"
7474
- "journal/api/**"
7575
7676
auth:
77-
- ".github/workflows/api-tests.yml"
78-
- "apidocs/openapi/auth.yml"
77+
- ".github/workflows/api-tests.yaml"
78+
- "apidocs/openapi/auth.yaml"
7979
- "auth/api/http/**"
8080
8181
certs:
82-
- ".github/workflows/api-tests.yml"
83-
- "apidocs/openapi/certs.yml"
82+
- ".github/workflows/api-tests.yaml"
83+
- "apidocs/openapi/certs.yaml"
8484
- "certs/api/**"
8585
8686
domains:
87-
- ".github/workflows/api-tests.yml"
88-
- "apidocs/openapi/domains.yml"
87+
- ".github/workflows/api-tests.yaml"
88+
- "apidocs/openapi/domains.yaml"
8989
- "domains/api/http/**"
9090
9191
http:
92-
- ".github/workflows/api-tests.yml"
93-
- "apidocs/openapi/http.yml"
92+
- ".github/workflows/api-tests.yaml"
93+
- "apidocs/openapi/http.yaml"
9494
- "http/api/**"
9595
9696
clients:
97-
- ".github/workflows/api-tests.yml"
98-
- "apidocs/openapi/clients.yml"
97+
- ".github/workflows/api-tests.yaml"
98+
- "apidocs/openapi/clients.yaml"
9999
- "clients/api/http/**"
100100
101101
channels:
102-
- ".github/workflows/api-tests.yml"
103-
- "apidocs/openapi/channels.yml"
102+
- ".github/workflows/api-tests.yaml"
103+
- "apidocs/openapi/channels.yaml"
104104
- "channels/api/http/**"
105105
106106
groups:
107-
- ".github/workflows/api-tests.yml"
108-
- "apidocs/openapi/groups.yml"
107+
- ".github/workflows/api-tests.yaml"
108+
- "apidocs/openapi/groups.yaml"
109109
- "groups/api/http/**"
110110
111111
users:
112-
- ".github/workflows/api-tests.yml"
113-
- "apidocs/openapi/users.yml"
112+
- ".github/workflows/api-tests.yaml"
113+
- "apidocs/openapi/users.yaml"
114114
- "users/api/**"
115115
116116
- name: Run Users API tests
117117
if: steps.changes.outputs.users == 'true'
118118
uses: schemathesis/action@v1
119119
with:
120-
schema: apidocs/openapi/users.yml
120+
schema: apidocs/openapi/users.yaml
121121
base-url: ${{ env.USERS_URL }}
122122
checks: all
123123
report: false
@@ -127,7 +127,7 @@ jobs:
127127
if: steps.changes.outputs.groups == 'true'
128128
uses: schemathesis/action@v1
129129
with:
130-
schema: apidocs/openapi/groups.yml
130+
schema: apidocs/openapi/groups.yaml
131131
base-url: ${{ env.GROUPS_URL }}
132132
checks: all
133133
report: false
@@ -137,7 +137,7 @@ jobs:
137137
if: steps.changes.outputs.clients == 'true'
138138
uses: schemathesis/action@v1
139139
with:
140-
schema: apidocs/openapi/clients.yml
140+
schema: apidocs/openapi/clients.yaml
141141
base-url: ${{ env.CLIENTS_URL }}
142142
checks: all
143143
report: false
@@ -147,7 +147,7 @@ jobs:
147147
if: steps.changes.outputs.channels == 'true'
148148
uses: schemathesis/action@v1
149149
with:
150-
schema: apidocs/openapi/channels.yml
150+
schema: apidocs/openapi/channels.yaml
151151
base-url: ${{ env.CHANNELS_URL }}
152152
checks: all
153153
report: false
@@ -157,7 +157,7 @@ jobs:
157157
if: steps.changes.outputs.http == 'true'
158158
uses: schemathesis/action@v1
159159
with:
160-
schema: apidocs/openapi/http.yml
160+
schema: apidocs/openapi/http.yaml
161161
base-url: ${{ env.HTTP_ADAPTER_URL }}
162162
checks: all
163163
report: false
@@ -167,7 +167,7 @@ jobs:
167167
if: steps.changes.outputs.auth == 'true'
168168
uses: schemathesis/action@v1
169169
with:
170-
schema: apidocs/openapi/auth.yml
170+
schema: apidocs/openapi/auth.yaml
171171
base-url: ${{ env.AUTH_URL }}
172172
checks: all
173173
report: false
@@ -177,7 +177,7 @@ jobs:
177177
if: steps.changes.outputs.domains == 'true'
178178
uses: schemathesis/action@v1
179179
with:
180-
schema: apidocs/openapi/domains.yml
180+
schema: apidocs/openapi/domains.yaml
181181
base-url: ${{ env.DOMAIN_URL }}
182182
checks: all
183183
report: false
@@ -187,7 +187,7 @@ jobs:
187187
if: steps.changes.outputs.journal == 'true'
188188
uses: schemathesis/action@v1
189189
with:
190-
schema: apidocs/openapi/journal.yml
190+
schema: apidocs/openapi/journal.yaml
191191
base-url: ${{ env.JOURNAL_URL }}
192192
checks: all
193193
report: false
@@ -197,7 +197,7 @@ jobs:
197197
if: steps.changes.outputs.certs == 'true'
198198
uses: schemathesis/action@v1
199199
with:
200-
schema: apidocs/openapi/certs.yml
200+
schema: apidocs/openapi/certs.yaml
201201
base-url: ${{ env.CERTS_URL }}
202202
checks: all
203203
report: false

‎.github/workflows/build.yml‎ renamed to ‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
token: ${{ secrets.CODECOV }}
3838
files: ./coverage/*.out
39-
codecov_yml_path: tools/config/codecov.yml
39+
codecov_yml_path: tools/config/.codecov.yaml
4040
verbose: true
4141

4242
- name: Set up Docker Build

‎.github/workflows/check-generated-files.yml‎ renamed to ‎.github/workflows/check-generated-files.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
base: main
3737
filters: |
3838
proto:
39-
- ".github/workflows/check-generated-files.yml"
39+
- ".github/workflows/check-generated-files.yaml"
4040
- "auth.proto"
4141
- "auth/*.pb.go"
4242
- "pkg/messaging/message.proto"
4343
- "pkg/messaging/*.pb.go"
4444
4545
mocks:
46-
- ".github/workflows/check-generated-files.yml"
46+
- ".github/workflows/check-generated-files.yaml"
4747
- "pkg/sdk/sdk.go"
4848
- "users/postgres/clients.go"
4949
- "users/clients.go"

‎.github/workflows/swagger-ui.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: blokovi/swagger-ui-action@main
2121
with:
2222
dir: "./api/openapi"
23-
pattern: "*.yml"
23+
pattern: "*.yaml"
2424
debug: "true"
2525

2626
- name: Deploy to GitHub Pages

‎.github/workflows/tests.yml‎ renamed to ‎.github/workflows/tests.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: golangci/golangci-lint-action@v6
3636
with:
3737
version: v1.60.3
38-
args: --config ./tools/config/golangci.yml
38+
args: --config ./tools/config/.golangci.yaml
3939

4040
- name: Build all Binaries
4141
run: |
@@ -73,7 +73,7 @@ jobs:
7373
base: main
7474
filters: |
7575
workflow:
76-
- ".github/workflows/tests.yml"
76+
- ".github/workflows/tests.yaml"
7777
7878
auth:
7979
- "auth/**"
@@ -364,5 +364,5 @@ jobs:
364364
with:
365365
token: ${{ secrets.CODECOV }}
366366
files: ./coverage/*.out
367-
codecov_yml_path: tools/config/codecov.yml
367+
codecov_yml_path: tools/config/.codecov.yaml
368368
verbose: true

‎Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ GOARCH ?= amd64
1313
VERSION ?= $(shell git describe --abbrev=0 --tags 2>/dev/null || echo 'unknown')
1414
COMMIT ?= $(shell git rev-parse HEAD)
1515
TIME ?= $(shell date +%F_%T)
16-
USER_REPO ?= $(shell git remote get-url origin | sed -e 's/.*\/\([^/]*\)\/\([^/]*\).*/\1_\2/' )
16+
USER_REPO ?= $(shell git remote get-url origin | sed -E 's#.*[:/]([^/:]+)/([^/.]+)(\.git)?#\1_\2#')
1717
empty:=
1818
space:= $(empty) $(empty)
1919
# Docker compose project name should follow this guidelines: https://docs.docker.com/compose/reference/#use--p-to-specify-a-project-name
20-
DOCKER_PROJECT ?= $(shell echo $(subst $(space),,$(USER_REPO)) | tr -c -s '[:alnum:][=-=]' '_' | tr '[:upper:]' '[:lower:]')
20+
DOCKER_PROJECT ?= $(shell echo $(subst $(space),,$(USER_REPO)) | sed -E 's/[^a-zA-Z0-9]/_/g' | tr '[:upper:]' '[:lower:]')
2121
DOCKER_COMPOSE_COMMANDS_SUPPORTED := up down config restart
2222
DEFAULT_DOCKER_COMPOSE_COMMAND := up
2323
GRPC_MTLS_CERT_FILES_EXISTS = 0
@@ -105,7 +105,7 @@ clean:
105105

106106
cleandocker:
107107
# Stops containers and removes containers, networks, volumes, and images created by up
108-
docker compose -f docker/docker-compose.yml -p $(DOCKER_PROJECT) down --rmi all -v --remove-orphans
108+
docker compose -f docker/docker-compose.yaml -p $(DOCKER_PROJECT) down --rmi all -v --remove-orphans
109109

110110
ifdef pv
111111
# Remove unused volumes
@@ -120,7 +120,7 @@ install:
120120
mocks:
121121
@which mockery > /dev/null || go install github.com/vektra/mockery/v2@$(MOCKERY_VERSION)
122122
@unset MOCKERY_VERSION && go generate ./...
123-
mockery --config ./tools/config/mockery.yaml
123+
mockery --config ./tools/config/.mockery.yaml
124124

125125

126126
DIRS = consumers readers postgres internal
@@ -148,15 +148,15 @@ define test_api_service
148148
fi
149149

150150
@if [ "$(svc)" = "http" ]; then \
151-
st run api/openapi/$(svc).yml \
151+
st run api/openapi/$(svc).yaml \
152152
--checks all \
153153
--base-url $(2) \
154154
--header "Authorization: Client $(CLIENT_SECRET)" \
155155
--contrib-openapi-formats-uuid \
156156
--hypothesis-suppress-health-check=filter_too_much \
157157
--stateful=links; \
158158
else \
159-
st run api/openapi/$(svc).yml \
159+
st run api/openapi/$(svc).yaml \
160160
--checks all \
161161
--base-url $(2) \
162162
--header "Authorization: Bearer $(USER_TOKEN)" \
@@ -253,13 +253,13 @@ endif
253253
endif
254254

255255
run: check_certs
256-
docker compose -f docker/docker-compose.yml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)
256+
docker compose -f docker/docker-compose.yaml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)
257257

258258
run_addons: check_certs
259259
$(foreach SVC,$(RUN_ADDON_ARGS),$(if $(filter $(SVC),$(ADDON_SERVICES) $(EXTERNAL_SERVICES)),,$(error Invalid Service $(SVC))))
260260
@for SVC in $(RUN_ADDON_ARGS); do \
261-
SMQ_ADDONS_CERTS_PATH_PREFIX="../." docker compose -f docker/addons/$$SVC/docker-compose.yml -p $(DOCKER_PROJECT) --env-file ./docker/.env $(DOCKER_COMPOSE_COMMAND) $(args) & \
261+
SMQ_ADDONS_CERTS_PATH_PREFIX="../." docker compose -f docker/addons/$$SVC/docker-compose.yaml -p $(DOCKER_PROJECT) --env-file ./docker/.env $(DOCKER_COMPOSE_COMMAND) $(args) & \
262262
done
263263

264264
run_live: check_certs
265-
GOPATH=$(go env GOPATH) docker compose -f docker/docker-compose.yml -f docker/docker-compose-live.yaml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)
265+
GOPATH=$(go env GOPATH) docker compose -f docker/docker-compose.yaml -f docker/docker-compose-live.yaml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)

0 commit comments

Comments
 (0)