Merge remote-tracking branch 'origin/main' into syw-UID2-4159-token-gen-code-refactoring-UserIdentity

Author: sunnywu

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.56.31</version>
+    <version>5.56.42</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

scripts/aws/syslog-ng/syslog-ng-client.conf

@@ -6,15 +6,6 @@ options {
     chain_hostnames(no);
 };
 
-source s_local {
-    system(); 
-    internal();
-};
-
-source s_dev_nitro {
-    pipe("/dev/nitro_enclaves");
-};
-
 source s_startup_file {
     file("/home/start.txt");
 };
@@ -24,8 +15,6 @@ destination d_syslog_tcp {
 };
 
 log {
-    source(s_local);
-    source(s_dev_nitro);
     source(s_startup_file);
     destination(d_syslog_tcp);
 };

scripts/aws/syslog-ng/syslog-ng-server.conf

@@ -9,11 +9,6 @@ options {
     chain_hostnames(yes);
 };
 
-source s_local {
-    system(); 
-    internal();
-};
-
 source s_network {
     network(
         ip(0.0.0.0)
@@ -31,7 +26,6 @@ destination d_file {
 };
 
 log {
-    source(s_local);
     source(s_network);
     destination(d_file);
 };

scripts/azure-aks/deployment/generate-deployment-artifacts.sh

@@ -91,7 +91,6 @@ if [[ $? -ne 0 ]]; then
 fi
 
 sed --in-place \
-  -e "s#allow_environment_variable_dropping := true#allow_environment_variable_dropping := false#g" \
   -e 's#{"pattern":"DEPLOYMENT_ENVIRONMENT=DEPLOYMENT_ENVIRONMENT_PLACEHOLDER","required":false,"strategy":"string"}#{"pattern":"DEPLOYMENT_ENVIRONMENT=.+","required":false,"strategy":"re2"}#g' \
   -e 's#{"pattern":"VAULT_NAME=VAULT_NAME_PLACEHOLDER","required":false,"strategy":"string"}#{"pattern":"VAULT_NAME=.+","required":false,"strategy":"re2"}#g' \
   -e 's#{"pattern":"OPERATOR_KEY_SECRET_NAME=OPERATOR_KEY_SECRET_NAME_PLACEHOLDER","required":false,"strategy":"string"}#{"pattern":"OPERATOR_KEY_SECRET_NAME=.+","required":false,"strategy":"re2"}#g' \
@@ -100,6 +99,7 @@ if [[ $? -ne 0 ]]; then
   echo "Failed to replace placeholders in policy file"
   exit 1
 fi
+cat ${INPUT_DIR}/generated.rego
 
 base64 -w0 < ${INPUT_DIR}/generated.rego > ${INPUT_DIR}/generated.rego.base64
 if [[ $? -ne 0 ]]; then