diff --git a/MODULE.bazel b/MODULE.bazel index 227fa894..e3bf2cb6 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep(name = "toolchains_llvm", version = "1.1.2") git_override( module_name = "bazel_remote_apis", - commit = "de1d77b12feb81f96909f0410991c3c966d9d8e7", + commit = "a6328f5026d3b2ae27bd8efd86a0f1057ccab361", remote = "https://github.com/bazelbuild/remote-apis.git", ) diff --git a/go.mod b/go.mod index 63ad527e..0940a962 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ replace google.golang.org/protobuf => google.golang.org/protobuf v1.32.0 require ( cloud.google.com/go/longrunning v0.6.1 github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44 - github.com/bazelbuild/remote-apis v0.0.0-20240916201306-de1d77b12feb + github.com/bazelbuild/remote-apis v0.0.0-20240924123010-a6328f5026d3 github.com/buildbarn/bb-storage v0.0.0-20240918135726-256ec6c483a0 github.com/buildbarn/go-xdr v0.0.0-20240702182809-236788cf9e89 github.com/golang/protobuf v1.5.4 @@ -27,7 +27,7 @@ require ( golang.org/x/sync v0.8.0 golang.org/x/sys v0.25.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 - google.golang.org/grpc v1.66.2 + google.golang.org/grpc v1.67.0 google.golang.org/protobuf v1.34.2 mvdan.cc/gofumpt v0.7.0 ) @@ -36,28 +36,28 @@ require ( cloud.google.com/go v0.115.1 // indirect cloud.google.com/go/auth v0.9.4 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect - cloud.google.com/go/compute/metadata v0.5.1 // indirect + cloud.google.com/go/compute/metadata v0.5.2 // indirect cloud.google.com/go/iam v1.2.1 // indirect cloud.google.com/go/storage v1.43.0 // indirect github.com/aohorodnyk/mimeheader v0.0.6 // indirect - github.com/aws/aws-sdk-go-v2 v1.30.5 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect - github.com/aws/aws-sdk-go-v2/config v1.27.35 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.33 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect + github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 // indirect + github.com/aws/aws-sdk-go-v2/config v1.27.37 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.35 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.61.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.22.8 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 // indirect - github.com/aws/smithy-go v1.20.4 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.63.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.23.1 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 // indirect + github.com/aws/smithy-go v1.21.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -76,7 +76,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.10 // indirect github.com/lazybeaver/xorshift v0.0.0-20170702203709-ce511d4823dd // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -100,7 +100,7 @@ require ( golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.25.0 // indirect - google.golang.org/api v0.197.0 // indirect + google.golang.org/api v0.198.0 // indirect google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/genproto/googleapis/bytestream v0.0.0-20240903143218-8af14fe29dc1 // indirect diff --git a/go.sum b/go.sum index a2f226c8..ba9abc02 100644 --- a/go.sum +++ b/go.sum @@ -7,6 +7,8 @@ cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/compute/metadata v0.5.1 h1:NM6oZeZNlYjiwYje+sYFjEpP0Q0zCan1bmQW/KmIrGs= cloud.google.com/go/compute/metadata v0.5.1/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= +cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo= +cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= cloud.google.com/go/iam v1.2.1 h1:QFct02HRb7H12J/3utj0qf5tobFh9V4vR6h9eX5EBRU= cloud.google.com/go/iam v1.2.1/go.mod h1:3VUIJDPpwT6p/amXRC5GY8fCCh70lxPygguVtI0Z4/g= cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc= @@ -18,44 +20,80 @@ github.com/aohorodnyk/mimeheader v0.0.6 h1:WCV4NQjtbqnd2N3FT5MEPesan/lfvaLYmt5v4 github.com/aohorodnyk/mimeheader v0.0.6/go.mod h1:/Gd3t3vszyZYwjNJo2qDxoftZjjVzMdkQZxkiINp3vM= github.com/aws/aws-sdk-go-v2 v1.30.5 h1:mWSRTwQAb0aLE17dSzztCVJWI9+cRMgqebndjwDyK0g= github.com/aws/aws-sdk-go-v2 v1.30.5/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0= +github.com/aws/aws-sdk-go-v2 v1.31.0 h1:3V05LbxTSItI5kUqNwhJrrrY1BAXxXt0sN0l72QmG5U= +github.com/aws/aws-sdk-go-v2 v1.31.0/go.mod h1:ztolYtaEUtdpf9Wftr31CJfLVjOnD/CVRkKOOYgF8hA= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 h1:xDAuZTn4IMm8o1LnBZvmrL8JA1io4o3YWNXgohbf20g= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5/go.mod h1:wYSv6iDS621sEFLfKvpPE2ugjTuGlAG7iROg0hLOkfc= github.com/aws/aws-sdk-go-v2/config v1.27.35 h1:jeFgiWYNV0vrgdZqB4kZBjYNdy0IKkwrAjr2fwpHIig= github.com/aws/aws-sdk-go-v2/config v1.27.35/go.mod h1:qnpEvTq8ZfjrCqmJGRfWZuF+lGZ/vG8LK2K0L/TY1gQ= +github.com/aws/aws-sdk-go-v2/config v1.27.37 h1:xaoIwzHVuRWRHFI0jhgEdEGc8xE1l91KaeRDsWEIncU= +github.com/aws/aws-sdk-go-v2/config v1.27.37/go.mod h1:S2e3ax9/8KnMSyRVNd3sWTKs+1clJ2f1U6nE0lpvQRg= github.com/aws/aws-sdk-go-v2/credentials v1.17.33 h1:lBHAQQznENv0gLHAZ73ONiTSkCtr8q3pSqWrpbBBZz0= github.com/aws/aws-sdk-go-v2/credentials v1.17.33/go.mod h1:MBuqCUOT3ChfLuxNDGyra67eskx7ge9e3YKYBce7wpI= +github.com/aws/aws-sdk-go-v2/credentials v1.17.35 h1:7QknrZhYySEB1lEXJxGAmuD5sWwys5ZXNr4m5oEz0IE= +github.com/aws/aws-sdk-go-v2/credentials v1.17.35/go.mod h1:8Vy4kk7at4aPSmibr7K+nLTzG6qUQAUO4tW49fzUV4E= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 h1:pfQ2sqNpMVK6xz2RbqLEL0GH87JOwSxPV2rzm8Zsb74= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13/go.mod h1:NG7RXPUlqfsCLLFfi0+IpKN4sCB9D9fw/qTaSB+xRoU= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 h1:C/d03NAmh8C4BZXhuRNboF/DqhBkBCeDiJDcaqIT5pA= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14/go.mod h1:7I0Ju7p9mCIdlrfS+JCgqcYD0VXz/N4yozsox+0o078= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 h1:pI7Bzt0BJtYA0N/JEC6B8fJ4RBrEMi1LBrkMdFYNSnQ= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17/go.mod h1:Dh5zzJYMtxfIjYW+/evjQ8uj2OyR/ve2KROHGHlSFqE= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 h1:kYQ3H1u0ANr9KEKlGs/jTLrBFPo8P8NaH/w7A01NeeM= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18/go.mod h1:r506HmK5JDUh9+Mw4CfGJGSSoqIiLCndAuqXuhbv67Y= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 h1:Mqr/V5gvrhA2gvgnF42Zh5iMiQNcOYthFYwCyrnuWlc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17/go.mod h1:aLJpZlCmjE+V+KtN1q1uyZkfnUWpQGpbsn89XPKyzfU= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 h1:Z7IdFUONvTcvS7YuhtVxN99v2cCoHRXOS4mTr0B/pUc= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18/go.mod h1:DkKMmksZVVyat+Y+r1dEOgJEfUeA7UngIHWeKsi0yNc= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 h1:Roo69qTpfu8OlJ2Tb7pAYVuF0CpuUMB0IYWwYP/4DZM= github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17/go.mod h1:NcWPxQzGM1USQggaTVwz6VpqMZPX1CvDJLDh6jnOCa4= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18 h1:OWYvKL53l1rbsUmW7bQyJVsYU/Ii3bbAAQIIFNbM0Tk= +github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18/go.mod h1:CUx0G1v3wG6l01tUB+j7Y8kclA8NSqK4ef0YG79a4cg= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 h1:QFASJGfT8wMXtuP3D5CRmMjARHv9ZmzFUMJznHDOY3w= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5/go.mod h1:QdZ3OmoIjSX+8D1OPAzPxDfjXASbBMDsz9qvtyIhtik= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 h1:FLMkfEiRjhgeDTCjjLoc3URo/TBkgeQbocA78lfkzSI= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19/go.mod h1:Vx+GucNSsdhaxs3aZIKfSUjKVGsxN25nX2SRcdhuw08= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 h1:rTWjG6AvWekO2B1LHeM3ktU7MqyX9rzWQ7hgzneZW7E= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20/go.mod h1:RGW2DDpVc8hu6Y6yG8G5CHVmVOAn1oV8rNKOHRJyswg= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 h1:rfprUlsdzgl7ZL2KlXiUAoJnI/VxfHCvDFr2QDFj6u4= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19/go.mod h1:SCWkEdRq8/7EK60NcvvQ6NXKuTcchAD4ROAsC37VEZE= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 h1:Xbwbmk44URTiHNx6PNo0ujDE6ERlsCKJD3u1zfnzAPg= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20/go.mod h1:oAfOFzUB14ltPZj1rWwRc3d/6OgD76R8KlvU3EqM9Fg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 h1:u+EfGmksnJc/x5tq3A+OD7LrMbSSR/5TrKLvkdy/fhY= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17/go.mod h1:VaMx6302JHax2vHJWgRo+5n9zvbacs3bLU/23DNQrTY= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 h1:eb+tFOIl9ZsUe2259/BKPeniKuz4/02zZFH/i4Nf8Rg= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18/go.mod h1:GVCC2IJNJTmdlyEsSmofEy7EfJncP7DNnXDzRjJ5Keg= github.com/aws/aws-sdk-go-v2/service/s3 v1.61.3 h1:O/rjUvLED2dWzrSY6wv3njBjJlH4LT2xYRnUm402ovI= github.com/aws/aws-sdk-go-v2/service/s3 v1.61.3/go.mod h1:5FmD/Dqq57gP+XwaUnd5WFPipAuzrf0HmupX27Gvjvc= +github.com/aws/aws-sdk-go-v2/service/s3 v1.63.1 h1:TR96r56VwELV0qguNFCuz+/bEpRfnR3ZsS9/IG05C7Q= +github.com/aws/aws-sdk-go-v2/service/s3 v1.63.1/go.mod h1:NLTqRLe3pUNu3nTEHI6XlHLKYmc8fbHUdMxAB6+s41Q= github.com/aws/aws-sdk-go-v2/service/sso v1.22.8 h1:JRwuL+S1Qe1owZQoxblV7ORgRf2o0SrtzDVIbaVCdQ0= github.com/aws/aws-sdk-go-v2/service/sso v1.22.8/go.mod h1:eEygMHnTKH/3kNp9Jr1n3PdejuSNcgwLe1dWgQtO0VQ= +github.com/aws/aws-sdk-go-v2/service/sso v1.23.1 h1:2jrVsMHqdLD1+PA4BA6Nh1eZp0Gsy3mFSB5MxDvcJtU= +github.com/aws/aws-sdk-go-v2/service/sso v1.23.1/go.mod h1:XRlMvmad0ZNL+75C5FYdMvbbLkd6qiqz6foR1nA1PXY= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8 h1:+HpGETD9463PFSj7lX5+eq7aLDs85QUIA+NBkeAsscA= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8/go.mod h1:bCbAxKDqNvkHxRaIMnyVPXPo+OaPRwvmgzMxbz1VKSA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1 h1:0L7yGCg3Hb3YQqnSgBTZM5wepougtL1aEccdcdYhHME= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1/go.mod h1:FnvDM4sfa+isJ3kDXIzAB9GAwVSzFzSy97uZ3IsHo4E= github.com/aws/aws-sdk-go-v2/service/sts v1.30.8 h1:bAi+4p5EKnni+jrfcAhb7iHFQ24bthOAV9t0taf3DCE= github.com/aws/aws-sdk-go-v2/service/sts v1.30.8/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o= +github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 h1:8K0UNOkZiK9Uh3HIF6Bx0rcNCftqGCeKmOaR7Gp5BSo= +github.com/aws/aws-sdk-go-v2/service/sts v1.31.1/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI= github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4= github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= +github.com/aws/smithy-go v1.21.0 h1:H7L8dtDRk0P1Qm6y0ji7MCYMQObJ5R9CRpyPhRUkLYA= +github.com/aws/smithy-go v1.21.0/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg= github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44 h1:FGzENZi+SX9I7h9xvMtRA3rel8hCEfyzSixteBgn7MU= github.com/bazelbuild/buildtools v0.0.0-20240918101019-be1c24cc9a44/go.mod h1:PLNUetjLa77TCCziPsz0EI8a6CUxgC+1jgmWv0H25tg= github.com/bazelbuild/remote-apis v0.0.0-20240916201306-de1d77b12feb h1:3v+0mhgnuRnREjZTy7Rs2LmWek+dOVqaQtkmFc5vEos= github.com/bazelbuild/remote-apis v0.0.0-20240916201306-de1d77b12feb/go.mod h1:/xo1pn3QkEL2JXrLeK30jvjVR/zXM9H8EqcWb/l5/A0= +github.com/bazelbuild/remote-apis v0.0.0-20240924123010-a6328f5026d3 h1:gLdOIZMdBPwLnJmj8WmqQpldVvoUzLbbldJtYhZ5WbA= +github.com/bazelbuild/remote-apis v0.0.0-20240924123010-a6328f5026d3/go.mod h1:/xo1pn3QkEL2JXrLeK30jvjVR/zXM9H8EqcWb/l5/A0= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -150,6 +188,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0= +github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -334,6 +374,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.197.0 h1:x6CwqQLsFiA5JKAiGyGBjc2bNtHtLddhJCE2IKuhhcQ= google.golang.org/api v0.197.0/go.mod h1:AuOuo20GoQ331nq7DquGHlU6d+2wN2fZ8O0ta60nRNw= +google.golang.org/api v0.198.0 h1:OOH5fZatk57iN0A7tjJQzt6aPfYQ1JiWkt1yGseazks= +google.golang.org/api v0.198.0/go.mod h1:/Lblzl3/Xqqk9hw/yS97TImKTUwnf1bv89v7+OagJzc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -356,6 +398,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= +google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/grpc/examples v0.0.0-20201112215255-90f1b3ee835b h1:NuxyvVZoDfHZwYW9LD4GJiF5/nhiSyP4/InTrvw9Ibk= google.golang.org/grpc/examples v0.0.0-20201112215255-90f1b3ee835b/go.mod h1:IBqQ7wSUJ2Ep09a8rMWFsg4fmI2r38zwsq8a0GgxXpM= google.golang.org/grpc/security/advancedtls v1.0.0 h1:/KQ7VP/1bs53/aopk9QhuPyFAp9Dm9Ejix3lzYkCrDA= diff --git a/pkg/scheduler/in_memory_build_queue.go b/pkg/scheduler/in_memory_build_queue.go index ddf0ad6d..0cc1cdfc 100644 --- a/pkg/scheduler/in_memory_build_queue.go +++ b/pkg/scheduler/in_memory_build_queue.go @@ -2133,8 +2133,9 @@ func (o *operation) waitExecution(bq *InMemoryBuildQueue, out remoteexecution.Ex // Construct the longrunningpb.Operation that needs to be // sent back to the client. metadata, err := anypb.New(&remoteexecution.ExecuteOperationMetadata{ - Stage: t.getStage(), - ActionDigest: t.desiredState.ActionDigest, + Stage: t.getStage(), + ActionDigest: t.desiredState.ActionDigest, + DigestFunction: t.desiredState.DigestFunction, }) if err != nil { return util.StatusWrap(err, "Failed to marshal execute operation metadata") diff --git a/pkg/scheduler/in_memory_build_queue_test.go b/pkg/scheduler/in_memory_build_queue_test.go index 3f641b33..e7637217 100644 --- a/pkg/scheduler/in_memory_build_queue_test.go +++ b/pkg/scheduler/in_memory_build_queue_test.go @@ -286,6 +286,7 @@ func TestInMemoryBuildQueuePurgeStaleWorkersAndQueues(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -347,6 +348,7 @@ func TestInMemoryBuildQueuePurgeStaleWorkersAndQueues(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executingMessage := &longrunningpb.Operation{ @@ -380,6 +382,7 @@ func TestInMemoryBuildQueuePurgeStaleWorkersAndQueues(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -442,6 +445,7 @@ func TestInMemoryBuildQueuePurgeStaleWorkersAndQueues(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -486,6 +490,7 @@ func TestInMemoryBuildQueuePurgeStaleWorkersAndQueues(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err = anypb.New(&remoteexecution.ExecuteResponse{ @@ -586,6 +591,7 @@ func TestInMemoryBuildQueuePurgeStaleOperations(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -625,6 +631,7 @@ func TestInMemoryBuildQueuePurgeStaleOperations(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -651,6 +658,7 @@ func TestInMemoryBuildQueuePurgeStaleOperations(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -838,6 +846,7 @@ func TestInMemoryBuildQueueCrashLoopingWorker(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -905,6 +914,7 @@ func TestInMemoryBuildQueueCrashLoopingWorker(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) testutil.RequireEqualProto(t, &longrunningpb.Operation{ Name: "36ebab65-3c4f-4faf-818b-2eabb4cd1b02", @@ -960,6 +970,7 @@ func TestInMemoryBuildQueueCrashLoopingWorker(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -1059,6 +1070,7 @@ func TestInMemoryBuildQueueKillOperationsOperationName(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -1116,6 +1128,7 @@ func TestInMemoryBuildQueueKillOperationsOperationName(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -1145,6 +1158,7 @@ func TestInMemoryBuildQueueKillOperationsOperationName(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -1296,6 +1310,7 @@ func TestInMemoryBuildQueueKillOperationsSizeClassQueueWithoutWorkers(t *testing Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -1355,6 +1370,7 @@ func TestInMemoryBuildQueueKillOperationsSizeClassQueueWithoutWorkers(t *testing Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -1615,6 +1631,7 @@ func TestInMemoryBuildQueueDrainedWorker(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -1721,6 +1738,7 @@ func TestInMemoryBuildQueueDrainedWorker(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -1873,6 +1891,7 @@ func TestInMemoryBuildQueueInvocationFairness(t *testing.T) { Hash: p.actionHash, SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_MD5, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -2011,6 +2030,7 @@ func TestInMemoryBuildQueueInvocationFairness(t *testing.T) { Hash: p.actionHash, SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_MD5, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -2102,6 +2122,7 @@ func TestInMemoryBuildQueueInvocationFairness(t *testing.T) { Hash: p.actionHash, SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_MD5, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -2251,6 +2272,7 @@ func TestInMemoryBuildQueueInFlightDeduplicationAbandonQueued(t *testing.T) { Hash: "fc96ea0eee854b45950d3a7448332445730886691b992cb7917da0853664f7c2", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA256, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -2442,6 +2464,7 @@ func TestInMemoryBuildQueueInFlightDeduplicationAbandonExecuting(t *testing.T) { Hash: "fc96ea0eee854b45950d3a7448332445730886691b992cb7917da0853664f7c2", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA256, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -2630,6 +2653,7 @@ func TestInMemoryBuildQueuePreferBeingIdle(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -2664,6 +2688,7 @@ func TestInMemoryBuildQueuePreferBeingIdle(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -2751,6 +2776,7 @@ func TestInMemoryBuildQueuePreferBeingIdle(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -2891,6 +2917,7 @@ func TestInMemoryBuildQueueMultipleSizeClasses(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -2948,6 +2975,7 @@ func TestInMemoryBuildQueueMultipleSizeClasses(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -3010,6 +3038,7 @@ func TestInMemoryBuildQueueMultipleSizeClasses(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -3069,6 +3098,7 @@ func TestInMemoryBuildQueueMultipleSizeClasses(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -3129,6 +3159,7 @@ func TestInMemoryBuildQueueMultipleSizeClasses(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -3245,6 +3276,7 @@ func TestInMemoryBuildQueueBackgroundRun(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -3302,6 +3334,7 @@ func TestInMemoryBuildQueueBackgroundRun(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -3366,6 +3399,7 @@ func TestInMemoryBuildQueueBackgroundRun(t *testing.T) { Hash: "da39a3ee5e6b4b0d3255bfef95601890afd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -3521,13 +3555,15 @@ func TestInMemoryBuildQueueIdleSynchronizingWorkers(t *testing.T) { }, } metadataExecuting, err := anypb.New(&remoteexecution.ExecuteOperationMetadata{ - Stage: remoteexecution.ExecutionStage_EXECUTING, - ActionDigest: actionDigest, + Stage: remoteexecution.ExecutionStage_EXECUTING, + ActionDigest: actionDigest, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) metadataCompleted, err := anypb.New(&remoteexecution.ExecuteOperationMetadata{ - Stage: remoteexecution.ExecutionStage_COMPLETED, - ActionDigest: actionDigest, + Stage: remoteexecution.ExecutionStage_COMPLETED, + ActionDigest: actionDigest, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -3979,6 +4015,7 @@ func TestInMemoryBuildQueueWorkerInvocationStickinessLimit(t *testing.T) { Hash: "0474d2f48968a56da4de20718d8ac23aafd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -4051,6 +4088,7 @@ func TestInMemoryBuildQueueWorkerInvocationStickinessLimit(t *testing.T) { Hash: "0474d2f48968a56da4de20718d8ac23aafd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) operationName := operationParameters[operationIndex].operationName @@ -4096,6 +4134,7 @@ func TestInMemoryBuildQueueWorkerInvocationStickinessLimit(t *testing.T) { Hash: "0474d2f48968a56da4de20718d8ac23aafd80709", SizeBytes: 123, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{ @@ -4208,6 +4247,7 @@ func TestInMemoryBuildQueueAuthorization(t *testing.T) { Hash: "61c585c297d00409bd477b6b80759c94ec545ab4", SizeBytes: 456, }, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ Name: "36ebab65-3c4f-4faf-818b-2eabb4cd1b02", @@ -4311,8 +4351,9 @@ func TestInMemoryBuildQueueNestedInvocationsSynchronization(t *testing.T) { update, err := stream.Recv() require.NoError(t, err) metadata, err := anypb.New(&remoteexecution.ExecuteOperationMetadata{ - Stage: remoteexecution.ExecutionStage_QUEUED, - ActionDigest: actionDigest, + Stage: remoteexecution.ExecutionStage_QUEUED, + ActionDigest: actionDigest, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, &longrunningpb.Operation{ @@ -4362,8 +4403,9 @@ func TestInMemoryBuildQueueNestedInvocationsSynchronization(t *testing.T) { update, err = stream.Recv() require.NoError(t, err) metadata, err = anypb.New(&remoteexecution.ExecuteOperationMetadata{ - Stage: remoteexecution.ExecutionStage_EXECUTING, - ActionDigest: actionDigest, + Stage: remoteexecution.ExecutionStage_EXECUTING, + ActionDigest: actionDigest, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) testutil.RequireEqualProto(t, update, &longrunningpb.Operation{ @@ -4404,8 +4446,9 @@ func TestInMemoryBuildQueueNestedInvocationsSynchronization(t *testing.T) { update, err = stream.Recv() require.NoError(t, err) metadata, err = anypb.New(&remoteexecution.ExecuteOperationMetadata{ - Stage: remoteexecution.ExecutionStage_COMPLETED, - ActionDigest: actionDigest, + Stage: remoteexecution.ExecutionStage_COMPLETED, + ActionDigest: actionDigest, + DigestFunction: remoteexecution.DigestFunction_SHA1, }) require.NoError(t, err) executeResponse, err := anypb.New(&remoteexecution.ExecuteResponse{