Skip to content

Commit 79a666b

Browse files
johnstairsjohnstairs
authored
Support copying buffers between Tyger instances (#141)
1 parent cb8fc10 commit 79a666b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1898
-286
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ RUN umask 0002 \
6666
&& VERSION=8.0.302 bash install.sh \
6767
# GO
6868
&& cd /opt/features/src/go \
69-
&& VERSION=1.22.0 bash install.sh \
69+
&& VERSION=1.23.1 bash install.sh \
7070
&& chown -R "${USERNAME}" "${GOROOT}" "${GOPATH}" \
7171
# GitHub CLI
7272
&& cd /opt/features/src/github-cli/ \

‎.notice-metadata.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
87a95a0f0985d9dd78841d4b8f253e1854ccc576dcb4f25d05884fe6dc66d439 cli/go.sum
1+
d6d044a089a2292b836923b0750f640624a60c497f400426a2520fc61d7936af cli/go.sum
22
d806a45ac319a052749da22ec42c6a08e358dbb6f6086f5b33e761e6ab39aa5b server/ControlPlane/packages.lock.json
33
83e9d72c489371ac10d1509e640c5daaafe4bef2be498456b4342a0700fe6608 server/DataPlane/packages.lock.json
44
e518c00c2e96699b9cf588fe7504950aa2ca33a0ed1d7e53e0bb2b5b0dbce2c4 scripts/generate-notice.sh
5-
0e323214bb9d10373505100678e361103ee4715e7a1c6bc95094f25cf00e1194 NOTICE.txt
5+
3486c92776853d05aa57bb64d0ef7ea46120380bb35b2f5deb4cb3884620052b NOTICE.txt

‎Makefile.cloud‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,17 @@ set-localsettings: set-context
100100
"cloudStorage": {
101101
"storageAccounts": $$(echo $${helm_values} | jq -c '.buffers.storageAccounts')
102102
},
103-
"bufferSidecarImage": "$$(echo '${ENVIRONMENT_CONFIG_JSON}' | jq -r '.api.helm.tyger.values.bufferSidecarImage')"
103+
"bufferSidecarImage": "$$(echo '${ENVIRONMENT_CONFIG_JSON}' | jq -r '.api.helm.tyger.values.bufferSidecarImage')",
104+
"bufferCopierImage": "$$(echo '${ENVIRONMENT_CONFIG_JSON}' | jq -r '.api.helm.tyger.values.bufferCopierImage')"
104105
},
105106
"database": {
106-
"connectionString": "Host=$$(echo $${helm_values} | jq -r '.database.host'); Database=$$(echo $${helm_values} | jq -r '.database.databaseName'); Port=$$(echo $${helm_values} | jq -r '.database.port'); Username=$$(az account show | jq -r '.user.name'); SslMode=VerifyFull",
107+
"host": "$$(echo $${helm_values} | jq -r '.database.host')",
108+
"databaseName": "$$(echo $${helm_values} | jq -r '.database.databaseName')",
109+
"port": "$$(echo $${helm_values} | jq -r '.database.port')",
110+
"username": "$$(az account show | jq -r '.user.name')",
107111
"autoMigrate": ${AUTO_MIGRATE},
108-
"tygerServerRoleName": "$$(echo $${helm_values} | jq -r '.identity.tygerServer.name')"
112+
"tygerServerRoleName": "$$(echo $${helm_values} | jq -r '.identity.tygerServer.name')",
113+
"tygerServerIdentity": "$$(echo $${helm_values} | jq -r '.identity.tygerServer.name')"
109114
}
110115
}
111116
EOF

‎Makefile.docker‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ set-localsettings: ensure-data-plane-cert
4242
}
4343
},
4444
"database": {
45-
"connectionString": "Host=/opt/tyger/database; Username=tyger-server",
45+
"host": "/opt/tyger/database",
46+
"databaseName": "tyger-server",
4647
"autoMigrate": "true",
4748
"tygerServerRoleName": "tyger-server"
4849
}

‎NOTICE.txt‎

Lines changed: 148 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,32 @@ SOFTWARE.
349349

350350
================================================================================
351351

352+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob
353+
354+
MIT License
355+
356+
Copyright (c) Microsoft Corporation. All rights reserved.
357+
358+
Permission is hereby granted, free of charge, to any person obtaining a copy
359+
of this software and associated documentation files (the "Software"), to deal
360+
in the Software without restriction, including without limitation the rights
361+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
362+
copies of the Software, and to permit persons to whom the Software is
363+
furnished to do so, subject to the following conditions:
364+
365+
The above copyright notice and this permission notice shall be included in all
366+
copies or substantial portions of the Software.
367+
368+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
369+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
370+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
371+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
372+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
373+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
374+
SOFTWARE
375+
376+
================================================================================
377+
352378
github.com/AzureAD/microsoft-authentication-library-for-go/apps
353379

354380
MIT License
@@ -12206,6 +12232,114 @@ limitations under the License.
1220612232

1220712233
================================================================================
1220812234

