Merge main

Author: winterhazel

.asf.yaml

@@ -51,13 +51,13 @@ github:
 
   collaborators:
     - acs-robot
-    - kiranchavala
     - rajujith
-    - vishesh92
     - GaOrtiga
     - SadiJr
     - winterhazel
-    - rp-
+    - gpordeus
+    - hsato03
+    - bernardodemarco
 
   protected_branches: ~
 

.github/linters/.markdown-lint.yml

@@ -0,0 +1,100 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# MD001/heading-increment Heading levels should only increment by one level at a time
+MD001: false
+
+# MD003/heading-style Heading style
+MD003: false
+
+# MD004/ul-style Unordered list style
+MD004: false
+
+# MD007/ul-indent Unordered list indentation
+MD007: false
+
+# MD009/no-trailing-spaces Trailing spaces
+MD009: false
+
+# MD010/no-hard-tabs Hard tabs
+MD010: false
+
+# MD012/no-multiple-blanks Multiple consecutive blank lines
+MD012: false
+
+# MD013/line-length Line length
+MD013: false
+
+# MD014/commands-show-output Dollar signs used before commands without showing output
+MD014: false
+
+# MD018/no-missing-space-atx No space after hash on atx style heading
+MD018: false
+
+# MD019/no-multiple-space-atx Multiple spaces after hash on atx style heading
+MD019: false
+
+# MD022/blanks-around-headings Headings should be surrounded by blank lines
+MD022: false
+
+# MD023/heading-start-left Headings must start at the beginning of the line
+MD023: false
+
+# MD024/no-duplicate-heading Multiple headings with the same content
+MD024: false
+
+# MD025/single-title/single-h1 Multiple top-level headings in the same document
+MD025: false
+
+# MD026/no-trailing-punctuation Trailing punctuation in heading
+MD026: false
+
+# MD028/no-blanks-blockquote Blank line inside blockquote
+MD028: false
+
+# MD029/ol-prefix Ordered list item prefix
+MD029: false
+
+# MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines
+MD031: false
+
+# MD032/blanks-around-lists Lists should be surrounded by blank lines
+MD032: false
+
+# MD033/no-inline-html Inline HTML
+MD033: false
+
+# MD034/no-bare-urls Bare URL used
+MD034: false
+
+# MD036/no-emphasis-as-heading Emphasis used instead of a heading
+MD036: false
+
+# MD037/no-space-in-emphasis Spaces inside emphasis markers
+MD037: false
+
+# MD040/fenced-code-language Fenced code blocks should have a language specified
+MD040: false
+
+# MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading
+MD041: false
+
+# MD046/code-block-style Code block style
+MD046: false
+
+# MD052/reference-links-images Reference links and images should use a label that is defined
+MD052: false

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'

.github/workflows/ci.yml

@@ -54,6 +54,7 @@ jobs:
                   smoke/test_deploy_vm_with_userdata
                   smoke/test_deploy_vms_in_parallel
                   smoke/test_deploy_vms_with_varied_deploymentplanners
+                  smoke/test_restore_vm
                   smoke/test_diagnostics
                   smoke/test_direct_download
                   smoke/test_disk_offerings
@@ -179,7 +180,8 @@ jobs:
                 "component/test_project_usage
                   component/test_protocol_number_security_group
                   component/test_public_ip
-                  component/test_resource_limits",
+                  component/test_resource_limits
+                  component/test_resource_limit_tags",
                 "component/test_regions_accounts
                   component/test_routers
                   component/test_snapshots
@@ -210,7 +212,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -312,10 +314,11 @@ jobs:
           echo -e "Simulator CI Test Results: (only failures listed)\n"
           python3 ./tools/marvin/xunit-reader.py integration-test-results/
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           files: jacoco-coverage.xml
           fail_ci_if_error: true
           flags: simulator-marvin-tests
           verbose: true
           name: codecov
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codecov.yml

@@ -37,7 +37,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -49,10 +49,11 @@ jobs:
           cd nonoss && bash -x install-non-oss.sh && cd ..
           mvn -P quality -Dsimulator -Dnoredist clean install -T$(nproc)
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           files: ./client/target/site/jacoco-aggregate/jacoco.xml
           fail_ci_if_error: true
-          flags: unit-tests
+          flags: unittests
           verbose: true
           name: codecov
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/main-sonar-check.yml

