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

169 removing instance_data 1

Browse Source
This commit is contained in:
smishchuk
2025-11-19 20:48:17 +03:00
parent 7cf6d8b195
commit a204345d44
3 changed files with 18 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/resources/instance.cfc
+16 -94
View File
@@ -99,17 +99,25 @@
<cfreturn representationOf("Instance not found or no permission to view").withStatus(404)/>
</cfif>
<!--- instanceData?.suspended
instanceData?.out?.monitoring?.allDashboards
instanceData?.params
instanceData?.out --->
<cfquery name="local.qCurrentState" result="local.result">
select
<m:field_set titleMapOut="local.currentStateTitleMap" lengthOut="local.fieldCount">
<m:field title="instance_state_uid">st.instance_state_uid::text as instance_state_uid</m:field>
<m:field title="v.">st.version</m:field>
<m:field title="creator_id">st.creator_id</m:field>
<m:field title="dt_state">to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state</m:field>
<m:field formatter=#request.castToBool#>st.is_test</m:field>
<m:field title="instance_operation_uid">st.instance_operation_uid::text as instance_operation_uid</m:field>
<m:field title="instance_data" formatter=#function(x){return (deserializeJson(x))}#>st.instance_data::text as instance_data</m:field>
<m:field>st.instance_state_uid::text as instance_state_uid</m:field>
<m:field>st.version</m:field>
<m:field>st.creator_id</m:field>
<m:field>to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state</m:field>
<m:field formatter=#request.castToBool#>st.is_test</m:field>
<m:field>st.instance_operation_uid::text as instance_operation_uid</m:field>
<m:field formatter=#function(x){return (deserializeJson(x))}#>st.instance_data::text as instance_data</m:field>
<m:field formatter=#function(x){return (deserializeJson(x))}#>st.instance_data->>'out' as out</m:field>
<m:field formatter=#function(x){return (deserializeJson(x))}#>st.instance_data->>'params' as params</m:field>
<m:field formatter=#function(x){return (x GT 0)}#>(st.instance_data->>'isDeleted')::boolean as is_deleted</m:field>
<m:field formatter=#function(x){return (x GT 0)}#>(st.instance_data->>'isSuspended')::boolean as isSuspended</m:field>
</m:field_set>
from instance_state st
where st.instance_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#local.qInstance.instance_uid#" null=#!isValid('guid',local.qInstance.instance_uid)#/>
@@ -314,93 +322,7 @@
<!--- ---------------------------------------------------------------------------------- --->
<cfset var out=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>
<cfset vaultUrl=""/>
<cfset local.instanceData="#deserializeJson(local.qCurrentState.instance_data)#"/>
<cfif structKeyExists(local.instanceData,"vaultUrl")>
<cfset vaultUrl=local.instanceData.vaultUrl/> <!--- v001 --->
<cfelseif structKeyExists(local.instanceData,"vault")>
<cfset vaultUrl=local.instanceData.vault.Url/><!--- v002 --->
</cfif>
<cfhttp method="post"
url="#request.vault_login_url#"
timeout="3"
charset="utf-8"
result="res"
>
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
<cfhttpparam type="BODY" value='{"role_id":"#request.vault_role_id#","secret_id":"#request.vault_secret_id#"}'/>
</cfhttp>
<cfset resData=#deserializeJson(res.filecontent)#/>
<cfset client_token=#resData.auth.client_token#/>
<cftry>
<cfhttp method="get"
url="#vaultUrl#"
timeout="3"
charset="utf-8"
result="cred"
>
<cfhttpparam type="HEADER" name="X-Vault-Token" value="#client_token#">
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
</cfhttp>
<cfif structKeyExists(local.instanceData,"vault") AND structKeyExists(local.instanceData.vault,"fields")>
<cfset "local.tempVaultData" = #deserializeJson(cred.filecontent).data.data#/>
<cfset "local.vaultData" = #structNew("linked")#/>
<!--- <cfset "out.vaultData" = #local.tempVaultData#/> --->
<cfloop collection=#local.instanceData.vault.fields# index="i">
<cfset var fld=local.instanceData.vault.fields[i]/>
<cfset local.vaultData[fld] = local.tempVaultData[fld]/>
</cfloop>
<cfelse>
<cfset "local.vaultData" = #deserializeJson(cred.filecontent).data.data#/>
</cfif>
<cfcatch type="ANY">
</cfcatch>
</cftry>
<cftry>
<cfif structKeyExists(local.instanceData,"subusers")>
<cfloop collection=#local.instanceData.subusers# item="i">
<cfset vaultUrl=#local.instanceData.subusers[i].vaultUrl#/>
<cfhttp method="get"
url="#vaultUrl#"
timeout="3"
charset="utf-8"
result="cred"
>
<cfhttpparam type="HEADER" name="X-Vault-Token" value="#client_token#">
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
</cfhttp>
<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#/>
</cfloop>
</cfif>
<cfcatch type="ANY"></cfcatch>
</cftry>
<cfcatch type="any">
</cfcatch>
</cftry> --->
<cfset var out=structNew("linked")/>
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
v1/resources/instance_ls.cfc
+1 -1
View File
@@ -283,7 +283,7 @@
limit #arguments.pageSize#
offset #arguments.pageSize*(arguments.page-1)#
</cfquery>
<!--- <cfdump var=#local.qRead#/><cfabort/> --->
<!---<cfdump var=#arguments#/><cfdump var=#local.qRead#/><cfabort/> --->
<cfquery name="local.qTotal">
select count(*) as cnt