Merge pull request #229 from ds-wizard/hotfix/4.10.2

Hotfix 4.10.2

.github/workflows/build.yml

@@ -193,3 +193,126 @@ jobs:
  push: true
  tags: ${{ steps.meta-public.outputs.tags }}
  labels: ${{ steps.meta-public.outputs.labels }}
+
+ lambda-docker:
+ name: Docker (lambda)
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ package:
+ - dsw-document-worker
+
+ env:
+ PUBLIC_IMAGE_PREFIX: 'datastewardshipwizard'
+ DOCKER_META_CONTEXT: '.'
+ DOCKER_META_FILE: './packages/${{ matrix.package }}/lambda.Dockerfile'
+ DOCKER_META_PLATFORMS: 'linux/amd64'
+ DOCKER_META_SUFFIX_LAMBDA: '-lambda'
+
+ steps:
+ - name: Check out repository
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v3
+
+ - name: Set up Docker Buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v3
+
+ - name: Get Docker image name
+ id: docker-image-name
+ run: |
+ cd packages/${{ matrix.package }}
+ NAME=$(make docker-image-name)
+ echo "NAME=$NAME" >> $GITHUB_OUTPUT
+
+ - name: Create build info
+ run: |
+ bash scripts/build-info.sh
+
+ # TEST DOCKER IMAGE BUILD
+ - name: Docker meta [test]
+ id: meta-test
+ uses: docker/metadata-action@v5
+ with:
+ images: |
+ ${{ env.PUBLIC_IMAGE_PREFIX }}/${{ steps.docker-image-name.outputs.NAME }}
+ tags: |
+ type=sha
+ flavor: |
+ suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
+
+ - name: Docker build [test]
+ uses: docker/build-push-action@v6
+ with:
+ context: ${{ env.DOCKER_META_CONTEXT }}
+ file: ${{ env.DOCKER_META_FILE }}
+ platforms: ${{ env.DOCKER_META_PLATFORMS }}
+ push: false
+ tags: ${{ steps.meta-test.outputs.tags }}
+ labels: ${{ steps.meta-test.outputs.labels }}
+
+ # PREPARE
+ - name: Docker login [docker.io]
+ if: github.event_name != 'pull_request'
+ uses: docker/login-action@v3
+ with:
+ username: ${{ secrets.DOCKER_HUB_USERNAME }}
+ password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+ # DEVELOPMENT IMAGES
+ - name: Docker meta [dev]
+ id: meta-dev
+ if: github.event_name != 'pull_request'
+ uses: docker/metadata-action@v5
+ with:
+ images: |
+ ${{ secrets.DOCKER_HUB_USERNAME }}/${{ steps.docker-image-name.outputs.NAME }}
+ tags: |
+ type=ref,event=branch
+ flavor: |
+ suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
+
+ - name: Docker build+push [dev]
+ uses: docker/build-push-action@v6
+ if: github.event_name != 'pull_request' && steps.meta-dev.outputs.tags != ''
+ with:
+ context: ${{ env.DOCKER_META_CONTEXT }}
+ file: ${{ env.DOCKER_META_FILE }}
+ platforms: ${{ env.DOCKER_META_PLATFORMS }}
+ push: true
+ tags: ${{ steps.meta-dev.outputs.tags }}
+ labels: ${{ steps.meta-dev.outputs.labels }}
+
+ # PUBLIC IMAGES
+ - name: Docker meta [public]
+ id: meta-public
+ if: github.event_name != 'pull_request'
+ uses: docker/metadata-action@v5
+ with:
+ images: |
+ ${{ env.PUBLIC_IMAGE_PREFIX }}/${{ steps.docker-image-name.outputs.NAME }}
+ ${{ secrets.DOCKER_HUB_USERNAME }}/${{ steps.docker-image-name.outputs.NAME }}
+ tags: |
+ type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+ type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
+ flavor: |
+ suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
+
+ - name: Docker build+push [public]
+ uses: docker/build-push-action@v6
+ if: github.event_name != 'pull_request' && steps.meta-public.outputs.tags != ''
+ with:
+ context: ${{ env.DOCKER_META_CONTEXT }}
+ file: ${{ env.DOCKER_META_FILE }}
+ platforms: ${{ env.DOCKER_META_PLATFORMS }}
+ push: true
+ tags: ${{ steps.meta-public.outputs.tags }}
+ labels: ${{ steps.meta-public.outputs.labels }}