12235+
github.com/jackc/pgpassfile
12236+
12237+
Copyright (c) 2019 Jack Christensen
12238+
12239+
MIT License
12240+
12241+
Permission is hereby granted, free of charge, to any person obtaining
12242+
a copy of this software and associated documentation files (the
12243+
"Software"), to deal in the Software without restriction, including
12244+
without limitation the rights to use, copy, modify, merge, publish,
12245+
distribute, sublicense, and/or sell copies of the Software, and to
12246+
permit persons to whom the Software is furnished to do so, subject to
12247+
the following conditions:
12248+
12249+
The above copyright notice and this permission notice shall be
12250+
included in all copies or substantial portions of the Software.
12251+
12252+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
12253+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
12254+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
12255+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
12256+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
12257+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
12258+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12259+
12260+
================================================================================
12261+
12262+
github.com/jackc/pgservicefile
12263+
12264+
Copyright (c) 2020 Jack Christensen
12265+
12266+
MIT License
12267+
12268+
Permission is hereby granted, free of charge, to any person obtaining
12269+
a copy of this software and associated documentation files (the
12270+
"Software"), to deal in the Software without restriction, including
12271+
without limitation the rights to use, copy, modify, merge, publish,
12272+
distribute, sublicense, and/or sell copies of the Software, and to
12273+
permit persons to whom the Software is furnished to do so, subject to
12274+
the following conditions:
12275+
12276+
The above copyright notice and this permission notice shall be
12277+
included in all copies or substantial portions of the Software.
12278+
12279+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
12280+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
12281+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
12282+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
12283+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
12284+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
12285+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12286+
12287+
================================================================================
12288+
12289+
github.com/jackc/pgx/v5
12290+
12291+
Copyright (c) 2013-2021 Jack Christensen
12292+
12293+
MIT License
12294+
12295+
Permission is hereby granted, free of charge, to any person obtaining
12296+
a copy of this software and associated documentation files (the
12297+
"Software"), to deal in the Software without restriction, including
12298+
without limitation the rights to use, copy, modify, merge, publish,
12299+
distribute, sublicense, and/or sell copies of the Software, and to
12300+
permit persons to whom the Software is furnished to do so, subject to
12301+
the following conditions:
12302+
12303+
The above copyright notice and this permission notice shall be
12304+
included in all copies or substantial portions of the Software.
12305+
12306+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
12307+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
12308+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
12309+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
12310+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
12311+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
12312+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12313+
12314+
================================================================================
12315+
12316+
github.com/jackc/puddle/v2
12317+
12318+
Copyright (c) 2018 Jack Christensen
12319+
12320+
MIT License
12321+
12322+
Permission is hereby granted, free of charge, to any person obtaining
12323+
a copy of this software and associated documentation files (the
12324+
"Software"), to deal in the Software without restriction, including
12325+
without limitation the rights to use, copy, modify, merge, publish,
12326+
distribute, sublicense, and/or sell copies of the Software, and to
12327+
permit persons to whom the Software is furnished to do so, subject to
12328+
the following conditions:
12329+
12330+
The above copyright notice and this permission notice shall be
12331+
included in all copies or substantial portions of the Software.
12332+
12333+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
12334+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
12335+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
12336+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
12337+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
12338+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
12339+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
12340+
12341+
================================================================================
12342+
1220912343
github.com/jmoiron/sqlx
1221012344

1221112345
Copyright (c) 2013, Jason Moiron
@@ -18918,7 +19052,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1891819052

1891919053
golang.org/x/crypto
1892019054

18921-
Copyright (c) 2009 The Go Authors. All rights reserved.
19055+
Copyright 2009 The Go Authors.
1892219056

1892319057
Redistribution and use in source and binary forms, with or without
1892419058
modification, are permitted provided that the following conditions are
@@ -18930,7 +19064,7 @@ notice, this list of conditions and the following disclaimer.
1893019064
copyright notice, this list of conditions and the following disclaimer
1893119065
in the documentation and/or other materials provided with the
1893219066
distribution.
18933-
* Neither the name of Google Inc. nor the names of its
19067+
* Neither the name of Google LLC nor the names of its
1893419068
contributors may be used to endorse or promote products derived from
1893519069
this software without specific prior written permission.
1893619070

@@ -19046,7 +19180,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1904619180

1904719181
golang.org/x/sync
1904819182

19049-
Copyright (c) 2009 The Go Authors. All rights reserved.
19183+
Copyright 2009 The Go Authors.
1905019184

1905119185
Redistribution and use in source and binary forms, with or without
1905219186
modification, are permitted provided that the following conditions are
@@ -19058,7 +19192,7 @@ notice, this list of conditions and the following disclaimer.
1905819192
copyright notice, this list of conditions and the following disclaimer
1905919193
in the documentation and/or other materials provided with the
1906019194
distribution.
19061-
* Neither the name of Google Inc. nor the names of its
19195+
* Neither the name of Google LLC nor the names of its
1906219196
contributors may be used to endorse or promote products derived from
1906319197
this software without specific prior written permission.
1906419198

