Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.4.x Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Sep 28, 2023 · 66be01a · 66be01a
2 parents a9d408d + 1766a60
commit 66be01a
Show file tree

Hide file tree

Showing 218 changed files with 12,903 additions and 5,011 deletions.
diff --git a/.github/workflows/build-and-publish-debug.yml b/.github/workflows/build-and-publish-debug.yml
@@ -18,6 +18,9 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.repository == 'hpcc-systems/HPCC-Platform'
     steps:
+      - name: Free additional disk space (remove Android SDK + Tools)
+        run: |
+          sudo rm -rf /usr/local/lib/android
       - name: Checkout
         uses: actions/checkout@v2
       - name: Build

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -18,6 +18,9 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.repository == 'hpcc-systems/HPCC-Platform'
     steps:
+      - name: Free additional disk space (remove Android SDK + Tools)
+        run: |
+          sudo rm -rf /usr/local/lib/android
       - name: Checkout
         uses: actions/checkout@v2
       - name: Build
@@ -41,6 +44,9 @@ jobs:
       matrix:
         engine: ['ml', 'gnn', 'gnn-gpu']
     steps:
+    - name: Free additional disk space (remove Android SDK + Tools)
+      run: |
+        sudo rm -rf /usr/local/lib/android
     - name: Checkout
       uses: actions/checkout@v2
     - name: Build
@@ -58,6 +64,9 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.repository == 'hpcc-systems/HPCC-Platform'
     steps:
+    - name: Free additional disk space (remove Android SDK + Tools)
+      run: |
+        sudo rm -rf /usr/local/lib/android
     - name: Checkout
       uses: actions/checkout@v2
     - name: Build

diff --git a/dali/base/dautils.cpp b/dali/base/dautils.cpp
@@ -17,6 +17,7 @@
 
 #include "platform.h"
 #include "jlib.hpp"
+#include "jcontainerized.hpp"
 #include "jstring.hpp"
 #include "jfile.hpp"
 #include "jmisc.hpp"
@@ -3628,7 +3629,7 @@ void remapGroupsToDafilesrv(IPropertyTree *file, INamedGroupStore *resolver)
                 CriticalBlock b(dafileSrvNodeCS);
                 if (nullptr == dafileSrvNode)
                 {
-                    auto externalService = getDafileServiceFromConfig("directio");
+                    auto externalService = k8s::getDafileServiceFromConfig("directio");
                     VStringBuffer dafilesrvEpStr("%s:%u", externalService.first.c_str(), externalService.second);
                     dafileSrvNode.setown(createINode(dafilesrvEpStr));
                 }

diff --git a/docs/EN_US/ContainerizedHPCC/ContainerizedMods/ConfigureValues.xml b/docs/EN_US/ContainerizedHPCC/ContainerizedMods/ConfigureValues.xml
@@ -1023,6 +1023,41 @@ thor:
         categories, including the "ecl" category, are read internally by
         system components and not exposed directly to ECL code.</para>
       </sect3>
+
+      <sect3 id="CV_CrossOriginRes">
+        <title>Cross Origin Resource Handling</title>
+
+        <para>Cross-origin resource sharing (CORS) is a mechanism for
+        integrating applications in different domains. CORS defines how client
+        web applications in one domain can interact with resources in another
+        domain. You can configure CORS support settings in the ESP section of
+        the values.yaml file as illustrated below: </para>
+
+        <programlisting>esp:
+- name: eclwatch
+  application: eclwatch
+  auth: ldap
+  replicas: 1
+  # The following 'corsAllowed' section is used to configure CORS support
+  #   origin - the origin to support CORS requests from
+  #   headers - the headers to allow for the given origin via CORS
+  #   methods - the HTTP methods to allow for the given origin via CORS
+  #
+  corsAllowed:
+  # origin starting with https will only allow https CORS
+  - origin: https://*.example2.com
+    headers:
+    - "X-Custom-Header"
+    methods:
+    - "GET"
+  # origin starting with http will allow http or https CORS
+  - origin: http://www.example.com
+    headers:
+    - "*"
+    methods:
+    - "GET"
+    - "POST" </programlisting>
+      </sect3>
     </sect2>
 
     <sect2>

diff --git a/docs/EN_US/ECLLanguageReference/ECLR_mods/WkFlo-FAILURE.xml b/docs/EN_US/ECLLanguageReference/ECLR_mods/WkFlo-FAILURE.xml
@@ -8,9 +8,10 @@
   </emphasis><emphasis role="bold">: FAILURE<indexterm>
       <primary>FAILURE</primary>
     </indexterm>(</emphasis><emphasis>handler</emphasis><emphasis
-  role="bold">) <indexterm>
+  role="bold">) [,LABEL(</emphasis><emphasis>text</emphasis><emphasis
+  role="bold">)]</emphasis><indexterm>
       <primary>FAILURE workflow service</primary>
-    </indexterm></emphasis>;</para>
+    </indexterm>;</para>
 
   <para><informaltable colsep="1" frame="all" rowsep="1">
       <tgroup cols="2">
@@ -36,6 +37,21 @@
 
             <entry>The action to run if the expression fails.</entry>
           </row>
