Merge branch 'main' of https://github.com/apache/cloudstack-go into fix-vm-usage-history

Pearl1594 · Pearl1594 · commit f89b2c7d7f00 · 2025-01-03T08:29:44.000-05:00
diff --git a/test/testdata/UserService.json b/test/testdata/UserService.json
@@ -149,5 +149,13 @@
         "secretkey": "secret-key"
       }
     }
+  },
+  "registerUserKeys": {
+    "registeruserkeysresponse": {
+      "userkeys": {
+        "apikey": "hNfJi2dO5kwD6gTtYoifqu_4CSI3FcTtxc4MydW24PdJalv8mfTGsf425twAdLrIKX5IewfqIfYDEumO6-yRaw",
+        "secretkey": "zV8kAYlyY4H-rEDO-Ot-VVPjKteVcU4haQcdRarte9wuOUhko3uzcnnFqNii8xifcpbe0eWR6IHAXjVGB2m1Hw"
+      }
+    } 
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -149,5 +149,13 @@`
`149`	`149`	`"secretkey": "secret-key"`
`150`	`150`	`}`
`151`	`151`	`}`
	`152`	`+ },`
	`153`	`+ "registerUserKeys": {`
	`154`	`+ "registeruserkeysresponse": {`
	`155`	`+ "userkeys": {`
	`156`	`+ "apikey": "hNfJi2dO5kwD6gTtYoifqu_4CSI3FcTtxc4MydW24PdJalv8mfTGsf425twAdLrIKX5IewfqIfYDEumO6-yRaw",`
	`157`	`+ "secretkey": "zV8kAYlyY4H-rEDO-Ot-VVPjKteVcU4haQcdRarte9wuOUhko3uzcnnFqNii8xifcpbe0eWR6IHAXjVGB2m1Hw"`
	`158`	`+ }`
	`159`	`+ }`
`152`	`160`	`}`
`153`		`-}`
	`161`	`+}`