.github/workflows/lambda.yml

@@ -46,125 +46,3 @@ jobs:
  with:
  name: ${{ matrix.package }}-lambda.zip
  path: packages/dsw-${{ matrix.package }}/${{ matrix.package }}-lambda.zip
-
- docker:
- name: Lambda Docker Image
- runs-on: ubuntu-latest
-
- strategy:
- fail-fast: false
- matrix:
- package:
- - dsw-document-worker
-
- env:
- PUBLIC_IMAGE_PREFIX: 'datastewardshipwizard'
- DOCKER_META_CONTEXT: '.'
- DOCKER_META_FILE: './packages/${{ matrix.package }}/lambda.Dockerfile'
- DOCKER_META_PLATFORMS: 'linux/amd64'
- DOCKER_META_SUFFIX_LAMBDA: '-lambda'
-
- steps:
- - name: Check out repository
- uses: actions/checkout@v4
- with:
- fetch-depth: 0
-
- - name: Set up QEMU
- uses: docker/setup-qemu-action@v3
-
- - name: Set up Docker Buildx
- id: buildx
- uses: docker/setup-buildx-action@v3
-
- - name: Get Docker image name
- id: docker-image-name
- run: |
- cd packages/${{ matrix.package }}
- NAME=$(make docker-image-name)
- echo "NAME=$NAME" >> $GITHUB_OUTPUT
-
- - name: Create build info
- run: |
- bash scripts/build-info.sh
-
- # TEST DOCKER IMAGE BUILD
- - name: Docker meta [test]
- id: meta-test
- uses: docker/metadata-action@v5
- with:
- images: |
- ${{ env.PUBLIC_IMAGE_PREFIX }}/${{ steps.docker-image-name.outputs.NAME }}
- tags: |
- type=sha
- flavor: |
- suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
-
- - name: Docker build [test]
- uses: docker/build-push-action@v6
- with:
- context: ${{ env.DOCKER_META_CONTEXT }}
- file: ${{ env.DOCKER_META_FILE }}
- platforms: ${{ env.DOCKER_META_PLATFORMS }}
- push: false
- tags: ${{ steps.meta-test.outputs.tags }}
- labels: ${{ steps.meta-test.outputs.labels }}
-
- # PREPARE
- - name: Docker login [docker.io]
- if: github.event_name != 'pull_request'
- uses: docker/login-action@v3
- with:
- username: ${{ secrets.DOCKER_HUB_USERNAME }}
- password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
- # DEVELOPMENT IMAGES
- - name: Docker meta [dev]
- id: meta-dev
- if: github.event_name != 'pull_request'
- uses: docker/metadata-action@v5
- with:
- images: |
- ${{ secrets.DOCKER_HUB_USERNAME }}/${{ steps.docker-image-name.outputs.NAME }}
- tags: |
- type=ref,event=branch
- flavor: |
- suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
-
- - name: Docker build+push [dev]
- uses: docker/build-push-action@v6
- if: github.event_name != 'pull_request' && steps.meta-dev.outputs.tags != ''
- with:
- context: ${{ env.DOCKER_META_CONTEXT }}
- file: ${{ env.DOCKER_META_FILE }}
- platforms: ${{ env.DOCKER_META_PLATFORMS }}
- push: true
- tags: ${{ steps.meta-dev.outputs.tags }}
- labels: ${{ steps.meta-dev.outputs.labels }}
-
- # PUBLIC IMAGES
- - name: Docker meta [public]
- id: meta-public
- if: github.event_name != 'pull_request'
- uses: docker/metadata-action@v5
- with:
- images: |
- ${{ env.PUBLIC_IMAGE_PREFIX }}/${{ steps.docker-image-name.outputs.NAME }}
- tags: |
- type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
- type=semver,pattern={{version}}
- type=semver,pattern={{major}}.{{minor}}
- type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
- flavor: |
- suffix=${{ env.DOCKER_META_SUFFIX_LAMBDA }}
-
- - name: Docker build+push [public]
- uses: docker/build-push-action@v6
- if: github.event_name != 'pull_request' && steps.meta-public.outputs.tags != ''
- with:
- context: ${{ env.DOCKER_META_CONTEXT }}
- file: ${{ env.DOCKER_META_FILE }}
- platforms: ${{ env.DOCKER_META_PLATFORMS }}
- push: true
- tags: ${{ steps.meta-public.outputs.tags }}
- labels: ${{ steps.meta-public.outputs.labels }}

