Skip to content

Commit 1fe7d14

Browse files
committed
style: apply Prettier formatting to entire codebase
Apply consistent code formatting using Prettier across all files: - Convert double quotes to single quotes - Standardize indentation to 4 spaces - Normalize spacing and line breaks with 120-char width - Apply consistent trailing commas and semicolons - Format 500+ files for code consistency Issue: CLDSRV-723
1 parent 6729595 commit 1fe7d14

File tree

554 files changed

+71826
-63168
lines changed

Some content is hidden

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

554 files changed

+71826
-63168
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ the **[Zenko Forum](http://forum.zenko.io/)**.
99
> Questions opened as GitHub issues will systematically be closed, and moved to
1010
> the [Zenko Forum](http://forum.zenko.io/).
1111
12-
--------------------------------------------------------------------------------
12+
---
1313

1414
## Avoiding duplicates
1515

@@ -21,7 +21,7 @@ any duplicates already open:
2121
- if there is a duplicate, please do not open your issue, and add a comment
2222
to the existing issue instead.
2323

24-
--------------------------------------------------------------------------------
24+
---
2525

2626
## Bug report information
2727

@@ -52,7 +52,7 @@ Describe the results you expected
5252
- distribution/OS,
5353
- optional: anything else you deem helpful to us.
5454

55-
--------------------------------------------------------------------------------
55+
---
5656

5757
## Feature Request
5858

@@ -78,10 +78,10 @@ Please provide use cases for changing the current behavior
7878
### Additional information
7979

8080
- Is this request for your company? Y/N
81-
- If Y: Company name:
82-
- Are you using any Scality Enterprise Edition products (RING, Zenko EE)? Y/N
81+
- If Y: Company name:
82+
- Are you using any Scality Enterprise Edition products (RING, Zenko EE)? Y/N
8383
- Are you willing to contribute this feature yourself?
8484
- Position/Title:
8585
- How did you hear about us?
8686

87-
--------------------------------------------------------------------------------
87+
---

.github/actions/cleanup-and-coverage/action.yaml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@ name: 'Cleanup and Coverage'
22
description: 'Stops CI services and uploads coverage reports to Codecov'
33

44
inputs:
5-
profiles:
6-
description: 'Docker Compose profiles to use (space-separated)'
7-
required: false
8-
default: ''
9-
codecov-token:
10-
description: 'Codecov token for uploading reports'
11-
required: true
12-
flags:
13-
description: 'Flags to identify the coverage report'
14-
required: false
15-
default: '${{ github.job }}'
5+
profiles:
6+
description: 'Docker Compose profiles to use (space-separated)'
7+
required: false
8+
default: ''
9+
codecov-token:
10+
description: 'Codecov token for uploading reports'
11+
required: true
12+
flags:
13+
description: 'Flags to identify the coverage report'
14+
required: false
15+
default: '${{ github.job }}'
1616

1717
runs:
18-
using: 'composite'
19-
steps:
20-
- name: Stop CI services
21-
run: |
22-
PROFILES=""
23-
# Read from environment variable to avoid syntax issues
24-
# related to gha templating
25-
for profile in $INPUT_PROFILES; do
26-
PROFILES="${PROFILES} --profile ${profile}"
27-
done
28-
docker compose ${PROFILES} down
29-
shell: bash
30-
env:
31-
INPUT_PROFILES: ${{ inputs.profiles }}
32-
working-directory: .github/docker
33-
34-
- name: Upload coverage reports to Codecov
35-
uses: codecov/codecov-action@v5
36-
with:
37-
token: ${{ inputs.codecov-token }}
38-
directory: /tmp/coverage/${{ github.job }}
39-
flags: ${{ inputs.flags }}
40-
if: ${{ !cancelled() }}
18+
using: 'composite'
19+
steps:
20+
- name: Stop CI services
21+
run: |
22+
PROFILES=""
23+
# Read from environment variable to avoid syntax issues
24+
# related to gha templating
25+
for profile in $INPUT_PROFILES; do
26+
PROFILES="${PROFILES} --profile ${profile}"
27+
done
28+
docker compose ${PROFILES} down
29+
shell: bash
30+
env:
31+
INPUT_PROFILES: ${{ inputs.profiles }}
32+
working-directory: .github/docker
33+
34+
- name: Upload coverage reports to Codecov
35+
uses: codecov/codecov-action@v5
36+
with:
37+
token: ${{ inputs.codecov-token }}
38+
directory: /tmp/coverage/${{ github.job }}
39+
flags: ${{ inputs.flags }}
40+
if: ${{ !cancelled() }}
Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
---
2-
name: "Setup CI environment"
3-
description: "Setup Cloudserver CI environment"
2+
name: 'Setup CI environment'
3+
description: 'Setup Cloudserver CI environment'
44

55
runs:
6-
using: composite
7-
steps:
8-
- name: Setup etc/hosts
9-
shell: bash
10-
run: |
11-
sudo echo "127.0.0.1 bucketwebsitetester.s3-website-us-east-1.amazonaws.com" | sudo tee -a /etc/hosts
12-
sudo echo "127.0.0.1 pykmip.local" | sudo tee -a /etc/hosts
13-
for i in `seq 1 50`; do sudo echo "127.0.0.$i $i.pykmip.local" | sudo tee -a /etc/hosts ; done
14-
- name: Setup Credentials
15-
shell: bash
16-
run: bash .github/scripts/credentials.bash
17-
- name: Setup job artifacts directory
18-
shell: bash
19-
run: |-
20-
set -exu;
21-
mkdir -p /tmp/artifacts/${JOB_NAME}/;
22-
- name: Setup coverage directory
23-
shell: bash
24-
run: |-
25-
set -exu;
26-
mkdir -p /tmp/coverage/${JOB_NAME}/;
27-
- uses: actions/setup-node@v4
28-
with:
29-
node-version: '22'
30-
cache: 'yarn'
31-
- name: install typescript
32-
shell: bash
33-
run: yarn global add [email protected]
34-
- name: install dependencies
35-
shell: bash
36-
run: yarn install --ignore-engines --frozen-lockfile --network-concurrency 1
37-
- uses: actions/cache@v3
38-
with:
39-
path: ~/.cache/pip
40-
key: ${{ runner.os }}-pip
41-
- uses: actions/setup-python@v4
42-
with:
43-
python-version: 3.9
44-
- name: Setup python2 test environment
45-
shell: bash
46-
run: |
47-
sudo apt-get install -y libdigest-hmac-perl
48-
pip install 's3cmd==2.3.0'
49-
- name: fix sproxyd.conf permissions
50-
shell: bash
51-
run: sudo chown root:root .github/docker/sproxyd/conf/sproxyd0.conf
52-
- name: ensure fuse kernel module is loaded (for sproxyd)
53-
shell: bash
54-
run: sudo modprobe fuse
6+
using: composite
7+
steps:
8+
- name: Setup etc/hosts
9+
shell: bash
10+
run: |
11+
sudo echo "127.0.0.1 bucketwebsitetester.s3-website-us-east-1.amazonaws.com" | sudo tee -a /etc/hosts
12+
sudo echo "127.0.0.1 pykmip.local" | sudo tee -a /etc/hosts
13+
for i in `seq 1 50`; do sudo echo "127.0.0.$i $i.pykmip.local" | sudo tee -a /etc/hosts ; done
14+
- name: Setup Credentials
15+
shell: bash
16+
run: bash .github/scripts/credentials.bash
17+
- name: Setup job artifacts directory
18+
shell: bash
19+
run: |-
20+
set -exu;
21+
mkdir -p /tmp/artifacts/${JOB_NAME}/;
22+
- name: Setup coverage directory
23+
shell: bash
24+
run: |-
25+
set -exu;
26+
mkdir -p /tmp/coverage/${JOB_NAME}/;
27+
- uses: actions/setup-node@v4
28+
with:
29+
node-version: '22'
30+
cache: 'yarn'
31+
- name: install typescript
32+
shell: bash
33+
run: yarn global add [email protected]
34+
- name: install dependencies
35+
shell: bash
36+
run: yarn install --ignore-engines --frozen-lockfile --network-concurrency 1
37+
- uses: actions/cache@v3
38+
with:
39+
path: ~/.cache/pip
40+
key: ${{ runner.os }}-pip
41+
- uses: actions/setup-python@v4
42+
with:
43+
python-version: 3.9
44+
- name: Setup python2 test environment
45+
shell: bash
46+
run: |
47+
sudo apt-get install -y libdigest-hmac-perl
48+
pip install 's3cmd==2.3.0'
49+
- name: fix sproxyd.conf permissions
50+
shell: bash
51+
run: sudo chown root:root .github/docker/sproxyd/conf/sproxyd0.conf
52+
- name: ensure fuse kernel module is loaded (for sproxyd)
53+
shell: bash
54+
run: sudo modprobe fuse
Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
services:
2-
vault-sse-before-migration:
3-
image: ${VAULT_IMAGE}
4-
profiles: ['sse-migration']
5-
# root because S3C images needs ownership permission on files and mounted paths
6-
user: root
7-
command: sh -c "chmod 400 tests/utils/keyfile && yarn start > /artifacts/vault.log 2> /artifacts/vault-stderr.log"
8-
network_mode: "host"
9-
volumes:
10-
- /tmp/artifacts/${JOB_NAME}:/artifacts
11-
- ./vault-config.json:/conf/config.json:ro
12-
- ./vault-db:/data
13-
environment:
14-
- VAULT_DB_BACKEND=LEVELDB
15-
- CI=true
16-
- ENABLE_LOCAL_CACHE=true
17-
- REDIS_HOST=0.0.0.0
18-
- REDIS_PORT=6379
19-
depends_on:
20-
- redis
21-
vault-sse-migration:
22-
extends: vault-sse-before-migration
23-
profiles: ['sse-migration']
24-
command: sh -c "chmod 400 tests/utils/keyfile && yarn start > /artifacts/vault.migration.log 2> /artifacts/vault-stderr.migration.log"
25-
environment:
26-
- KMS_BACKEND
27-
cloudserver-sse-before-migration:
28-
extends:
29-
file: docker-compose.yaml
30-
service: cloudserver
31-
profiles: [sse-migration]
32-
volumes:
33-
# using artesca container
34-
- ../../localData:/usr/src/app/localData
35-
- ../../localMetadata:/usr/src/app/localMetadata
36-
- ../../tests/functional/sse-kms-migration/config.json:/conf/config.json
37-
environment:
38-
- S3_CONFIG_FILE=/conf/config.json
39-
cloudserver-sse-migration:
40-
extends: cloudserver-sse-before-migration
41-
profiles: [sse-migration]
42-
command: sh -c "yarn start > /artifacts/s3.migration.log 2> /artifacts/s3-stderr.migration.log"
2+
vault-sse-before-migration:
3+
image: ${VAULT_IMAGE}
4+
profiles: ['sse-migration']
5+
# root because S3C images needs ownership permission on files and mounted paths
6+
user: root
7+
command: sh -c "chmod 400 tests/utils/keyfile && yarn start > /artifacts/vault.log 2> /artifacts/vault-stderr.log"
8+
network_mode: 'host'
9+
volumes:
10+
- /tmp/artifacts/${JOB_NAME}:/artifacts
11+
- ./vault-config.json:/conf/config.json:ro
12+
- ./vault-db:/data
13+
environment:
14+
- VAULT_DB_BACKEND=LEVELDB
15+
- CI=true
16+
- ENABLE_LOCAL_CACHE=true
17+
- REDIS_HOST=0.0.0.0
18+
- REDIS_PORT=6379
19+
depends_on:
20+
- redis
21+
vault-sse-migration:
22+
extends: vault-sse-before-migration
23+
profiles: ['sse-migration']
24+
command: sh -c "chmod 400 tests/utils/keyfile && yarn start > /artifacts/vault.migration.log 2> /artifacts/vault-stderr.migration.log"
25+
environment:
26+
- KMS_BACKEND
27+
cloudserver-sse-before-migration:
28+
extends:
29+
file: docker-compose.yaml
30+
service: cloudserver
31+
profiles: [sse-migration]
32+
volumes:
33+
# using artesca container
34+
- ../../localData:/usr/src/app/localData
35+
- ../../localMetadata:/usr/src/app/localMetadata
36+
- ../../tests/functional/sse-kms-migration/config.json:/conf/config.json
37+
environment:
38+
- S3_CONFIG_FILE=/conf/config.json
39+
cloudserver-sse-migration:
40+
extends: cloudserver-sse-before-migration
41+
profiles: [sse-migration]
42+
command: sh -c "yarn start > /artifacts/s3.migration.log 2> /artifacts/s3-stderr.migration.log"

0 commit comments

Comments
 (0)