Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .notice-metadata.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
6ea3fb220984b78511b611854f5c00f11b059817f326ad1d557bca6d45c0871b cli/go.sum
33d7431ce175376b59e4634781746a75f1599aef8251b1153dc4d7484e67b745 server/ControlPlane/packages.lock.json
a25dbcbbf4137b6c2a0e2140b940cbb68a8f9624af487a38934918088795b7bd server/DataPlane/packages.lock.json
e518c00c2e96699b9cf588fe7504950aa2ca33a0ed1d7e53e0bb2b5b0dbce2c4 scripts/generate-notice.sh
1901829eb682b172f0a284d52e18adffd6cd434ac1a5bb88a24604eb057b586e NOTICE.txt
a1d2bc97eb86bdb1b73013292c59e3581f256c6f80733a03999270c5c424dea0 server/ControlPlane/packages.lock.json
41594013b5bd13071f8d4f853dfa61158262d389279eca6e68689b398f1a667b server/DataPlane/packages.lock.json
c7b999156b1faaa6694021ab44bded1a3fe2c669eaa04e7c80e93360996755d2 scripts/generate-notice.sh
3fe3aa03fb7e789d77376089c4f792592bf3304962d786d8b96176d9b6eac4fb NOTICE.txt
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ DATA_PLANE_SERVER_PATH=server/DataPlane

DEVELOPER_CONFIG_JSON = $(shell scripts/get-config.sh --dev -o json | jq -c)

INTEGRATION_TEST_FLAGS = ""

ifeq ($(TYGER_ENVIRONMENT_TYPE),)
include Makefile.cloud
else ifeq ($(TYGER_ENVIRONMENT_TYPE),cloud)
Expand Down Expand Up @@ -114,11 +116,17 @@ integration-test-no-up: integration-test-no-up-prereqs cli-ready
fi

pushd cli/integrationtest
go test -tags=integrationtest
go test -tags=integrationtest ${INTEGRATION_TEST_FLAGS}

integration-test-no-up-fast-only:
$(MAKE) integration-test-no-up INTEGRATION_TEST_FLAGS="-fast"

integration-test: up integration-test-no-up-prereqs
$(MAKE) integration-test-no-up-prereqs integration-test-no-up

integration-test-fast-only:
$(MAKE) integration-test INTEGRATION_TEST_FLAGS="-fast"

test: up unit-test integration-test
$(MAKE) variant-test

Expand Down
2 changes: 1 addition & 1 deletion Makefile.cloud
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@ variant-test:
# No variant tests for cloud configuration

get-last-server-exception: set-context
kubectl logs -l component=tyger-server | grep Exception || true | tac | head -n 1 | jq -r '.exception'
(kubectl logs -l component=tyger-server | grep Exception || true) | tac | head -n 1 | jq -r '.exception'
2 changes: 1 addition & 1 deletion Makefile.docker
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ variant-test:
$(MAKE) integration-test-no-up

get-last-server-exception:
docker logs tyger-local-control-plane 2>&1 | grep Exception || true | tac | head -n 1 | jq -r '.exception'
(docker logs tyger-local-control-plane 2>&1 | grep Exception || true) | tac | head -n 1 | jq -r '.exception'
303 changes: 29 additions & 274 deletions NOTICE.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cli/cmd/buffer-copier/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ func insertBatch(ctx context.Context, pool *pgxpool.Pool, containerBatch []*serv
newBufferCount := 0
commandBatch.Queue(`
WITH inserted_buffers AS (
INSERT INTO buffers (id, created_at, etag, storage_account_id)
SELECT id, created_at, '0', $1
INSERT INTO buffers (id, created_at, storage_account_id)
SELECT id, created_at, $1
FROM temp_buffers
ON CONFLICT (id) DO NOTHING
RETURNING id, created_at
Expand Down
Loading
Loading