091 state format updatetd - vault

v1/resources/instance.cfc

@@ -135,16 +135,18 @@
 			AND 1=0
 			</cfif>
 			order by so.svc_operation_id 
-		</cfquery>
-		
-		
-		<cfset var out=structNew("linked")/>
+		</cfquery>		
 		
+		<cfset var out=structNew("linked")/>		
 		
 		<cftry><!--- *** надо бы такие вещи делать асинхронно --->
 			<cfset vaultUrl=""/>
 			<cfset instanceData="#deserializeJson(qCurrentState.instance_data)#"/>
-			<cfset vaultUrl=instanceData.vaultUrl/>	
+				<cfif structKeyExists(instanceData,"vaultUrl")>
+					<cfset vaultUrl=instanceData.vaultUrl/>	<!--- v001 --->
+				<cfelseif structKeyExists(instanceData,"vault")>
+					<cfset vaultUrl=instanceData.vault.Url/><!--- v002 --->	
+				</cfif>
 			
 			<cfhttp method="post" 
 				url="https://vault.adl.nubes.ru:8200/v1/auth/approle/login" 
@@ -168,10 +170,22 @@
 					<cfhttpparam type="HEADER" name="X-Vault-Token" value="#client_token#">
 				</cfhttp>
 				
-				<cfset "out.vaultData" = #deserializeJson(cred.filecontent).data.data#/>
+				<!--- *** костыль для перехода от формата v001 к v002 --->
+				<cfif structKeyExists(instanceData,"vault") AND structKeyExists(instanceData.vault,"fields")>					
+					<cfset local.tempVaultData = #deserializeJson(cred.filecontent).data.data#/>
+					<cfset "out.vaultData" = #structNew("linked")#/>
+					<!--- <cfset "out.vaultData" = #local.tempVaultData#/> --->
+					<cfloop collection=#instanceData.vault.fields# index="i">
+						<cfset var fld=instanceData.vault.fields[i]/>
+						<cfset out.vaultData[fld] = local.tempVaultData[fld]/>
+					</cfloop>
+				<cfelse>
+					<cfset "out.vaultData" = #deserializeJson(cred.filecontent).data.data#/>
+				</cfif>
+				
 				<cfcatch type="ANY">
-					 <!--- <cfreturn representationOf(cfcatch).withStatus(500)/>  --->
-				<!--- <span class="err">#cfcatch.message# #cfcatch.detail#</span> ---></cfcatch>
+					  <!--- <cfreturn representationOf(cfcatch).withStatus(500)/>  ---> 
+				</cfcatch>
 			</cftry>
 			
 			<cftry>
@@ -194,15 +208,13 @@
 						<cfdump var=#deserializeJson(cred.filecontent).data.data#/>	 --->					
 					</cfloop>
 				</cfif>
-				<cfcatch type="ANY"><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---> </cfcatch>
+				<cfcatch type="ANY"><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---></cfcatch>
 			</cftry>
 			
-		<cfcatch type="any">
-			<!--- <cfrethrow/> ---><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---> 
-		</cfcatch>
-	</cftry>
-		
-		
+			<cfcatch type="any">
+				<!--- <cfrethrow/> ---><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---> 
+			</cfcatch>
+		</cftry>		
 		
 
 		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>