smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

091 state format updatetd - vault

Browse Source
This commit is contained in:
msyu
2024-12-05 15:45:22 +03:00
parent d907de6289
commit b9826a7a0c
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/resources/instance.cfc
+27 -15
View File
@@ -135,16 +135,18 @@
AND 1=0 AND 1=0
</cfif> </cfif>
order by so.svc_operation_id order by so.svc_operation_id
</cfquery> </cfquery>
<cfset var out=structNew("linked")/>
<cfset var out=structNew("linked")/>
<cftry><!--- *** надо бы такие вещи делать асинхронно ---> <cftry><!--- *** надо бы такие вещи делать асинхронно --->
<cfset vaultUrl=""/> <cfset vaultUrl=""/>
<cfset instanceData="#deserializeJson(qCurrentState.instance_data)#"/> <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" <cfhttp method="post"
url="https://vault.adl.nubes.ru:8200/v1/auth/approle/login" 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#"> <cfhttpparam type="HEADER" name="X-Vault-Token" value="#client_token#">
</cfhttp> </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"> <cfcatch type="ANY">
<!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---> <!--- <cfreturn representationOf(cfcatch).withStatus(500)/> --->
<!--- <span class="err">#cfcatch.message# #cfcatch.detail#</span> ---></cfcatch> </cfcatch>
</cftry> </cftry>
<cftry> <cftry>
@@ -194,15 +208,13 @@
<cfdump var=#deserializeJson(cred.filecontent).data.data#/> ---> <cfdump var=#deserializeJson(cred.filecontent).data.data#/> --->
</cfloop> </cfloop>
</cfif> </cfif>
<cfcatch type="ANY"><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---> </cfcatch> <cfcatch type="ANY"><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---></cfcatch>
</cftry> </cftry>
<cfcatch type="any"> <cfcatch type="any">
<!--- <cfrethrow/> ---><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> ---> <!--- <cfrethrow/> ---><!--- <cfreturn representationOf(cfcatch).withStatus(500)/> --->
</cfcatch> </cfcatch>
</cftry> </cftry>
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/> <cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>