Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Techdebt: Fix Docker SHA on release (#6108)

Browse Source
This commit is contained in:
Bert Blommers 2023-03-22 22:00:50 -01:00 committed by GitHub
parent 53603b01c7
commit 1570ca4e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/release.yml vendored
View File

@ -67,6 +67,7 @@ jobs:
username: ${{ github.actor }} username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Push to DockerHub and GHCR - name: Push to DockerHub and GHCR
id: build_and_push
uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
with: with:
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64

2
CHANGELOG.md
View File

@ -4,7 +4,7 @@ Moto Changelog
4.1.5 4.1.5
----- -----
Docker Digest for 4.1.5: __ Docker Digest for 4.1.5: _sha256:0e43c36e1b1390106ec43b2e383486c45fef27646838acaa8073cbd2b4a97a31_
General: General:
* Our Docker-images are now also hosted in GHCR: * Our Docker-images are now also hosted in GHCR:

6
moto/s3/models.py
View File

@ -52,7 +52,7 @@ from moto.s3.exceptions import (
) )
from .cloud_formation import cfn_to_api_encryption, is_replacement_update from .cloud_formation import cfn_to_api_encryption, is_replacement_update
from . import notifications from . import notifications
from .select_object_content import parse_query, csv_to_json from .select_object_content import parse_query
from .utils import clean_key_name, _VersionedKeyStore, undo_clean_key_name from .utils import clean_key_name, _VersionedKeyStore, undo_clean_key_name
from .utils import ARCHIVE_STORAGE_CLASSES, STORAGE_CLASS from .utils import ARCHIVE_STORAGE_CLASSES, STORAGE_CLASS
from ..events.notifications import send_notification as events_send_notification from ..events.notifications import send_notification as events_send_notification
@ -2331,6 +2331,10 @@ class S3Backend(BaseBackend, CloudWatchMetricProvider):
query_input = key.value.decode("utf-8") query_input = key.value.decode("utf-8")
if "CSV" in input_details: if "CSV" in input_details:
# input is in CSV - we need to convert it to JSON before parsing # input is in CSV - we need to convert it to JSON before parsing
from py_partiql_parser._internal.csv_converter import ( # noqa # pylint: disable=unused-import
csv_to_json,
)
use_headers = input_details["CSV"].get("FileHeaderInfo", "") == "USE" use_headers = input_details["CSV"].get("FileHeaderInfo", "") == "USE"
query_input = csv_to_json(query_input, use_headers) query_input = csv_to_json(query_input, use_headers)
return [ return [

6
moto/s3/select_object_content.py
View File

@ -1,13 +1,11 @@
import binascii import binascii
import struct import struct
from typing import List from typing import List
from py_partiql_parser import Parser
from py_partiql_parser._internal.csv_converter import ( # noqa # pylint: disable=unused-import
csv_to_json,
)
def parse_query(text_input, query): def parse_query(text_input, query):
from py_partiql_parser import Parser
return Parser(source_data={"s3object": text_input}).parse(query) return Parser(source_data={"s3object": text_input}).parse(query)