Merge branch 'awslabs:master' into master

Author: silv-io

.github/workflows/privileged-run.yml

@@ -0,0 +1,81 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Build Intensive
+on:
+  push:
+    branches: [ master ]
+  pull_request_target:
+    branches: [ master ]
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  build-intensive:
+    timeout-minutes: 8
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
+        os: [ ubuntu-latest, macOS-latest, windows-latest ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-east-1
+          role-to-assume: arn:aws:iam::751999266872:role/GitHubWorkflows
+          role-session-name: myGitHubActions
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'corretto'
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Python and required pips
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+          pip install -r test_requirements.txt
+          pip install build
+
+      - name: Test with Pytest
+        run: |
+          python -m pytest
+
+      - name: Install .jar files
+        run: |
+          python -m build
+          python setup.py download_jars
+          python setup.py install
+
+      - name: Put words to sample stream
+        run: |
+          sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus
+
+      - name: Start KCL application (windows or ubuntu)
+        if: matrix.os  != 'macOS-latest'
+        run: |
+          timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi
+
+      - name: Start KCL application (macOS)
+        if: matrix.os  == 'macOS-latest'
+        run: |
+          brew install coreutils
+          gtimeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi

.github/workflows/run-unit-tests.yml

@@ -70,6 +70,11 @@ From the root of this repo, run:
     python setup.py download_jars
     python setup.py install
 
+If you'd like to override the default search location for the jars, you can set the `KCL_MVN_REPO_SEARCH_URL`
+environment variable to the location of the maven repository you'd like to use.
+
+    export KCL_MVN_REPO_SEARCH_URL=https://path/to/maven/repo
+
 Now the `amazon_kclpy` and [boto][boto] (used by the sample putter script) and required
 jars should be installed in your environment. To start the sample putter, run:
 

README.md

@@ -54,7 +54,10 @@ def get_kcl_jar_path():
     :rtype: str
     :return: The absolute path of the KCL jar files needed to run the MultiLangDaemon.
     '''
-    return ':'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar')))
+    if os.name == 'posix':
+        return ':'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar')))
+    else:
+        return ';'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar')))
 
 def get_kcl_classpath(properties=None, paths=[]):
     '''
@@ -81,7 +84,10 @@ def get_kcl_classpath(properties=None, paths=[]):
         # Add the dir that the props file is in
         dir_of_file = get_dir_of_file(properties)
         paths.append(dir_of_file)
-    return ":".join([p for p in paths if p != ''])
+    if os.name == 'posix':
+        return ":".join([p for p in paths if p != ''])
+    else:
+        return ";".join([p for p in paths if p != ''])
 
 def get_kcl_app_command(args, multi_lang_daemon_class, properties, log_configuration, paths=[]):
     '''

samples/amazon_kclpy_helper.py

@@ -115,7 +115,7 @@ def package_url(self, group_id, artifact_id, version):
         # Sample url:
         # https://search.maven.org/remotecontent?filepath=org/apache/httpcomponents/httpclient/4.2/httpclient-4.2.jar
         #
-        prefix = 'https://search.maven.org/remotecontent?filepath='
+        prefix = os.getenv("KCL_MVN_REPO_SEARCH_URL", 'https://search.maven.org/remotecontent?filepath=')
         return '{prefix}{path}/{artifact_id}/{version}/{dest}'.format(
                                         prefix=prefix,
                                         path='/'.join(group_id.split('.')),