Skip to content

chore: reenable c++ #52

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
ajewellamz merged 3 commits into from
Oct 27, 2025
Merged

chore: reenable c++ #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0807147
chore: reenable c++
ajewellamz Oct 27, 2025
d56f977
m
ajewellamz Oct 27, 2025
ee7b589
m
ajewellamz Oct 27, 2025
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
3 changes: 1 addition & 2 deletions test-server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ all: start-all-servers run-tests
ci: start-all-servers run-tests stop-servers

SERVER_DIRS := $(shell find . -maxdepth 1 -type d -name '*-server' | sed 's|^\./||' | $(if $(FILTER),grep -E "$$(echo '$(FILTER)' | sed 's/,/|/g')",cat) | sort)
# SERVER_DIRS := cpp-v3-server

START_SERVER_TARGETS := $(addprefix start-, $(SERVER_DIRS))
WAIT_SERVER_TARGETS := $(addprefix wait-, $(SERVER_DIRS))
Expand Down Expand Up @@ -125,4 +124,4 @@ duvet:
@for dir in $(SERVER_DIRS); do \
echo "Running make duvet in $$dir..."; \
$(MAKE) -C $$dir duvet; \
done
done
24 changes: 12 additions & 12 deletions test-server/cpp-v2-server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ PID_FILE := server.pid
PORT := 8085

build/s3ec-server:
# brew install libmicrohttpd nlohmann-json ossp-uuid
# git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp.git
# cd aws-sdk-cpp
# mkdir -p build && cd build && cmake ..
brew install libmicrohttpd nlohmann-json ossp-uuid
git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp.git
cd aws-sdk-cpp
mkdir -p build && cd build && cmake ..

start-server: | build/s3ec-server
# @echo "Starting Cpp V2 server..."
# cd build && make && \
# AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
# AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
# AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
# AWS_REGION="us-west-2" \
# ./s3ec-server & echo $$! > $(PID_FILE)
# @echo "Cpp V2 server starting..."
@echo "Starting Cpp V2 server..."
cd build && make && \
AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
AWS_REGION="us-west-2" \
./s3ec-server & echo $$! > $(PID_FILE)
@echo "Cpp V2 server starting..."

stop-server:
@if [ -f $(PID_FILE) ]; then \
Expand Down
2 changes: 1 addition & 1 deletion test-server/cpp-v2-server/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ MHD_Result handle_create_client(struct MHD_Connection *connection,
auto materials =
std::make_shared<KMSWithContextEncryptionMaterials>(kms_key_id);
CryptoConfigurationV2 config(materials);
if (legacy1 || legacy2) {
if (legacy1 || legacy2)
config.SetSecurityProfile(SecurityProfile::V2_AND_LEGACY);

auto encryption_client = std::make_shared<S3EncryptionClientV2>(config);
Expand Down
22 changes: 11 additions & 11 deletions test-server/cpp-v2-transition-server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ PID_FILE := server.pid
PORT := 8097

build/s3ec-server:
# brew install libmicrohttpd nlohmann-json ossp-uuid
# mkdir -p build && cd build && cmake ..
brew install libmicrohttpd nlohmann-json ossp-uuid
mkdir -p build && cd build && cmake ..

start-server: | build/s3ec-server
# @echo "Starting Cpp V2 server..."
# cd build && make && \
# AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
# AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
# AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
# AWS_REGION="us-west-2" \
# ./s3ec-server & echo $$! > $(PID_FILE)
# @echo "Cpp V2 server starting..."
@echo "Starting Cpp V2 server..."
cd build && make && \
AWS_ACCESS_KEY_ID="$$AWS_ACCESS_KEY_ID" \
AWS_SECRET_ACCESS_KEY="$$AWS_SECRET_ACCESS_KEY" \
AWS_SESSION_TOKEN="$$AWS_SESSION_TOKEN" \
AWS_REGION="us-west-2" \
./s3ec-server & echo $$! > $(PID_FILE)
@echo "Cpp V2 server starting..."

stop-server:
@if [ -f $(PID_FILE) ]; then \
Expand All @@ -26,7 +26,7 @@ stop-server:
fi

wait-for-server:
# $(MAKE) -C .. wait-for-port PORT=$(PORT)
$(MAKE) -C .. wait-for-port PORT=$(PORT)

duvet:
duvet report
Expand Down
2 changes: 1 addition & 1 deletion test-server/cpp-v2-transition-server/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ MHD_Result handle_create_client(struct MHD_Connection *connection,
auto materials =
std::make_shared<KMSWithContextEncryptionMaterials>(kms_key_id);
CryptoConfigurationV2 config(materials);
if (legacy1 || legacy2) {
if (legacy1 || legacy2)
config.SetSecurityProfile(SecurityProfile::V2_AND_LEGACY);

auto encryption_client = std::make_shared<S3EncryptionClientV2>(config);
Expand Down
8 changes: 4 additions & 4 deletions test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public class TestUtils {
JAVA_V3_CURRENT,
GO_V3_CURRENT,
NET_V2_CURRENT,
// CPP_V2_CURRENT,
CPP_V2_CURRENT,
RUBY_V2_CURRENT,
PHP_V2_CURRENT
);
Expand All @@ -112,7 +112,7 @@ public class TestUtils {
// JAVA_V3_TRANSITION,
// GO_V3_TRANSITION,
// NET_V2_TRANSITION,
// CPP_V2_TRANSITION,
CPP_V2_TRANSITION,
// PHP_V2_TRANSITION,
RUBY_V2_TRANSITION
);
Expand All @@ -137,7 +137,7 @@ public class TestUtils {
servers.put(GO_V3_CURRENT, new LanguageServerTarget(GO_V3_CURRENT, "8082"));
servers.put(NET_V2_CURRENT, new LanguageServerTarget(NET_V2_CURRENT, "8083"));
servers.put(NET_V3, new LanguageServerTarget(NET_V3, "8084"));
// servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
servers.put(CPP_V2_CURRENT, new LanguageServerTarget(CPP_V2_CURRENT, "8085"));
// servers.put(RUBY_V2_CURRENT, new LanguageServerTarget(RUBY_V2_CURRENT, "8086"));
servers.put(PHP_V2_CURRENT, new LanguageServerTarget(PHP_V2_CURRENT, "8087"));
servers.put(GO_V4, new LanguageServerTarget(GO_V4, "8089"));
Expand All @@ -147,7 +147,7 @@ public class TestUtils {
servers.put(JAVA_V3_TRANSITION, new LanguageServerTarget(JAVA_V3_TRANSITION, "8094"));
// servers.put(GO_V3_TRANSITION, new LanguageServerTarget(GO_V3_TRANSITION, "8095"));
// servers.put(NET_V2_TRANSITION, new LanguageServerTarget(NET_V2_TRANSITION, "8096"));
// servers.put(CPP_V2_TRANSITION, new LanguageServerTarget(CPP_V2_TRANSITION, "8097"));
servers.put(CPP_V2_TRANSITION, new LanguageServerTarget(CPP_V2_TRANSITION, "8097"));
servers.put(RUBY_V2_TRANSITION, new LanguageServerTarget(RUBY_V2_TRANSITION, "8098"));
servers.put(PHP_V2_TRANSITION, new LanguageServerTarget(PHP_V2_TRANSITION, "8099"));
servers.put(JAVA_V4, new LanguageServerTarget(JAVA_V4, "8090"));
Expand Down
Loading