Skip to content

Commit ad672f0

Browse files
mrMiglesmrMigles
authored
Merge branch 'main' into feature/return_api_group
2 parents 299c808 + a411f36 commit ad672f0

13 files changed

+287
-114
lines changed

‎.github/workflows/automatic-pr-labeler.yaml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
3+
# The workflow template for automatic PR labeler.
4+
# It requires to have a configuration file with labels and conditions to apply them.
5+
# The configuration file should be placed in the .github folder and named auto-labeler-config.yaml.
6+
# Example file can be found there:
7+
# https://github.com/Netcracker/.github/blob/main/config/examples/auto-labeler-config.yaml
8+
9+
name: Automatic PR Labeler
10+
11+
on:
12+
pull_request:
13+
branches: [main]
14+
types:
15+
[opened, reopened, synchronize]
16+
17+
permissions:
18+
contents: read
19+
20+
jobs:
21+
assign-labels:
22+
if: (github.event.pull_request.merged == false) && (github.event.pull_request.user.login != 'dependabot[bot]') && (github.event.pull_request.user.login != 'github-actions[bot]')
23+
permissions:
24+
pull-requests: write
25+
contents: read
26+
issues: write
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
30+
with:
31+
persist-credentials: false
32+
33+
- name: "Execute assign labels"
34+
id: action-assign-labels
35+
uses: mauroalderete/action-assign-labels@671a4ca2da0f900464c58b8b5540a1e07133e915 # v1.5.1
36+
with:
37+
pull-request-number: ${{ github.event.pull_request.number }}
38+
github-token: ${{ github.token }}
39+
conventional-commits: "./.github/auto-labeler-config.yaml"
40+
maintain-labels-not-matched: true
41+
apply-changes: ${{ github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id }}
42+
43+
- name: Set labels-next safely
44+
if: ${{ github.event.pull_request.base.repo.id != github.event.pull_request.head.repo.id }}
45+
run: |
46+
echo "LABELS_NEXT=$(echo ${STEPS_ACTION_ASSIGN_LABELS_OUTPUTS_LABELS_NEXT} | tr -dc 'a-zA-Z0-9-,')" >> $GITHUB_ENV
47+
env:
48+
STEPS_ACTION_ASSIGN_LABELS_OUTPUTS_LABELS_NEXT: ${{ steps.action-assign-labels.outputs.labels-next }}
49+
- name: "Drop warning if PR from fork"
50+
if: ${{ github.event.pull_request.base.repo.id != github.event.pull_request.head.repo.id }}
51+
run: |
52+
{
53+
echo "⚠️ Pull request from fork! ⚠️";
54+
echo "Labels will not be applied to PR. Assign them manually please.";
55+
echo "Labels to assign: '${LABELS_NEXT}'";
56+
} >> "$GITHUB_STEP_SUMMARY"

‎.github/workflows/cla.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ permissions:
1111

1212
jobs:
1313
CLAAssistant:
14-
if: github.event.pull_request.draft == false
1514
permissions:
1615
actions: write
1716
contents: write
@@ -21,7 +20,7 @@ jobs:
2120
steps:
2221
- name: "CLA Assistant"
2322
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
24-
uses: contributor-assistant/[email protected]
23+
uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 #v2.6.1
2524
env:
2625
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2726
PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACCESS_TOKEN }}

‎.github/workflows/pr-assigner.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: PR Auto-Assignment
2+
run-name: "Assigning reviewers for PR #${{ github.event.pull_request.number }}"
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened, synchronize]
6+
branches:
7+
- main
8+
9+
permissions:
10+
pull-requests: write
11+
contents: read
12+
13+
jobs:
14+
pr-auto-assign:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Check if PR is from a fork
19+
run: |
20+
if [ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.event.pull_request.base.repo.full_name }}" ]; then
21+
echo "⚠️ Pull request is from a fork — skipping assignee assignment (no write permissions)."
22+
exit 0
23+
fi
24+
25+
- uses: actions/checkout@v5
26+
with:
27+
persist-credentials: false
28+
29+
- uses: netcracker/qubership-workflow-hub/actions/pr-assigner@b575bad3a0959c4e883bc34f9d055ff07fde2dbd #2.0.1
30+
env:
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/pr-conventional-commits.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
3+
name: Conventional Commits PR Check
4+
5+
on:
6+
pull_request:
7+
types:
8+
- opened
9+
- edited
10+
- synchronize
11+
12+
permissions:
13+
pull-requests: read
14+
jobs:
15+
build:
16+
name: Conventional Commits
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
20+
with:
21+
persist-credentials: false
22+
23+
- uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 #v1.3.0

‎.github/workflows/security-scan.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Security Scan
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
target:
6+
description: "Scan part"
7+
required: true
8+
default: "docker"
9+
type: choice
10+
options:
11+
- docker
12+
- source
13+
image:
14+
description: "Docker image (for 'docker' target). By default ghcr.io/<owner>/<repo>:latest"
15+
required: false
16+
default: ""
17+
only-high-critical:
18+
description: "Scan only HIGH + CRITICAL"
19+
required: false
20+
default: true
21+
type: boolean
22+
trivy-scan:
23+
description: "Run Trivy scan"
24+
required: false
25+
default: true
26+
type: boolean
27+
grype-scan:
28+
description: "Run Grype scan"
29+
required: false
30+
default: true
31+
type: boolean
32+
continue-on-error:
33+
description: "Continue on error"
34+
required: false
35+
default: true
36+
type: boolean
37+
only-fixed:
38+
description: "Show only fixable vulnerabilities"
39+
required: false
40+
default: true
41+
type: boolean
42+
43+
permissions:
44+
contents: read
45+
security-events: write
46+
actions: read
47+
packages: read
48+
49+
jobs:
50+
security-scan:
51+
uses: netcracker/qubership-workflow-hub/.github/workflows/re-security-scan.yml@main
52+
with:
53+
target: ${{ github.event.inputs.target || 'source' }}
54+
image: ${{ github.event.inputs.image || '' }}
55+
only-high-critical: ${{ inputs.only-high-critical}}
56+
trivy-scan: ${{ inputs.trivy-scan }}
57+
grype-scan: ${{ inputs.grype-scan }}
58+
only-fixed: ${{ inputs.only-fixed }}
59+
continue-on-error: ${{ inputs.continue-on-error }}

‎docs/public/disasterRecovery.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ backupDaemon:
137137

138138
You can perform the switchover using the `SiteManager` functionality or RabbitMQ disaster recovery REST server API.
139139

140+
<!-- #GFCFilterMarkerStart# -->
141+
For more information about `SiteManager`, refer to [Site Manager](https://github.com/Netcracker/qubership-core-site-management/blob/main/README.md) article.
142+
<!-- #GFCFilterMarkerEnd# -->
143+
140144
If you want to perform a switchover manually, you need to switch `active` RabbitMQ cluster to `standby` mode and then switch `standby` RabbitMQ cluster to `active` mode.
141145
You need to run the following command from within any RabbitMQ pod on the `active` side:
142146

‎docs/public/installation.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,6 +1114,7 @@ Scale In (decreasing) replicas are not supported out of the box. You need to be
11141114

11151115
## Version Upgrade and Feature Flags
11161116

1117+
Upgrades from RabbitMQ 3.13.x are supported to both RabbitMQ 4.0.x and RabbitMQ 4.1.x.
11171118
To upgrade RabbitMQ version you need to make sure that all feature flags not marked as experimental are enabled.
11181119

11191120
To check that, execute the following command in any RabbitMQ pod:

0 commit comments

Comments
 (0)