@@ -37,7 +37,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

.github/workflows/rat.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'

.github/workflows/sonar-check.yml

@@ -39,7 +39,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

.github/workflows/ui.yml

@@ -55,11 +55,12 @@ jobs:
           npm run lint
           npm run test:unit
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           working-directory: ui
           files: ./coverage/lcov.info
           fail_ci_if_error: true
           flags: uitests
           verbose: true
           name: codecov
+          token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -15,92 +15,92 @@
 # specific language governing permissions and limitations
 # under the License.
 
-build/build.number
-.lock-wscript
-.waf-*
-waf-*
-target/
-override/
-.metadata
-dist/
 *~
+*_flymake.js
 *.bak
-cloud-*.tar.bz2
-*.log
-*.pyc
-*.patch
+*.css.map
 *.egginfo/
 *.egg-info/
-*.prefs
-build.number
-*.log.*
-cloud.log.*.*
-unittest
-deps/cloud.userlibraries
-.DS_Store
-.idea
 *.iml
-git-remote-https.exe.stackdump
-*.swp
-tools/devcloud/devcloudbox/.vagrant
-tools/cli/cloudmonkey/marvin/
-tools/cli/cloudmonkey/precache.py
-tools/marvin/marvin/cloudstackAPI/
-tools/marvin/build/
-tools/cli/build/
-tools/appliance/systemvmtemplate/packer_cache/
+*.iso
 *.jar
-*.war
+*.log
+*.log.*
 *.mar
-*.iso
+*.orig
+*.patch
+*.prefs
+*.pyc
+*.qcow2
+*.raw
+*.swp
 *.tar.gz
 *.tgz
 *.vscode
-*.css.map
-
-# this ignores _all files starting with '.'. Don't do that!
-#.*
-
-target-eclipse
-!.gitignore
+*.war
+.DS_Store
+.checkstyle
 .classpath
+.idea
+.lock-wscript
+.metadata
+.pmd
+.pmdruleset.xml
+.project
+.pydevproject
+.reviewboardrc
 .settings.xml
 .settings/
-db.properties.override
-replace.properties.override
-tools/marvin/marvin/cloudstackAPI/*
-docs/tmp
-docs/publish
-docs/runbook/tmp
-docs/runbook/publish
-.project
+.vscode
+.waf-*
 Gemfile.lock
-debian/tmp
-debian/files
-debian/cloudstack-*/*
-debian/*.substvars
-debian/*.debhelper
-replace.properties.tmp
+build/build.number
+build.number
 build-indep-stamp
+cloud.log.*.*
+cloud-*.tar.bz2
 configure-stamp
-*_flymake.js
+db.properties.override
+debian/*.debhelper
+debian/*.substvars
+debian/cloudstack-*/*
+debian/files
+debian/tmp
+deps/cloud.userlibraries
+dist/
+docs/publish
+docs/runbook/publish
+docs/runbook/tmp
+docs/tmp
 engine/storage/integration-test/test-output
-tools/apidoc/log/
+git-remote-https.exe.stackdump
+node_modules
+override/
+plugins/hypervisors/kvm/.pydevproject
 plugins/network-elements/juniper-contrail/logs/
+replace.properties.override
+replace.properties.tmp
+scripts/.pydevproject
 scripts/vm/hypervisor/xenserver/vhd-util
-*.orig
-tools/appliance/box/
-.reviewboardrc
-.checkstyle
-.pmd
-.pmdruleset.xml
-.pydevproject
 systemvm/.pydevproject
+target/
+target-eclipse
 test/.pydevprojec
-plugins/hypervisors/kvm/.pydevproject
-scripts/.pydevproject
-*.qcow2
-*.raw
+tools/apidoc/log/
+tools/appliance/box/
+tools/appliance/systemvmtemplate/packer_cache/
+tools/cli/build/
+tools/cli/cloudmonkey/marvin/
+tools/cli/cloudmonkey/precache.py
+tools/devcloud/devcloudbox/.vagrant
+tools/marvin/build/
+tools/marvin/marvin/cloudstackAPI/
+tools/marvin/marvin/cloudstackAPI/*
+unittest
 venv
-node_modules
-.vscode
+waf-*
+
+# this ignores _all files starting with '.'. Don't do that!
+#.*
+
+!.gitignore