Skip to content

Commit 2f8416d

Browse files
committed
Merge branch 'main' into gk/develocityIntegration
* main: (1223 commits) Standardize and auto add license headers for SQL files with pre-commit (apache#12071) pre-commit use colored text in the CI for `pass / fail / skipped` (apache#11977) ui(locales): remove duplicates and fix typos (apache#11872) pre-commit: auto add table of contents with `doctoc` (apache#11679) chore: rename workflow `linter.yml` to `pre-commit.yml` (apache#11647) engine-schema: upgrade path for 4.23.0 (apache#12048) Fixes:apache#7837: Add isolationMethods and vlan to TrafficTypeResponse (apache#8151) Svgs (apache#12051) Update GUI Kubernetes logo (apache#11895) Keeping consistency with other error messages. (apache#11649) enhancement: add instance info as Libvirt metadata (apache#11061) Add empty Provider value in Network/VPC Offering form (apache#11982) merge fix Updating pom.xml version numbers for release 4.23.0.0-SNAPSHOT Updating pom.xml version numbers for release 4.22.1.0-SNAPSHOT UI: fix typo Upload SSL certificate (apache#11869) api/test: fix storage pool update with only id (apache#11897) Updating pom.xml version numbers for release 4.22.0.0 Handle null mountTimeout in RestoreBackupCommand (apache#11944) Fix the config 'powerflex.connect.on.demand' description (apache#11926) ...
2 parents 9c66ca4 + 86ae1fe commit 2f8416d

File tree

4,158 files changed

+373118
-152953
lines changed

Some content is hidden

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

4,158 files changed

+373118
-152953
lines changed

.asf.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,20 @@ github:
5151

5252
collaborators:
5353
- acs-robot
54-
- rajujith
55-
- GaOrtiga
56-
- SadiJr
57-
- winterhazel
5854
- gpordeus
5955
- hsato03
60-
- bernardodemarco
56+
- FelipeM525
57+
- lucas-a-martins
58+
- nicoschmdt
59+
- abh1sar
60+
- rosi-shapeblue
61+
- sudo87
62+
- erikbocks
6163

6264
protected_branches: ~
6365

6466
notifications:
65-
66-
67+
68+
6769
pullrequests: [email protected]
68-
discussions: [email protected]
70+
discussions: [email protected]

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
description: "Thank you for reporting a bug!"
18+
name: bug
19+
title: "[SHORT PROBLEM DESCRIPTION]"
20+
labels: bug, needs-triageing
21+
body:
22+
- type: markdown
23+
attributes:
24+
value: "## Welcome, please describe your problem below;"
25+
- type: textarea
26+
attributes:
27+
label: problem
28+
value: The long description of your problem
29+
- type: markdown
30+
attributes:
31+
value: "## What versions of cloudstack and any infra components are you using"
32+
- type: textarea
33+
attributes:
34+
label: versions
35+
value: The versions of ACS, hypervisors, storage, network etc..
36+
- type: textarea
37+
attributes:
38+
label: The steps to reproduce the bug
39+
value: |
40+
1.
41+
2.
42+
3.
43+
...
44+
- type: textarea
45+
attributes:
46+
label: "What to do about it?"
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
description: "Thank you for your new feature idea!"
18+
name: feature
19+
title: "[SHORT FUNCTIONAL DESCRIPTION]"
20+
labels: new
21+
body:
22+
- type: textarea
23+
attributes:
24+
label: "The required feature described as a wish"
25+
value: As a User/Admin/Operator I would like to , ... have the system make my morning coffee.

.github/linters/.flake8

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
# E224 Tab after operator
2323
# E227 Missing whitespace around bitwise or shift operator
2424
# E242 Tab after ','
25+
# E271 Multiple spaces after keyword
26+
# E272 Multiple spaces before keyword
2527
# E273 Tab after keyword
2628
# E274 Tab before keyword
29+
# E713 Test for membership should be 'not in'
2730
# E742 Do not define classes named 'I', 'O', or 'l'
2831
# E743 Do not define functions named 'I', 'O', or 'l'
2932
# E901 SyntaxError or IndentationError
@@ -37,4 +40,4 @@
3740
exclude =
3841
.git,
3942
venv
40-
select = E112,E113,E133,E223,E224,E227,E242,E273,E274,E742,E743,E901,E902,W291,W292,W293,W391
43+
select = E112,E113,E133,E223,E224,E227,E242,E271,E272,E273,E274,E713,E742,E743,E901,E902,W291,W292,W293,W391

.github/linters/.markdown-lint.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,21 @@
1818
# MD001/heading-increment Heading levels should only increment by one level at a time
1919
MD001: false
2020

21-
# MD003/heading-style Heading style
22-
MD003: false
23-
2421
# MD004/ul-style Unordered list style
2522
MD004: false
2623

2724
# MD007/ul-indent Unordered list indentation
2825
MD007: false
2926

30-
# MD009/no-trailing-spaces Trailing spaces
31-
MD009: false
32-
3327
# MD010/no-hard-tabs Hard tabs
3428
MD010: false
3529

36-
# MD012/no-multiple-blanks Multiple consecutive blank lines
37-
MD012: false
38-
3930
# MD013/line-length Line length
4031
MD013: false
4132

4233
# MD014/commands-show-output Dollar signs used before commands without showing output
4334
MD014: false
4435

45-
# MD018/no-missing-space-atx No space after hash on atx style heading
46-
MD018: false
47-
48-
# MD019/no-multiple-space-atx Multiple spaces after hash on atx style heading
49-
MD019: false
50-
5136
# MD022/blanks-around-headings Headings should be surrounded by blank lines
5237
MD022: false
5338

@@ -98,3 +83,6 @@ MD046: false
9883

9984
# MD052/reference-links-images Reference links and images should use a label that is defined
10085
MD052: false
86+
87+
# MD059/descriptive-link-text Link text should be descriptive
88+
MD059: false

.github/linters/.yamllint.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
---
18+
extends: relaxed
19+
20+
rules:
21+
line-length:
22+
max: 400 # Very forgiving for GitHub Actions and infrastructure files
23+
indentation: disable # Disable indentation checking for existing files
24+
comments: disable # Disable comment formatting checks
25+
brackets: disable # Disable bracket spacing checks
26+
colons:
27+
max-spaces-after: -1 # Allow any number of spaces after colon
28+
max-spaces-before: 0
29+
document-start: disable # Many files don't have ---
30+
truthy:
31+
allowed-values: ['true', 'false', 'on', 'off', 'yes', 'no']

0 commit comments

Comments
 (0)