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

Merge pull request 'dev' (#7) from dev into test

Browse Source 
Reviewed-on: https://gitea.mgmt.nubes.ru/deck/svc-api/pulls/7
This commit is contained in:
vzaytsev
2025-01-23 10:54:39 +03:00
parent 4a34e9f26a 790e51cd25
commit 9f6bbf024f
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Dockerfile
+5 -4
View File
@@ -14,8 +14,8 @@ RUN apk add argon2-dev ; \
#RUN sed -i 's~<url-pattern>/index.cfml/\*</url-pattern>~<url-pattern>/index.cfml/*</url-pattern><url-pattern>/api/v1/index.cfm/*</url-pattern>~' /usr/lib/serverHome/WEB-INF/web.xml #RUN sed -i 's~<url-pattern>/index.cfml/\*</url-pattern>~<url-pattern>/index.cfml/*</url-pattern><url-pattern>/api/v1/index.cfm/*</url-pattern>~' /usr/lib/serverHome/WEB-INF/web.xml
RUN sed -i 's~"debug"~"debugBDF952SPR"~' /app/index.cfm #RUN sed -i 's~"debug"~"debugBDF952SPR"~' /app/index.cfm
RUN sed -i 's~"#url.debug#"~"#url.debugBDF952SPR#"~' /app/index.cfm #RUN sed -i 's~"#url.debug#"~"#url.debugBDF952SPR#"~' /app/index.cfm
WORKDIR ${APP_DIR} WORKDIR ${APP_DIR}
@@ -31,7 +31,8 @@ RUN sed -i 's~"debug"~"debugBDF952SPR"~' /app/index.cfm && \
box touch /usr/lib/serverHome/logs/access.txt && \ box touch /usr/lib/serverHome/logs/access.txt && \
wget https://ext.lucee.org/org.postgresql.jdbc-42.6.0.lex -P /usr/lib/serverHome/WEB-INF/lucee-server/deploy && \ wget https://ext.lucee.org/org.postgresql.jdbc-42.6.0.lex -P /usr/lib/serverHome/WEB-INF/lucee-server/deploy && \
ln -sf /dev/stdout /usr/lib/serverHome/logs/access.txt && \ ln -sf /dev/stdout /usr/lib/serverHome/logs/access.txt && \
ln -sf /dev/stdout /usr/lib/serverHome/logs/server.out.txt && \ ln -sf /dev/stdout /usr/lib/serverHome/logs/server.out.txt
ln -sf /dev/stdout /usr/lib/serverHome/WEB-INF/lucee-server/context/logs/application.log # && \
# ln -sf /dev/stdout /usr/lib/serverHome/WEB-INF/lucee-server/context/logs/application.log
EXPOSE 8080 EXPOSE 8080
v1/Application.cfc
+2 -2
View File
@@ -51,7 +51,7 @@
//variables.framework.docs={}; //variables.framework.docs={};
variables.framework.docs.APIName="Deck API"; variables.framework.docs.APIName="Deck API";
variables.framework.docs.APIVersion="0.043"; variables.framework.docs.APIVersion="0.044";
variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders = structNew();
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
@@ -100,7 +100,7 @@
<cffunction name="locateIamService"><!--- *** архитектурный колхоз ---> <cffunction name="locateIamService"><!--- *** архитектурный колхоз --->
<cfloop list="https://deck-test.ngcloud.ru/api/v1/user,https://deck.ngcloud.ru/api/v1/user" index="serviceUrl"><!--- *** начиная с девелоперского ---> <cfloop list="https://deck-dev.ngcloud.ru/api/v1/user,https://deck-test.ngcloud.ru/api/v1/user,https://deck.ngcloud.ru/api/v1/user" index="serviceUrl"><!--- *** начиная с девелоперского --->
<cftry> <cftry>
<cfhttp url=#serviceUrl# method="OPTIONS" result="resp" timeout=1/> <cfhttp url=#serviceUrl# method="OPTIONS" result="resp" timeout=1/>
v1/resources/instance_operation_cfs_param_ls.cfc
+1 -1
View File
@@ -226,7 +226,7 @@
</cfif> </cfif>
<cfif len(arguments.paramValue) AND len(qSvcOperationCfsParam.regex) AND reFind(qSvcOperationCfsParam.regex,arguments.paramValue) EQ 0> <cfif len(arguments.paramValue) AND len(qSvcOperationCfsParam.regex) AND reFind(qSvcOperationCfsParam.regex,arguments.paramValue) EQ 0>
<!--- <cfreturn 'Pattern "#qSvcOperationCfsParam.regex#" does not match "#arguments.paramValue#"'/> ---> <!--- <cfreturn 'Pattern "#qSvcOperationCfsParam.regex#" does not match "#arguments.paramValue#"'/> --->
<cfthrow type="invalidParamValue" message='Parameter "#qSvcOperationCfsParam.svc_operation_cfs_param#" value "#arguments.paramValue#" does not match pattern "#qSvcOperationCfsParam.regex#" '/> <cfthrow type="invalidParamValue" message='Parameter "#qSvcOperationCfsParam.svc_operation_cfs_param#" value "#arguments.paramValue#" does not match pattern "#qSvcOperationCfsParam.regex#" '/>
</cfif> </cfif>
<!--- *** интересно, как мы ухитряемся проверить уникальность параметра, если он относится к операции, а не к экземпляру. Нам-то нужна уникальность для стейта (и то, скорее, единовременная, и интересовать будут только успешные операции) ---> <!--- *** интересно, как мы ухитряемся проверить уникальность параметра, если он относится к операции, а не к экземпляру. Нам-то нужна уникальность для стейта (и то, скорее, единовременная, и интересовать будут только успешные операции) --->
v1/resources/throw.cfc
+7
View File
@@ -0,0 +1,7 @@
<cfcomponent extends="taffy.core.resource" taffy:uri="/throw">
<cffunction name="get" hint="Имитация ошибки 500">
<cfthrow detail="Error thrown for test" message="Artifical error"/>
</cffunction>
</cfcomponent>