packages/dsw-command-queue/CHANGELOG.md

@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.10.2]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.1]
 
 Released for version consistency with other DSW tools.
@@ -241,3 +245,4 @@ Released for version consistency with other DSW tools.
 [4.9.1]: /../../tree/v4.9.1
 [4.10.0]: /../../tree/v4.10.0
 [4.10.1]: /../../tree/v4.10.1
+[4.10.2]: /../../tree/v4.10.2

packages/dsw-command-queue/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-command-queue'
-version = "4.10.1"
+version = "4.10.2"
 description = 'Library for working with command queue and persistent commands'
 readme = 'README.md'
 keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
@@ -25,7 +25,7 @@ classifiers = [
 requires-python = '>=3.10, <4'
 dependencies = [
  # DSW
- "dsw-database==4.10.1",
+ "dsw-database==4.10.2",
 ]
 
 [project.urls]

packages/dsw-config/CHANGELOG.md

@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.10.2]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.1]
 
 Released for version consistency with other DSW tools.
@@ -253,3 +257,4 @@ Released for version consistency with other DSW tools.
 [4.9.1]: /../../tree/v4.9.1
 [4.10.0]: /../../tree/v4.10.0
 [4.10.1]: /../../tree/v4.10.1
+[4.10.2]: /../../tree/v4.10.2

packages/dsw-config/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-config'
-version = "4.10.1"
+version = "4.10.2"
 description = 'Library for DSW config manipulation'
 readme = 'README.md'
 keywords = ['dsw', 'config', 'yaml', 'parser']

packages/dsw-data-seeder/CHANGELOG.md

@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.10.2]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.1]
 
 Released for version consistency with other DSW tools.
@@ -297,3 +301,4 @@ Released for version consistency with other DSW tools.
 [4.9.1]: /../../tree/v4.9.1
 [4.10.0]: /../../tree/v4.10.0
 [4.10.1]: /../../tree/v4.10.1
+[4.10.2]: /../../tree/v4.10.2

packages/dsw-data-seeder/dsw/data_seeder/consts.py

@@ -6,7 +6,7 @@
 DEFAULT_PLACEHOLDER = '<<|TENANT-ID|>>'
 NULL_UUID = '00000000-0000-0000-0000-000000000000'
 PROG_NAME = 'dsw-data-seeder'
-VERSION = '4.10.0'
+VERSION = '4.10.2'
 
 VAR_APP_CONFIG_PATH = 'APPLICATION_CONFIG_PATH'
 VAR_WORKDIR_PATH = 'WORKDIR_PATH'

packages/dsw-data-seeder/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-data-seeder'
-version = "4.10.1"
+version = "4.10.2"
 description = 'Worker for seeding DSW data'
 readme = 'README.md'
 keywords = ['data', 'database', 'seed', 'storage']
@@ -29,10 +29,10 @@ dependencies = [
  'sentry-sdk',
  'tenacity',
  # DSW
- "dsw-command-queue==4.10.1",
- "dsw-config==4.10.1",
- "dsw-database==4.10.1",
- "dsw-storage==4.10.1",
+ "dsw-command-queue==4.10.2",
+ "dsw-config==4.10.2",
+ "dsw-database==4.10.2",
+ "dsw-storage==4.10.2",
 ]
 
 [project.urls]

packages/dsw-database/CHANGELOG.md

@@ -8,6 +8,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
 
+## [4.10.2]
+
+Released for version consistency with other DSW tools.
+
 ## [4.10.1]
 
 Released for version consistency with other DSW tools.
@@ -264,3 +268,4 @@ Released for version consistency with other DSW tools.
 [4.9.1]: /../../tree/v4.9.1
 [4.10.0]: /../../tree/v4.10.0
 [4.10.1]: /../../tree/v4.10.1
+[4.10.2]: /../../tree/v4.10.2

packages/dsw-database/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-database'
-version = "4.10.1"
+version = "4.10.2"
 description = 'Library for managing DSW database'
 readme = 'README.md'
 keywords = ['dsw', 'database']
@@ -26,7 +26,7 @@ dependencies = [
  'psycopg[binary]',
  'tenacity',
  # DSW
- "dsw-config==4.10.1",
+ "dsw-config==4.10.2",
 ]
 
 [project.urls]