Merge branch 'main' into wzh-5347-vulnerability-scan-refactor

Author: lizk886

.github/actions/update_operator_version/action.yaml

@@ -34,7 +34,7 @@ runs:
   steps:
     - name: Check branch and release type
       id: checkRelease
-      uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2
+      uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v3
       with:
         release_type: ${{ inputs.release_type }}
 
@@ -81,7 +81,7 @@ runs:
 
     - name: Set version number
       id: version
-      uses: IABTechLab/uid2-shared-actions/actions/version_number@v2
+      uses: IABTechLab/uid2-shared-actions/actions/version_number@v3
       with:
         type: ${{ inputs.release_type }}
         version_number: ${{ inputs.version_number_input }}

.github/workflows/publish-all-operators.yaml

@@ -59,7 +59,7 @@ jobs:
             GITHUB_CONTEXT: ${{ toJson(github) }}
 
       - name: Check branch and release type
-        uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2
+        uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v3
         with:
           release_type: ${{ inputs.release_type }}
 
@@ -77,7 +77,7 @@ jobs:
 
       - name: Set version number
         id: version
-        uses: IABTechLab/uid2-shared-actions/actions/version_number@v2
+        uses: IABTechLab/uid2-shared-actions/actions/version_number@v3
         with:
           type: ${{ env.RELEASE_TYPE }}
           branch_name: ${{ github.ref }}

conf/default-config.json

@@ -38,5 +38,6 @@
   "failure_shutdown_wait_hours": 120,
   "sharing_token_expiry_seconds": 2592000,
   "operator_type": "public",
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-operator"
 }

conf/docker-config.json

@@ -42,5 +42,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "public",
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-operator"
 }

conf/integ-config.json

@@ -18,5 +18,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "public",
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-operator"
 }

conf/local-config.json

@@ -41,5 +41,6 @@
   "operator_type": "public",
   "encrypted_files": false,
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-operator"
 }

conf/local-e2e-docker-private-config.json

@@ -31,5 +31,6 @@
   "cloud_refresh_interval": 30,
   "salts_expired_shutdown_hours": 12,
   "operator_type": "private",
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-private-operator"
 }

conf/local-e2e-docker-public-config.json

@@ -38,5 +38,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "public",
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-public-operator"
 }

conf/local-e2e-private-config.json

@@ -42,5 +42,6 @@
   "client_side_token_generate_log_invalid_http_origins": true,
   "salts_expired_shutdown_hours": 12,
   "operator_type": "private",
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-private-operator"
 }

conf/local-e2e-public-config.json

@@ -44,5 +44,6 @@
   "salts_expired_shutdown_hours": 12,
   "operator_type": "public",
   "disable_optout_token": true,
-  "enable_remote_config": false
+  "enable_remote_config": false,
+  "uid_instance_id_prefix": "local-public-operator"
 }