Skip to content

Commit

Permalink
Merge branch 'main' into bump-mariadb-10-6-to-10.6.18
Browse files Browse the repository at this point in the history
  • Loading branch information
Cryogenics-CI committed May 24, 2024
2 parents 33be6e1 + 053d000 commit 2622901
Show file tree
Hide file tree
Showing 22 changed files with 482 additions and 69 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ builds:
version: 231c6aa030718126d5181131add897c525b71ed8afb53200d739b3c82c014801
blobstore_id: a67cd5b6-d1c1-4aaa-612c-378df178bd44
sha1: sha256:25d5e9bfd985a4b2330d74d772d6d3a3bc5d8dbef15708b83e0a555d0f65fd29
24073ee4787839a2f9ca52c3f9420c9014f5e7a1f07ccca161e106000041341c:
version: 24073ee4787839a2f9ca52c3f9420c9014f5e7a1f07ccca161e106000041341c
blobstore_id: 904035c9-8030-4712-560e-4d9270b17e95
sha1: sha256:4069286f57f367c1891ff45dfbe01af6071a8aede4ec42afb9e896f376a378c0
6a4454134e4f34c77674b103f95dc315e13cee6d843462828f88aa519736db10:
version: 6a4454134e4f34c77674b103f95dc315e13cee6d843462828f88aa519736db10
blobstore_id: 99fc8638-0798-4499-64ec-5a13732690ce
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,10 @@ builds:
version: bca8f89ccaa6a42c14942ad468dcb7c222c9cb1e64ca758f7afdbecc6b10bf02
blobstore_id: fbe610e4-361a-4a65-5f82-50a664633beb
sha1: sha256:d4e4a33c948561c138f0b8c1a8151ea8696876f240791b20f5bd1d282e2aca3b
bcc73bd656cf7606a5657b165fd8ec99df937020ac9321681ed23e062fc81d51:
version: bcc73bd656cf7606a5657b165fd8ec99df937020ac9321681ed23e062fc81d51
blobstore_id: 1ebc3d3a-7d17-4a70-6e76-f132c0bc13e7
sha1: sha256:0cf2e5d8aaae78f8838a0f8ba993629ecf85f862b57d32ee52b52fef2dd222a4
bd963b1dd47ea4996d842af65b612d0495115a0d4b64c961e85c0fe34948c114:
version: bd963b1dd47ea4996d842af65b612d0495115a0d4b64c961e85c0fe34948c114
blobstore_id: e9834b71-d76d-45cb-4bfc-5aaae6cc8de5
Expand Down
117 changes: 117 additions & 0 deletions releases/backup-and-restore-sdk/backup-and-restore-sdk-1.19.16.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
name: backup-and-restore-sdk
version: 1.19.16
commit_hash: 676ceb25
uncommitted_changes: false
jobs:
- name: azure-blobstore-backup-restorer
version: f88fccebfb6347564f17c7b5f59d89681b3dbb18e172562de88f112577d0aebc
fingerprint: f88fccebfb6347564f17c7b5f59d89681b3dbb18e172562de88f112577d0aebc
sha1: sha256:8cbb25b5a9290963c61270ab65968c0e1ba1b748bd4282e1b4cf375e95442337
packages:
- azure-blobstore-backup-restorer
- name: database-backup-restorer
version: bd1b64cf7e387dc8106139ebd197c550212b5964c6ee99845a9db0445c69be69
fingerprint: bd1b64cf7e387dc8106139ebd197c550212b5964c6ee99845a9db0445c69be69
sha1: sha256:78ce91e3ec67f88e2a7c9c43dfc9c67eb7428724e4ffe7d4866a26c6573ee22f
packages:
- database-backup-restorer
- database-backup-restorer-postgres-11
- database-backup-restorer-postgres-13
- database-backup-restorer-postgres-15
- database-backup-restorer-mariadb
- database-backup-restorer-mysql-8.0
- database-backup-restorer-mysql-5.7
- name: gcs-blobstore-backup-restorer
version: e1dbf2608c7c2eebb5cc2a2f6b4a3499ed423f24f28337a125dce15df42e5bef
fingerprint: e1dbf2608c7c2eebb5cc2a2f6b4a3499ed423f24f28337a125dce15df42e5bef
sha1: sha256:4f5630350240e0402917ff0afc5bef2c0a19b76cd20b24efce44629f20bfae2c
packages:
- gcs-blobstore-backup-restorer
- name: s3-unversioned-blobstore-backup-restorer
version: 93bbadecdc56cb2cf8d577159dca3e9c813956936d0c80211b98c99ab9aaa59c
fingerprint: 93bbadecdc56cb2cf8d577159dca3e9c813956936d0c80211b98c99ab9aaa59c
sha1: sha256:56725d4007a22dd4da1048cdbefe9fd4a02b77f49af1d711d70fad6320f0c676
packages:
- s3-blobstore-backup-restorer
- name: s3-versioned-blobstore-backup-restorer
version: ac5b9c179835f9d0a0d064dbde502d2ef891dd77bdeb89f16fe78b6394b1ee51
fingerprint: ac5b9c179835f9d0a0d064dbde502d2ef891dd77bdeb89f16fe78b6394b1ee51
sha1: sha256:f4c98bdf199721552568ce7b2fecead128d6b42ab7e39ab56903dfc707eea827
packages:
- s3-blobstore-backup-restorer
packages:
- name: azure-blobstore-backup-restorer
version: 4f3ec0170f8b891c1efae67f8f2cf97b71653a30af0f8f8fca44de9c3d9426a7
fingerprint: 4f3ec0170f8b891c1efae67f8f2cf97b71653a30af0f8f8fca44de9c3d9426a7
sha1: sha256:a8798ab422eb1c04489b5cd53545dbb14152e16beae246bb3bf550e31e89c7de
dependencies:
- golang-1-linux
- name: database-backup-restorer
version: 0e7fcfdcc29ba7c5d6934f603c4d78d1219d69235ff62b5a3c708c90457689a0
fingerprint: 0e7fcfdcc29ba7c5d6934f603c4d78d1219d69235ff62b5a3c708c90457689a0
sha1: sha256:be5f726209b010cb758b748392cf2ef65e4141f28a0869a69dad24778ad73c8a
dependencies:
- golang-1-linux
- name: database-backup-restorer-boost
version: 05f72399bdd8d91643f42ac411ba65befb78ac0334484dbc3ca95c5286ab7680
fingerprint: 05f72399bdd8d91643f42ac411ba65befb78ac0334484dbc3ca95c5286ab7680
sha1: sha256:b228c7a30024fafd1d9769695ef1c8e1f417d273293da15a5cc306d25ef89fc5
dependencies: []
- name: database-backup-restorer-mariadb
version: b7d9fbde9306d2edd741d1ea3e805fd4b40a69718d692f432b04f1987585d698
fingerprint: b7d9fbde9306d2edd741d1ea3e805fd4b40a69718d692f432b04f1987585d698
sha1: sha256:4be6a85630eba638ac36ac4b6da2dc19c1c1379cda078c82cb49b357ceb7d309
dependencies:
- libpcre2
- name: database-backup-restorer-mysql-5.7
version: 58c0d2d885422d79f127870a96323180678b7bd1f7febab89cee23b1c0b637b9
fingerprint: 58c0d2d885422d79f127870a96323180678b7bd1f7febab89cee23b1c0b637b9
sha1: sha256:b0a7a7dd0a2970f9fc6b14a5519a2d7a463c832d1b47280ea1855751c3a0722b
dependencies:
- database-backup-restorer-boost
- name: database-backup-restorer-mysql-8.0
version: ed56bd03e7fc8db8df84a57fef357f899bdd4a3f8437576cf26ee47026b5a00d
fingerprint: ed56bd03e7fc8db8df84a57fef357f899bdd4a3f8437576cf26ee47026b5a00d
sha1: sha256:26b37e10748c4ecf56f3e609cda8628d8f4bba422b717502f509011194d1b85b
dependencies: []
- name: database-backup-restorer-postgres-11
version: b9125bf430a1cf1d00ab83c72e4c5be26f6de52c5315b82beda286d31f4e7cc1
fingerprint: b9125bf430a1cf1d00ab83c72e4c5be26f6de52c5315b82beda286d31f4e7cc1
sha1: sha256:97cd705999c84f18aa9285af3682f9e68c493b7c78d0d4f7c36ed2cdb822d3bc
dependencies: []
- name: database-backup-restorer-postgres-13
version: 9d95a0c23268c1a70291b0bd26e9a305bbd31033ed529d9755d79cdf60fc3281
fingerprint: 9d95a0c23268c1a70291b0bd26e9a305bbd31033ed529d9755d79cdf60fc3281
sha1: sha256:2372430ad0e7e8f992b143778648b71a98822aa3142ff6f9a89139a37c96edc1
dependencies: []
- name: database-backup-restorer-postgres-15
version: 24073ee4787839a2f9ca52c3f9420c9014f5e7a1f07ccca161e106000041341c
fingerprint: 24073ee4787839a2f9ca52c3f9420c9014f5e7a1f07ccca161e106000041341c
sha1: sha256:4069286f57f367c1891ff45dfbe01af6071a8aede4ec42afb9e896f376a378c0
dependencies: []
- name: gcs-blobstore-backup-restorer
version: bcc73bd656cf7606a5657b165fd8ec99df937020ac9321681ed23e062fc81d51
fingerprint: bcc73bd656cf7606a5657b165fd8ec99df937020ac9321681ed23e062fc81d51
sha1: sha256:0cf2e5d8aaae78f8838a0f8ba993629ecf85f862b57d32ee52b52fef2dd222a4
dependencies:
- golang-1-linux
- name: golang-1-linux
version: 15120b8865dac54af5d5a7d1d1bc4d35acd37c114c2398f9edb16323184de634
fingerprint: 15120b8865dac54af5d5a7d1d1bc4d35acd37c114c2398f9edb16323184de634
sha1: sha256:ba5980b79910c449ce872b087411918e39d4bd55294153c449ded491141f7d72
dependencies: []
- name: libpcre2
version: e7f588c3de5f32df06ebe043cd67bea7a20ccb929432309945486e7f22d01dc4
fingerprint: e7f588c3de5f32df06ebe043cd67bea7a20ccb929432309945486e7f22d01dc4
sha1: sha256:ed82ad1e2bcf4353e5b106cea82fe91036c0319333fa995698ef681aab089d41
dependencies: []
- name: s3-blobstore-backup-restorer
version: 3c8f7bb211238367db72135e60269f0514310849b58d7efb238fa8574483571d
fingerprint: 3c8f7bb211238367db72135e60269f0514310849b58d7efb238fa8574483571d
sha1: sha256:43bdbfd2dcaa7bf97cb88c0ba934b257e481780de655f4239e1caabfddf31e47
dependencies:
- golang-1-linux
license:
version: de99d82e62206a72c9e0b838fa79b9b67a7b1cef5b82eaf5037fba3bc6117c21
fingerprint: de99d82e62206a72c9e0b838fa79b9b67a7b1cef5b82eaf5037fba3bc6117c21
sha1: sha256:66daaae31d1a514da5aee35f036f063a5c76f4719d0e7c4bd0f0531bb7112100
2 changes: 2 additions & 0 deletions releases/backup-and-restore-sdk/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ builds:
version: 1.19.3
4bc48ce6-3b2c-4c76-7179-58c29fd5a0a5:
version: 1.18.71
4c6cebf7-454a-44be-61f5-df645ad802bd:
version: 1.19.16
4eb24e49-0b50-49ab-baa4-015735138e5a:
version: 1.4.4
50dab38d-917e-441e-47f8-54b54de1aed7:
Expand Down
8 changes: 4 additions & 4 deletions src/gcs-blobstore-backup-restore/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module gcs-blobstore-backup-restore
go 1.18