@@ -19078,7 +19212,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1907819212

1907919213
golang.org/x/sys/unix
1908019214

19081-
Copyright (c) 2009 The Go Authors. All rights reserved.
19215+
Copyright 2009 The Go Authors.
1908219216

1908319217
Redistribution and use in source and binary forms, with or without
1908419218
modification, are permitted provided that the following conditions are
@@ -19090,7 +19224,7 @@ notice, this list of conditions and the following disclaimer.
1909019224
copyright notice, this list of conditions and the following disclaimer
1909119225
in the documentation and/or other materials provided with the
1909219226
distribution.
19093-
* Neither the name of Google Inc. nor the names of its
19227+
* Neither the name of Google LLC nor the names of its
1909419228
contributors may be used to endorse or promote products derived from
1909519229
this software without specific prior written permission.
1909619230

@@ -19110,7 +19244,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1911019244

1911119245
golang.org/x/term
1911219246

19113-
Copyright (c) 2009 The Go Authors. All rights reserved.
19247+
Copyright 2009 The Go Authors.
1911419248

1911519249
Redistribution and use in source and binary forms, with or without
1911619250
modification, are permitted provided that the following conditions are
@@ -19122,7 +19256,7 @@ notice, this list of conditions and the following disclaimer.
1912219256
copyright notice, this list of conditions and the following disclaimer
1912319257
in the documentation and/or other materials provided with the
1912419258
distribution.
19125-
* Neither the name of Google Inc. nor the names of its
19259+
* Neither the name of Google LLC nor the names of its
1912619260
contributors may be used to endorse or promote products derived from
1912719261
this software without specific prior written permission.
1912819262

@@ -19142,7 +19276,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1914219276

1914319277
golang.org/x/text
1914419278

19145-
Copyright (c) 2009 The Go Authors. All rights reserved.
19279+
Copyright 2009 The Go Authors.
1914619280

1914719281
Redistribution and use in source and binary forms, with or without
1914819282
modification, are permitted provided that the following conditions are
@@ -19154,7 +19288,7 @@ notice, this list of conditions and the following disclaimer.
1915419288
copyright notice, this list of conditions and the following disclaimer
1915519289
in the documentation and/or other materials provided with the
1915619290
distribution.
19157-
* Neither the name of Google Inc. nor the names of its
19291+
* Neither the name of Google LLC nor the names of its
1915819292
contributors may be used to endorse or promote products derived from
1915919293
this software without specific prior written permission.
1916019294

@@ -25844,6 +25978,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
2584425978
================================================================================
2584525979

2584625980
** Microsoft.Extensions.ApiDescription.Server; version 6.0.5 --
25981+
(c) 2008 VeriSign, Inc.
25982+
(c) Microsoft Corporation
25983+
Copyright James Newton-King 2008
25984+
Copyright James Newton-King 2008 Json.NET
2584725985

2584825986
MIT License
2584925987

‎cli/Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.22.0-bullseye as go-build
1+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/oss/go/microsoft/golang:1.23.1-bullseye as go-build
22
ARG TARGETARCH BUILDOS
33

44
WORKDIR /go/src/app
@@ -7,7 +7,7 @@ ARG TYGER_VERSION="a"
77
RUN --mount=type=cache,target=/root/.cache/go-build go mod download
88
COPY . .
99
RUN --mount=type=cache,target=/root/.cache/go-build \
10-
CGO_ENABLED=0 GOOS=${BUILDOS} GOARCH=${TARGETARCH} go build -ldflags="-s -w -X main.version=${TYGER_VERSION}" -v -o /go/bin/dist/${BUILDOS}/${TARGETARCH}/ ./cmd/buffer-sidecar ./cmd/tyger
10+
CGO_ENABLED=0 GOOS=${BUILDOS} GOARCH=${TARGETARCH} go build -ldflags="-s -w -X main.version=${TYGER_VERSION}" -v -o /go/bin/dist/${BUILDOS}/${TARGETARCH}/ ./cmd/buffer-sidecar ./cmd/tyger ./cmd/buffer-copier
1111

1212
FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0-nonroot.20240112 as buffer-sidecar
1313
ARG TARGETARCH BUILDOS
@@ -21,3 +21,10 @@ ARG TARGETARCH BUILDOS
2121
WORKDIR /app
2222
COPY --from=go-build /go/bin/dist/${BUILDOS}/${TARGETARCH}/tyger .
2323
ENTRYPOINT ["/app/tyger"]
24+
25+
FROM mcr.microsoft.com/cbl-mariner/distroless/minimal:2.0-nonroot.20240112 as buffer-copier
26+
ARG TARGETARCH BUILDOS
27+
28+
WORKDIR /app
29+
COPY --from=go-build /go/bin/dist/${BUILDOS}/${TARGETARCH}/buffer-copier .
30+
ENTRYPOINT ["/app/buffer-copier"]

0 commit comments

Comments
 (0)