+
+          <row>
+            <entry><emphasis role="bold">LABEL</emphasis></entry>
+
+            <entry>Optional. Defines the <emphasis>Text</emphasis> to display
+            for the workflow item in the Graph for the workunit. If omitted,
+            the code generator will deduce a label from the identifier being
+            defined.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis>text</emphasis></entry>
+
+            <entry>A string constant containing the text to display.</entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable></para>

diff --git a/docs/EN_US/ECLLanguageReference/ECLR_mods/WkFlo-INDEPENDENT.xml b/docs/EN_US/ECLLanguageReference/ECLR_mods/WkFlo-INDEPENDENT.xml
@@ -6,12 +6,13 @@
 
   <para><emphasis>attribute </emphasis>:= <emphasis>expression
   </emphasis><emphasis role="bold">: INDEPENDENT
-  [</emphasis><emphasis>(cluster)</emphasis><emphasis role="bold">]</emphasis>
-  <indexterm>
-      <primary>INDEPENDENT</primary>
-    </indexterm><indexterm>
+  [</emphasis><emphasis>(cluster </emphasis><emphasis
+  role="bold">[,LABEL(</emphasis><emphasis>text</emphasis><emphasis
+  role="bold">)]</emphasis>)<emphasis role="bold">]</emphasis>; <indexterm>
       <primary>INDEPENDENT workflow service</primary>
-    </indexterm>;</para>
+    </indexterm><indexterm>
+      <primary>INDEPENDENT</primary>
+    </indexterm></para>
 
   <para><informaltable colsep="1" frame="all" rowsep="1">
       <tgroup cols="2">
@@ -40,6 +41,21 @@
             <emphasis>attribute</emphasis> is run on the currently executing
             cluster.</entry>
           </row>
+
+          <row>
+            <entry><emphasis role="bold">LABEL</emphasis></entry>
+
+            <entry>Optional. Defines the <emphasis>Text</emphasis> to display
+            for the workflow item in the Graph for the workunit. If omitted,
+            the code generator will deduce a label from the identifier being
+            defined.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis>text</emphasis></entry>
+
+            <entry>A string constant containing the text to display.</entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable></para>
@@ -59,7 +75,7 @@
 
   <para>Example:</para>
 
-  <programlisting lang="ECL" role="runnable">I := RANDOM() : INDEPENDENT;  //calculated once, period
+  <programlisting lang="ECL" role="runnable">I := RANDOM() : INDEPENDENT(LABEL('CalcRandom'));  //calculated once, period
 G := RANDOM() : GLOBAL;       //calculated once in each graph
 
 ds := 

diff --git a/docs/EN_US/ECLLanguageReference/ECLR_mods/WkFlo-PERSIST.xml b/docs/EN_US/ECLLanguageReference/ECLR_mods/WkFlo-PERSIST.xml
@@ -23,9 +23,10 @@
     </indexterm> | MULTIPLE<indexterm>
       <primary>MULTIPLE</primary>
     </indexterm>[(</emphasis><emphasis>count</emphasis><emphasis
-  role="bold">)]] ) <indexterm>
+  role="bold">)]] [,LABEL(</emphasis><emphasis>text</emphasis><emphasis
+  role="bold">)])</emphasis>; <indexterm>
       <primary>PERSIST workflow service</primary>
-    </indexterm></emphasis>;</para>
+    </indexterm></para>
 
   <para><informaltable colsep="1" frame="all" rowsep="1">
       <tgroup cols="2">
@@ -155,6 +156,21 @@
             omitted, the system default is used. If set to -1, then an
             unlimited number are kept.</entry>
           </row>
+
+          <row>
+            <entry><emphasis role="bold">LABEL</emphasis></entry>
+
+            <entry>Optional. Defines the <emphasis>Text</emphasis> to display
+            for the workflow item in the Graph for the workunit. If omitted,
+            the code generator will deduce a label from the identifier being
+            defined.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis>text</emphasis></entry>
+
+            <entry>A string constant containing the text to display.</entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable></para>

diff --git a/docs/EN_US/ECLLanguageReference/ECLR_mods/WkFlo-SUCCESS.xml b/docs/EN_US/ECLLanguageReference/ECLR_mods/WkFlo-SUCCESS.xml
@@ -8,9 +8,10 @@
   </emphasis><emphasis role="bold">: SUCCESS<indexterm>
       <primary>SUCCESS</primary>
     </indexterm>(</emphasis><emphasis>handler</emphasis><emphasis
-  role="bold">) </emphasis><indexterm>
+  role="bold">) [,LABEL(</emphasis><emphasis>text</emphasis><emphasis
+  role="bold">)]</emphasis>; <indexterm>
       <primary>SUCCESS workflow service</primary>
-    </indexterm>;</para>
+    </indexterm></para>
 
   <para><informaltable colsep="1" frame="all" rowsep="1">
       <tgroup cols="2">
@@ -36,6 +37,21 @@
 
             <entry>The action to run if the expression succeeds.</entry>
           </row>
+
+          <row>
+            <entry><emphasis role="bold">LABEL</emphasis></entry>
+
+            <entry>Optional. Defines the <emphasis>Text</emphasis> to display
+            for the workflow item in the Graph for the workunit. If omitted,
+            the code generator will deduce a label from the identifier being
+            defined.</entry>
+          </row>
+
+          <row>
+            <entry><emphasis>text</emphasis></entry>
+
+            <entry>A string constant containing the text to display.</entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable></para>