require (
cloud.google.com/go/storage v1.40.0
cloud.google.com/go/storage v1.41.0
github.com/cloudfoundry-incubator/bosh-backup-and-restore v1.9.64
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
github.com/onsi/ginkgo/v2 v2.17.3
Expand All @@ -18,7 +18,7 @@ require (
cloud.google.com/go/auth v0.4.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/iam v1.1.7 // indirect
cloud.google.com/go/iam v1.1.8 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -45,8 +45,8 @@ require (
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.20.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.34.1 // indirect
Expand Down
22 changes: 11 additions & 11 deletions src/gcs-blobstore-backup-restore/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKF
cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q=
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
cloud.google.com/go/iam v1.1.7 h1:z4VHOhwKLF/+UYXAJDFwGtNF0b6gjsW1Pk9Ml0U/IoM=
cloud.google.com/go/iam v1.1.7/go.mod h1:J4PMPg8TtyurAUvSmPj8FF3EDgY1SPRZxcUGrn7WXGA=
cloud.google.com/go/storage v1.40.0 h1:VEpDQV5CJxFmJ6ueWNsKxcr1QAYOXEgxDa+sBbJahPw=
cloud.google.com/go/storage v1.40.0/go.mod h1:Rrj7/hKlG87BLqDJYtwR0fbPld8uJPbQ2ucUMY7Ir0g=
cloud.google.com/go/iam v1.1.8 h1:r7umDwhj+BQyz0ScZMp4QrGXjSTI3ZINnpgU2nlB/K0=
cloud.google.com/go/iam v1.1.8/go.mod h1:GvE6lyMmfxXauzNq8NbgJbeVQNspG+tcdL/W8QO1+zE=
cloud.google.com/go/storage v1.41.0 h1:RusiwatSu6lHeEXe3kglxakAmAbfV+rhtPqA6i8RBx0=
cloud.google.com/go/storage v1.41.0/go.mod h1:J1WCa/Z2FcgdEDuPUY8DxT5I+d9mFKsCepp5vR6Sq80=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
Expand Down Expand Up @@ -58,7 +58,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc=
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg=
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
Expand Down Expand Up @@ -94,7 +94,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
Expand All @@ -105,7 +105,7 @@ go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw=
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
Expand Down Expand Up @@ -162,10 +162,10 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY=
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo=
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be h1:Zz7rLWqp0ApfsR/l7+zSHhY3PMiH2xqgxlfYfAfNpoU=
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be/go.mod h1:dvdCTIoAGbkWbcIKBniID56/7XHTt6WfxXNMxuziJ+w=
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda h1:wu/KJm9KJwpfHWhkkZGohVC6KRrc1oJNr4jwtQMOQXw=
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda/go.mod h1:g2LLCvCeCSir/JJSWosk19BR4NVxGqHUC6rxIRsd7Aw=
google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae h1:AH34z6WAGVNkllnKs5raNq3yRq93VnjBG6rpfub/jYk=
google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae/go.mod h1:FfiGhwUm6CJviekPrc0oJ+7h29e+DmWU6UtjX0ZvI7Y=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 h1:DujSIu+2tC9Ht0aPNA7jgj23Iq8Ewi5sgkQ++wdvonE=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2622901

Please sign in to comment.