165 instance vaultData removed

v1/Application.cfc

@@ -51,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="svc-api";
-		variables.framework.docs.APIVersion="0.164";   /*$ git config --global --unset user.password*/
+		variables.framework.docs.APIVersion="0.165";   /*$ git config --global --unset user.password*/
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 

v1/resources/instance.cfc

@@ -315,12 +315,12 @@
 
 		
 		<cfset var out=structNew("linked")/>		
-		<cfset "local.vaultData"=structNew("linked")/>
+		<!--- <cfset "local.vaultData"=structNew("linked")/>
 		<cfif isStruct(local.instanceData) AND structKeyExists(local.instanceData,"vault") AND structKeyExists(local.instanceData.vault,"fields")>
 			<cfset "local.vaultFields" = #local.instanceData.vault.fields#/>
 		</cfif>
 		
-		<cftry><!--- *** надо бы такие вещи делать асинхронно --->
+		<cftry>
 			<cfset vaultUrl=""/>
 			<cfset local.instanceData="#deserializeJson(local.qCurrentState.instance_data)#"/>
 				<cfif structKeyExists(local.instanceData,"vaultUrl")>
@@ -336,11 +336,11 @@
 				result="res"
 			>
 				<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
-				<!--- <cfhttpparam type="BODY" value='{"role_id":"df05e620-f3a3-8c6a-361d-a96e3b0adeac","secret_id":"585fbb48-ef97-b845-d414-b8831a27d5b6"}'/> --->
+
 				<cfhttpparam type="BODY" value='{"role_id":"#request.vault_role_id#","secret_id":"#request.vault_secret_id#"}'/>
 			</cfhttp>
 			<cfset resData=#deserializeJson(res.filecontent)#/>
-			<!--- <cfdump var=#res#/> --->
+
 			<cfset client_token=#resData.auth.client_token#/>	
 			
 			<cftry>	
@@ -354,7 +354,7 @@
 					<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
 				</cfhttp>
 				
-				<!--- *** костыль для перехода от формата v001 к v002 --->
+
 				
 				<cfif structKeyExists(local.instanceData,"vault") AND structKeyExists(local.instanceData.vault,"fields")>					
 					<cfset "local.tempVaultData" = #deserializeJson(cred.filecontent).data.data#/>
@@ -370,7 +370,7 @@
 				</cfif>
 				
 				<cfcatch type="ANY">
-					  <!--- <cfreturn representationOf(cfcatch).withStatus(500)/>  ---> 
+
 				</cfcatch>
 			</cftry>
 			
@@ -387,21 +387,20 @@
 							<cfhttpparam type="HEADER" name="X-Vault-Token" value="#client_token#">
 							<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
 						</cfhttp>
-						<!--- <cfdump var=#deserializeJson(cred.filecontent)#/> --->
+
 						<cfset "local.vaultData.subusers[i].userName"=#local.instanceData.subusers[i].userName#/>
 						<cfset "local.vaultData.subusers[i].subUserAccess"=#local.instanceData.subusers[i].subUserAccess#/>
 						<cfset "local.vaultData.subusers[i].vaultData"=#deserializeJson(cred.filecontent).data.data#/>
-						<!--- #local.instanceData.subusers[i].userName# (#local.instanceData.subusers[i].subUserAccess#)
-						<cfdump var=#deserializeJson(cred.filecontent).data.data#/>	 --->					
+			
 					</cfloop>
 				</cfif>
-				<cfcatch type="ANY"><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---></cfcatch>
+				<cfcatch type="ANY"></cfcatch>
 			</cftry>
 			
 			<cfcatch type="any">
-				<!--- <cfrethrow/> ---><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---> 
+				
 			</cfcatch>
-		</cftry>		
+		</cftry>	 --->	
 		
 
 		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
@@ -412,7 +411,7 @@
 		<!--- <cfset "out.instance.uptime"=(local.qOperation.is_successful GT 0) ? local.qOperation.seconds_passed : 0/> --->
 		<cfset "out.instance.isCreated"=local.isCreated/>
 		<cfset "out.instance.isDeleted"=local.qCurrentState.is_deleted GT 0/>
-		<cfset "out.instance.vaultData"=local.vaultData/>
+		<!--- <cfset "out.instance.vaultData"=local.vaultData/> --->
 		
 		 <cfset "out.instance.state" = (local.qCurrentState.recordCount GT 0) ? this.helper.appendRecord(structNew("linked"), "", local.currentStateTitleMap, local.qCurrentState, this.helper.snake2camel) : {}/>