Merge branch 'branches/rudder/8.2'

Normation · Sep 6, 2024 · da2cfb9 · da2cfb9
2 parents 5025c05 + dfa733a
commit da2cfb9
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/api-authorizations/src/test/resources/authorizations_api/api_users.yml b/api-authorizations/src/test/resources/authorizations_api/api_users.yml
@@ -76,10 +76,10 @@ response:
             "id" : "user1",
             "name" : "user1",
             "token" : "generated-test-token",
-            "tokenGenerationDate" : "2023-12-12T13:12:12+01:00",
+            "tokenGenerationDate" : "2023-12-12T12:12:12Z",
             "kind" : "user",
             "description" : "API token for user 'user1'",
-            "creationDate" : "2023-12-12T13:12:12+01:00",
+            "creationDate" : "2023-12-12T12:12:12Z",
             "enabled" : true,
             "expirationDateDefined" : false
           }
@@ -107,4 +107,4 @@ response:
           "id" : "user1"
         }
       }
-    }
+    }
diff --git a/change-validation/src/test/resources/changevalidation_api/api_changerequest.yml b/change-validation/src/test/resources/changevalidation_api/api_changerequest.yml
@@ -651,7 +651,11 @@ response:
                     "group_real_nodes"
                   ],
                   "properties" : [
-                    {
+                     {
+                       "name" : "hiddenProp",
+                       "value" : "hidden prop value"
+                     },
+                     {               
                       "name" : "jsonParam",
                       "value" : {
                         "array" : [
@@ -708,6 +712,10 @@ response:
                   },
                   "properties" : {
                     "from" : [
+                      {
+                        "name" : "hiddenProp",
+                        "value" : "hidden prop value"
+                      },
                       {
                         "name" : "jsonParam",
                         "value" : {
@@ -792,6 +800,10 @@ response:
                   ],
                   "properties" : [
                     {
+                       "name" : "hiddenProp",
+                       "value" : "hidden prop value"
+                     },
+                     {
                       "name" : "jsonParam",
                       "value" : {
                         "array" : [
@@ -1704,6 +1716,10 @@ response:
                   ],
                   "properties" : [
                     {
+                      "name" : "hiddenProp", 
+                      "value" : "hidden prop value" 
+                    }, 
+                    { 
                       "name" : "jsonParam",
                       "value" : {
                         "array" : [
@@ -1760,6 +1776,10 @@ response:
                   },
                   "properties" : {
                     "from" : [
+                      {
+                        "name" : "hiddenProp",
+                        "value" : "hidden prop value"
+                      },
                       {
                         "name" : "jsonParam",
                         "value" : {
@@ -1843,6 +1863,10 @@ response:
                     "group_real_nodes"
                   ],
                   "properties" : [
+                    {
+                      "name" : "hiddenProp",
+                      "value" : "hidden prop value"
+                    },
                     {
                       "name" : "jsonParam",
                       "value" : {
@@ -2768,6 +2792,10 @@ response:
                     "group_real_nodes"
                   ],
                   "properties" : [
+                    {
+                      "name" : "hiddenProp",
+                      "value" : "hidden prop value"
+                    },
                     {
                       "name" : "jsonParam",
                       "value" : {
@@ -2825,6 +2853,10 @@ response:
                   },
                   "properties" : {
                     "from" : [
+                      {
+                        "name" : "hiddenProp",
+                        "value" : "hidden prop value"
+                      },
                       {
                         "name" : "jsonParam",
                         "value" : {
@@ -2908,6 +2940,10 @@ response:
                     "group_real_nodes"
                   ],
                   "properties" : [
+                    {
+                      "name" : "hiddenProp",
+                      "value" : "hidden prop value"
+                    },
                     {
                       "name" : "jsonParam",
                       "value" : {
@@ -3617,6 +3653,10 @@ response:
                       "group_real_nodes"
                     ],
                     "properties" : [
+                      {
+                        "name" : "hiddenProp",
+                        "value" : "hidden prop value"
+                      },
                       {
                         "name" : "jsonParam",
                         "value" : {