Merge branch 'main' into feat/update_golang-jwt_v5.2.0

goharbor · Jan 24, 2024 · e9a099e · e9a099e
2 parents 2bd67f8 + 522f96b
commit e9a099e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/api/v2.0/swagger.yaml b/api/v2.0/swagger.yaml
@@ -7164,6 +7164,10 @@ definitions:
         type: string
         description: 'Whether scan images automatically when pushing. The valid values are "true", "false".'
         x-nullable: true
+      auto_sbom_generation:
+        type: string
+        description: 'Whether generating SBOM automatically when pushing a subject artifact. The valid values are "true", "false".'
+        x-nullable: true
       reuse_sys_cve_allowlist:
         type: string
         description: 'Whether this project reuse the system level CVE allowlist as the allowlist of its own.  The valid values are "true", "false".

diff --git a/make/photon/prepare/templates/nginx/nginx.https.conf.jinja b/make/photon/prepare/templates/nginx/nginx.https.conf.jinja
@@ -51,6 +51,7 @@ http {
 
   server {
     listen 8443 ssl;
+    listen [::]:8443 ssl;
 #    server_name harbordomain.com;
     server_tokens off;
     # SSL

diff --git a/make/photon/prepare/templates/portal/nginx.conf.jinja b/make/photon/prepare/templates/portal/nginx.conf.jinja
@@ -17,6 +17,7 @@ http {
     server {
 {% if internal_tls.enabled %}
         listen 8443 ssl;
+        listen [::]:8443 ssl;
         # SSL
         ssl_certificate /etc/harbor/tls/portal.crt;
         ssl_certificate_key /etc/harbor/tls/portal.key;

diff --git a/tests/resources/Harbor-Pages/Replication_Elements.robot b/tests/resources/Harbor-Pages/Replication_Elements.robot
@@ -64,7 +64,7 @@ ${replication_mode_radio_pull}  //clr-main-container//hbr-create-edit-rule//labe
 ${filter_name_id}  //input[@id='filter_name']
 ${filter_tag_model_select}  //div[@class='filterSelect ng-star-inserted'][2]//select
 ${filter_tag_id}  //input[@id='filter_tag']
-${filter_label_xpath}  //form//clr-dropdown[contains(@class,'dropdown')]
+${filter_label_xpath}  //form//clr-dropdown[contains(@class,'dropdown')]//clr-icon
 ${filter_label_model_select}  //div[@class='filterSelect ng-star-inserted'][3]//select
 ${rule_resource_selector}  //*[@id='select_resource']
 ${trigger_mode_selector}  //*[@id='ruleTrigger']