removed runtime_version dependency

apigee · Mar 3, 2021 · ab25e77 · ab25e77
1 parent c158f67
commit ab25e77
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/cmd/provision/proxies/remote-service-gcp/apiproxy/policies/Products-Callout.xml b/cmd/provision/proxies/remote-service-gcp/apiproxy/policies/Products-Callout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<JavaCallout async="false" continueOnError="false" enabled="true" name="Products-Callout">
+<JavaCallout async="false" continueOnError="true" enabled="true" name="Products-Callout">
     <DisplayName>Products Callout</DisplayName>
     <Properties>
         <Property name="products.filter.attributes">apigee-remote-service-targets</Property>

diff --git a/cmd/provision/proxies/remote-service-gcp/apiproxy/proxies/default.xml b/cmd/provision/proxies/remote-service-gcp/apiproxy/proxies/default.xml
@@ -88,16 +88,12 @@
                     <Condition>lookupcache.Lookup-Products.cachehit = false</Condition>
                 </Step>
                 <Step>
-                    <Name>Get-Runtime-Version</Name>
+                    <Name>Products-Callout</Name>
                     <Condition>lookupcache.Lookup-Products.cachehit = false</Condition>
                 </Step>
                 <Step>
                     <Name>Products-Callout-Legacy</Name>
-                    <Condition>(lookupcache.Lookup-Products.cachehit = false) and (runtime_version LesserThan "1.4.0")</Condition>
-                </Step>
-                <Step>
-                    <Name>Products-Callout</Name>
-                    <Condition>(lookupcache.Lookup-Products.cachehit = false) and (runtime_version GreaterThanOrEquals "1.4.0")</Condition>
+                    <Condition>javacallout.Products-Callout.failed = true</Condition>
                 </Step>
                 <Step>
                     <Name>Set-Product-Cache</Name>

diff --git a/cmd/provision/proxies/remote-service-gcp/apiproxy/resources/py/get-runtime-version.py b/cmd/provision/proxies/remote-service-gcp/apiproxy/resources/py/get-runtime-version.py
@@ -17,6 +17,7 @@
 version = os.environ.get("APIGEE_DPCOLOR", "")
 
 if len(version) > 0:
-    flow.setVariable("runtime_version", ".".join(version[1:4]))
+    dig = [c for c in version if c.isdigit()]
+    flow.setVariable("runtime_version", ".".join(dig[0:3]))
 else:
     flow.setVariable("runtime_version", "unknown")