Skip to content

fix: Pass region to S3 client only if set (Java) #4151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremyary merged 4 commits into from
May 2, 2024
Merged

fix: Pass region to S3 client only if set (Java) #4151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a00c583
pass region to s3 client only if set
tokoko Apr 25, 2024
fc0be16
java ci changes
tokoko Apr 27, 2024
e6f4e92
Merge branch 'master' into java-registry-aws-region
tokoko May 1, 2024
a193848
Merge branch 'feast-dev:master' into java-registry-aws-region
tokoko May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/java_master_only.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ jobs:
with:
path: ${{ steps.uv-cache.outputs.dir }}
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-uv-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}

- name: Install Python dependencies
run: make install-python-ci-dependencies-uv
- uses: actions/cache@v4
Expand Down
11 changes: 8 additions & 3 deletions java/serving/src/main/java/feast/serving/service/config/RegistryConfigModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,14 @@ Storage googleStorage(ApplicationProperties applicationProperties) {

@Provides
public AmazonS3 awsStorage(ApplicationProperties applicationProperties) {
return AmazonS3ClientBuilder.standard()
.withRegion(applicationProperties.getFeast().getAwsRegion())
.build();
AmazonS3ClientBuilder builder = AmazonS3ClientBuilder.standard();
String region = applicationProperties.getFeast().getAwsRegion();

if (region != null) {
builder = builder.withRegion(region);
}

return builder.build();
}

@Provides
Expand Down
7 changes: 5 additions & 2 deletions java/serving/src/test/resources/docker-compose/feast10/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
FROM python:3.11

WORKDIR /app
COPY java/serving/src/test/resources/docker-compose/feast10/ .
COPY sdk/python /mnt/feast/sdk/python
COPY protos /mnt/feast/protos
COPY setup.py /mnt/feast/setup.py
COPY pyproject.toml /mnt/feast/pyproject.toml
COPY README.md /mnt/feast/README.md
RUN cd /mnt/feast && SETUPTOOLS_SCM_PRETEND_VERSION="0.1.0" pip install .[grpcio,redis]
COPY Makefile /mnt/feast/Makefile
ENV SETUPTOOLS_SCM_PRETEND_VERSION=0.1.0
RUN pip install uv
RUN cd /mnt/feast && uv pip install --system .[grpcio,redis]
COPY java/serving/src/test/resources/docker-compose/feast10/ .
EXPOSE 8080

CMD ["./entrypoint.sh"]