From e65646706c9c6abd2d7c61932eaded6ac36aa990 Mon Sep 17 00:00:00 2001 From: sergeyb Date: Fri, 20 Feb 2026 06:04:11 +0000 Subject: [PATCH] refactor(entity): Enums to strings, proto without prefix --- CLAUDE.md | 2 +- entities/request.go | 31 +++++----- extensions/storage/mysql/schema/request.sql | 4 +- gateway/controller/land.go | 29 +++++++++- gateway/controller/land_test.go | 2 +- gateway/proto/gateway.proto | 8 +-- gateway/protopb/gateway.pb.go | 39 ++++++------- gateway/protopb/gateway.pb.yarpc.go | 63 ++++++++++----------- integration_tests/suite_test.go | 2 +- 9 files changed, 101 insertions(+), 79 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 325e0c94..2060ba08 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -37,7 +37,7 @@ bazel run //examples/server/gateway:gateway bazel test //... # Run tests with verbose output -bazel test //... --test_output=all --test_arg=-v +bazel test //... --test_output=all --test_arg=-test.v ``` ### Dependency Management diff --git a/entities/request.go b/entities/request.go index c152e34a..487c2799 100644 --- a/entities/request.go +++ b/entities/request.go @@ -7,36 +7,33 @@ import ( ) // RequestLandStrategy defines the possible source control integration methods. -type RequestLandStrategy int +type RequestLandStrategy string -// do not use iota here, as values should be fixed and consistent across versions. const ( - // RequestLandStrategyDefault lets the server decide based on configuration. - RequestLandStrategyDefault RequestLandStrategy = 0 + // RequestLandStrategyUnknown is the unknown strategy. It is set by default when the structure is initialized. It should never be seen in the system and used for error control. + RequestLandStrategyUnknown RequestLandStrategy = "" // RequestLandStrategyRebase rebases commits onto the target branch before landing. - RequestLandStrategyRebase RequestLandStrategy = 1 - // RequestLandStrategySquashRebase squashes commits into a single commit before rebase. - RequestLandStrategySquashRebase RequestLandStrategy = 2 + RequestLandStrategyRebase RequestLandStrategy = "rebase" + // RequestLandStrategySquashRebase squashes commits into a single commit before rebasing on top of the target branch. + RequestLandStrategySquashRebase RequestLandStrategy = "squash_rebase" // RequestLandStrategyMerge merges commits into the target branch by creating a separate merge commit, preserving the commit history along with hashes. - RequestLandStrategyMerge RequestLandStrategy = 3 + RequestLandStrategyMerge RequestLandStrategy = "merge" ) // RequestState defines the possible states of a land request. -type RequestState int +type RequestState string -// TODO: define all states -// do not use iota here, as values should be fixed and consistent across versions. const ( // RequestStateUnknown is the unreachable state. It is set by default when the structure is initialized. It should never be seen in the system. - RequestStateUnknown RequestState = 0 + RequestStateUnknown RequestState = "" // RequestStateNew is the initial state of a land request. It is confirmed by the system but the processing is not started yet. - RequestStateNew RequestState = 1 + RequestStateNew RequestState = "new" // RequestStateProcessing is the state of a land request that is being processed. - RequestStateProcessing RequestState = 2 + RequestStateProcessing RequestState = "processing" // RequestStateLanded is the state of a land request that has been successfully processed and landed. This is the final state. - RequestStateLanded RequestState = 3 + RequestStateLanded RequestState = "landed" // RequestStateError is the state of a land request that has encountered an error. This is the final state. - RequestStateError RequestState = 4 + RequestStateError RequestState = "error" ) // Change represents a set of related code changes identified by one or more IDs from a particular code change provider, like Github Pull Requests. @@ -61,7 +58,7 @@ type Request struct { Seq int64 // Change is a number of code changes (such as pull requests) to land into the target branch. Target branch is defined by the queue configuration. Change Change - // LandStrategy is the source control integration strategy to use for this land operation. If not specified, the default queue strategy is used. + // LandStrategy is the source control integration strategy to use for this land operation. LandStrategy RequestLandStrategy // **************** diff --git a/extensions/storage/mysql/schema/request.sql b/extensions/storage/mysql/schema/request.sql index 0c596053..a02c4f43 100644 --- a/extensions/storage/mysql/schema/request.sql +++ b/extensions/storage/mysql/schema/request.sql @@ -3,8 +3,8 @@ CREATE TABLE IF NOT EXISTS request ( seq BIGINT NOT NULL, change_source VARCHAR(255) NOT NULL, change_ids JSON NOT NULL, - land_strategy INT NOT NULL, - state INT NOT NULL, + land_strategy VARCHAR(64) NOT NULL, + state VARCHAR(64) NOT NULL, version INT NOT NULL, PRIMARY KEY (queue, seq) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; diff --git a/gateway/controller/land.go b/gateway/controller/land.go index ee77d26b..d911d3ab 100644 --- a/gateway/controller/land.go +++ b/gateway/controller/land.go @@ -41,9 +41,17 @@ func (c *LandController) Land(ctx context.Context, req *pb.LandRequest) (*pb.Lan Source: req.Change.GetSource(), IDs: req.Change.GetIds(), } - strategy := entities.RequestLandStrategy(int(req.Strategy)) - request, err := c.storeFactory.GetRequestStore().Create(ctx, req.Queue, change, strategy, entities.RequestStateNew) + // TODO: validate that queue is configured. Return error if not. + queue := req.Queue + + // TODO: pass default queue land strategy to resolver function to process a default. + strategy, err := resolveRequestLandStrategy(req.Strategy) + if err != nil { + return nil, fmt.Errorf("LandController failed to map strategy for queue=%s: %w", req.Queue, err) + } + + request, err := c.storeFactory.GetRequestStore().Create(ctx, queue, change, strategy, entities.RequestStateNew) if err != nil { return nil, fmt.Errorf("LandController failed to create request for queue=%s: %w", req.Queue, err) } @@ -59,3 +67,20 @@ func (c *LandController) Land(ctx context.Context, req *pb.LandRequest) (*pb.Lan Sqid: sqid, }, nil } + +// protoStrategyToEntity maps a proto Strategy enum to the entity RequestLandStrategy. +func resolveRequestLandStrategy(s pb.Strategy) (entities.RequestLandStrategy, error) { + switch s { + case pb.Strategy_DEFAULT: + // TODO: resolve default strategy based on queue configuration + return entities.RequestLandStrategyRebase, nil + case pb.Strategy_REBASE: + return entities.RequestLandStrategyRebase, nil + case pb.Strategy_SQUASH_REBASE: + return entities.RequestLandStrategySquashRebase, nil + case pb.Strategy_MERGE: + return entities.RequestLandStrategyMerge, nil + default: + return entities.RequestLandStrategyUnknown, fmt.Errorf("unknown proto strategy: %v", s) + } +} diff --git a/gateway/controller/land_test.go b/gateway/controller/land_test.go index f3b693ac..d589ffed 100644 --- a/gateway/controller/land_test.go +++ b/gateway/controller/land_test.go @@ -106,7 +106,7 @@ func TestLand_PassesCorrectParametersToStore(t *testing.T) { req := &pb.LandRequest{ Queue: "my-queue", Change: &pb.Change{Source: "github", Ids: []string{"pr-1", "pr-2"}}, - Strategy: pb.Strategy_STRATEGY_REBASE, + Strategy: pb.Strategy_REBASE, } resp, err := controller.Land(ctx, req) diff --git a/gateway/proto/gateway.proto b/gateway/proto/gateway.proto index 1c04bc83..44a2a10b 100644 --- a/gateway/proto/gateway.proto +++ b/gateway/proto/gateway.proto @@ -32,13 +32,13 @@ message PingResponse { // Strategy defines the possible source control integration methods enum Strategy { // Default strategy (let server decide based on configuration) - STRATEGY_DEFAULT = 0; + DEFAULT = 0; // Rebase commits onto target branch before landing - STRATEGY_REBASE = 1; + REBASE = 1; // Same as REBASE but squash commits into a single commit before rebase - STRATEGY_SQUASH_REBASE = 2; + SQUASH_REBASE = 2; // Merge commits into the target branch by creating a separate merge commit, preserving the commit history along with hashes - STRATEGY_MERGE = 3; + MERGE = 3; } // Change represents a set of related code changes identified by one or more IDs from a particular code change provider, like Github Pull Requests. diff --git a/gateway/protopb/gateway.pb.go b/gateway/protopb/gateway.pb.go index 95aaefb2..175058b8 100644 --- a/gateway/protopb/gateway.pb.go +++ b/gateway/protopb/gateway.pb.go @@ -26,28 +26,28 @@ type Strategy int32 const ( // Default strategy (let server decide based on configuration) - Strategy_STRATEGY_DEFAULT Strategy = 0 + Strategy_DEFAULT Strategy = 0 // Rebase commits onto target branch before landing - Strategy_STRATEGY_REBASE Strategy = 1 + Strategy_REBASE Strategy = 1 // Same as REBASE but squash commits into a single commit before rebase - Strategy_STRATEGY_SQUASH_REBASE Strategy = 2 + Strategy_SQUASH_REBASE Strategy = 2 // Merge commits into the target branch by creating a separate merge commit, preserving the commit history along with hashes - Strategy_STRATEGY_MERGE Strategy = 3 + Strategy_MERGE Strategy = 3 ) // Enum value maps for Strategy. var ( Strategy_name = map[int32]string{ - 0: "STRATEGY_DEFAULT", - 1: "STRATEGY_REBASE", - 2: "STRATEGY_SQUASH_REBASE", - 3: "STRATEGY_MERGE", + 0: "DEFAULT", + 1: "REBASE", + 2: "SQUASH_REBASE", + 3: "MERGE", } Strategy_value = map[string]int32{ - "STRATEGY_DEFAULT": 0, - "STRATEGY_REBASE": 1, - "STRATEGY_SQUASH_REBASE": 2, - "STRATEGY_MERGE": 3, + "DEFAULT": 0, + "REBASE": 1, + "SQUASH_REBASE": 2, + "MERGE": 3, } ) @@ -315,7 +315,7 @@ func (x *LandRequest) GetStrategy() Strategy { if x != nil { return x.Strategy } - return Strategy_STRATEGY_DEFAULT + return Strategy_DEFAULT } // LandResponse defines the response to a land request. @@ -490,12 +490,13 @@ const file_gateway_proto_rawDesc = "" + "\amessage\x18\x01 \x01(\tR\amessage\"l\n" + "\x16UnrecognizedQueueError\x12<\n" + "\x05error\x18\x01 \x01(\v2&.uber.devexp.submitqueue.gateway.ErrorR\x05error\x12\x14\n" + - "\x05queue\x18\x02 \x01(\tR\x05queue*e\n" + - "\bStrategy\x12\x14\n" + - "\x10STRATEGY_DEFAULT\x10\x00\x12\x13\n" + - "\x0fSTRATEGY_REBASE\x10\x01\x12\x1a\n" + - "\x16STRATEGY_SQUASH_REBASE\x10\x02\x12\x12\n" + - "\x0eSTRATEGY_MERGE\x10\x032\xe2\x01\n" + + "\x05queue\x18\x02 \x01(\tR\x05queue*A\n" + + "\bStrategy\x12\v\n" + + "\aDEFAULT\x10\x00\x12\n" + + "\n" + + "\x06REBASE\x10\x01\x12\x11\n" + + "\rSQUASH_REBASE\x10\x02\x12\t\n" + + "\x05MERGE\x10\x032\xe2\x01\n" + "\x12SubmitQueueGateway\x12e\n" + "\x04Ping\x12,.uber.devexp.submitqueue.gateway.PingRequest\x1a-.uber.devexp.submitqueue.gateway.PingResponse\"\x00\x12e\n" + "\x04Land\x12,.uber.devexp.submitqueue.gateway.LandRequest\x1a-.uber.devexp.submitqueue.gateway.LandResponse\"\x00Bb\n" + diff --git a/gateway/protopb/gateway.pb.yarpc.go b/gateway/protopb/gateway.pb.yarpc.go index 1ca1e537..c1cbe323 100644 --- a/gateway/protopb/gateway.pb.yarpc.go +++ b/gateway/protopb/gateway.pb.yarpc.go @@ -283,38 +283,37 @@ var ( var yarpcFileDescriptorClosuref1a937782ebbded5 = [][]byte{ // gateway.proto []byte{ - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x4b, 0x6f, 0xd3, 0x40, - 0x10, 0xc7, 0xeb, 0xbc, 0x48, 0x26, 0xa1, 0x44, 0x4b, 0x15, 0x59, 0x11, 0x12, 0xa9, 0x91, 0x68, - 0x78, 0x39, 0x92, 0xb9, 0x22, 0xa1, 0x04, 0x4c, 0x38, 0x14, 0x94, 0xae, 0x93, 0x03, 0x5c, 0x2a, - 0x3f, 0x46, 0x8e, 0x25, 0xfc, 0x88, 0x77, 0x5d, 0x28, 0x77, 0x3e, 0x0d, 0xdf, 0x8a, 0x4f, 0x82, - 0xbc, 0x5e, 0xbb, 0xbe, 0x80, 0x73, 0x9b, 0x99, 0x9d, 0xdf, 0xce, 0x7f, 0x66, 0xd6, 0x86, 0xfb, - 0xbe, 0xcd, 0xf1, 0xbb, 0x7d, 0xab, 0x27, 0x69, 0xcc, 0x63, 0xf2, 0x38, 0x73, 0x30, 0xd5, 0x3d, - 0xbc, 0xc1, 0x1f, 0x89, 0xce, 0x32, 0x27, 0x0c, 0xf8, 0x21, 0xc3, 0x0c, 0x75, 0x99, 0xa6, 0x5d, - 0xc0, 0x70, 0x13, 0x44, 0x3e, 0xc5, 0x43, 0x86, 0x8c, 0x13, 0x15, 0xee, 0x85, 0xc8, 0x98, 0xed, - 0xa3, 0xaa, 0xcc, 0x94, 0xf9, 0x80, 0x96, 0xae, 0xf6, 0x4b, 0x81, 0x51, 0x91, 0xc9, 0x92, 0x38, - 0x62, 0xf8, 0xef, 0x54, 0x72, 0x0e, 0x23, 0x86, 0xe9, 0x4d, 0xe0, 0xe2, 0x75, 0x64, 0x87, 0xa8, - 0xb6, 0xc4, 0xf1, 0x50, 0xc6, 0x3e, 0xdb, 0x21, 0x92, 0x47, 0x30, 0xe0, 0x41, 0x88, 0x8c, 0xdb, - 0x61, 0xa2, 0xb6, 0x67, 0xca, 0xbc, 0x4d, 0xef, 0x02, 0x64, 0x0a, 0xfd, 0x7d, 0xcc, 0xb8, 0x80, - 0x3b, 0x02, 0xae, 0x7c, 0xcd, 0x80, 0xde, 0xbb, 0xbd, 0x1d, 0xf9, 0x48, 0x26, 0xd0, 0x63, 0x71, - 0x96, 0xba, 0x65, 0x7d, 0xe9, 0x91, 0x31, 0xb4, 0x03, 0x8f, 0xa9, 0xad, 0x59, 0x7b, 0x3e, 0xa0, - 0xb9, 0xa9, 0xfd, 0x56, 0x60, 0x78, 0x69, 0x47, 0x5e, 0xd9, 0xe5, 0x19, 0x74, 0xc5, 0x14, 0x24, - 0x58, 0x38, 0xe4, 0x2d, 0xf4, 0x5c, 0x71, 0xb3, 0x10, 0x3c, 0x34, 0x2e, 0xf4, 0x86, 0xe1, 0xe9, - 0x85, 0x10, 0x2a, 0x31, 0x62, 0x42, 0x9f, 0xf1, 0xd4, 0xe6, 0xe8, 0xdf, 0x0a, 0xd9, 0xa7, 0xc6, - 0xb3, 0xc6, 0x2b, 0x2c, 0x09, 0xd0, 0x0a, 0xd5, 0x34, 0x18, 0x15, 0x62, 0xe5, 0xa0, 0x09, 0x74, - 0xd8, 0x21, 0xf0, 0xa4, 0x58, 0x61, 0x6b, 0xe7, 0xd0, 0x35, 0xd3, 0x34, 0x4e, 0xff, 0xb3, 0xb0, - 0x6f, 0x30, 0xd9, 0x45, 0x29, 0xba, 0xb1, 0x1f, 0x05, 0x3f, 0xd1, 0xbb, 0xca, 0xcb, 0x16, 0xcc, - 0x1b, 0xe8, 0x62, 0x6e, 0x08, 0x62, 0x68, 0x3c, 0x6d, 0x14, 0x29, 0x30, 0x5a, 0x40, 0x77, 0xc3, - 0x6b, 0xd5, 0x86, 0xf7, 0x1c, 0xa1, 0x5f, 0xb6, 0x42, 0xce, 0x60, 0x6c, 0x6d, 0xe9, 0x72, 0x6b, - 0xae, 0xbf, 0x5c, 0xbf, 0x37, 0x3f, 0x2c, 0x77, 0x97, 0xdb, 0xf1, 0x09, 0x79, 0x08, 0x0f, 0xaa, - 0x28, 0x35, 0x57, 0x4b, 0xcb, 0x1c, 0x2b, 0x64, 0x0a, 0x93, 0x2a, 0x68, 0x5d, 0xed, 0x96, 0xd6, - 0xc7, 0xf2, 0xac, 0x45, 0x08, 0x9c, 0x56, 0x67, 0x9f, 0x4c, 0xba, 0x36, 0xc7, 0x6d, 0xe3, 0x8f, - 0x02, 0xc4, 0x12, 0x0a, 0x45, 0x3f, 0xeb, 0x42, 0x20, 0x41, 0xe8, 0xe4, 0x6f, 0x93, 0xbc, 0x6c, - 0x6c, 0xa5, 0xf6, 0xd8, 0xa7, 0xaf, 0x8e, 0xcc, 0x2e, 0xf6, 0xa0, 0x9d, 0xe4, 0x65, 0xf2, 0xcd, - 0x1c, 0x51, 0xa6, 0xf6, 0xda, 0x8e, 0x28, 0x53, 0x5f, 0xb7, 0x76, 0xb2, 0x72, 0xe0, 0x89, 0x1b, - 0x87, 0x4d, 0xd4, 0x6a, 0x24, 0xbb, 0xdf, 0xe4, 0x5f, 0xfa, 0x46, 0xf9, 0xfa, 0xc2, 0x0f, 0xf8, - 0x3e, 0x73, 0x74, 0x37, 0x0e, 0x17, 0x39, 0xbb, 0xa8, 0x41, 0x0b, 0x09, 0x2d, 0xc4, 0x6f, 0x21, - 0x71, 0x9c, 0x9e, 0x30, 0x5e, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x34, 0x94, 0xc4, 0x30, - 0x04, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcd, 0x6e, 0xd3, 0x4e, + 0x14, 0xc5, 0xe3, 0x38, 0x71, 0x93, 0xeb, 0xf4, 0xaf, 0xfc, 0x47, 0xa8, 0xb2, 0x2a, 0x24, 0x52, + 0x23, 0xd1, 0xf0, 0xe5, 0x48, 0x66, 0x8b, 0x84, 0x12, 0x30, 0x65, 0x51, 0x50, 0x6a, 0x93, 0x0d, + 0x9b, 0xca, 0x1f, 0x57, 0x8e, 0x25, 0xec, 0x71, 0x66, 0xc6, 0x85, 0xb2, 0xe7, 0x69, 0x78, 0x2b, + 0x9e, 0x04, 0x79, 0x3c, 0x69, 0xbd, 0x01, 0x67, 0x77, 0xef, 0xf8, 0xfe, 0x7c, 0xce, 0x9c, 0x99, + 0x81, 0xe3, 0x34, 0x14, 0xf8, 0x2d, 0xbc, 0x75, 0x4a, 0x46, 0x05, 0x25, 0x8f, 0xaa, 0x08, 0x99, + 0x93, 0xe0, 0x0d, 0x7e, 0x2f, 0x1d, 0x5e, 0x45, 0x79, 0x26, 0x76, 0x15, 0x56, 0xe8, 0xa8, 0x31, + 0xfb, 0x1c, 0xcc, 0x75, 0x56, 0xa4, 0x3e, 0xee, 0x2a, 0xe4, 0x82, 0x58, 0x70, 0x94, 0x23, 0xe7, + 0x61, 0x8a, 0x96, 0x36, 0xd3, 0xe6, 0x63, 0x7f, 0xdf, 0xda, 0x3f, 0x35, 0x98, 0x34, 0x93, 0xbc, + 0xa4, 0x05, 0xc7, 0xbf, 0x8f, 0x92, 0x33, 0x98, 0x70, 0x64, 0x37, 0x59, 0x8c, 0xd7, 0x45, 0x98, + 0xa3, 0xd5, 0x97, 0x9f, 0x4d, 0xb5, 0xf6, 0x29, 0xcc, 0x91, 0x3c, 0x84, 0xb1, 0xc8, 0x72, 0xe4, + 0x22, 0xcc, 0x4b, 0x4b, 0x9f, 0x69, 0x73, 0xdd, 0xbf, 0x5f, 0x20, 0xa7, 0x30, 0xda, 0x52, 0x2e, + 0x24, 0x3c, 0x90, 0xf0, 0x5d, 0x6f, 0xbb, 0x60, 0xbc, 0xdd, 0x86, 0x45, 0x8a, 0xe4, 0x04, 0x0c, + 0x4e, 0x2b, 0x16, 0xef, 0xf5, 0x55, 0x47, 0xa6, 0xa0, 0x67, 0x09, 0xb7, 0xfa, 0x33, 0x7d, 0x3e, + 0xf6, 0xeb, 0xd2, 0xfe, 0xa5, 0x81, 0x79, 0x19, 0x16, 0xc9, 0x7e, 0x97, 0x0f, 0x60, 0x28, 0x53, + 0x50, 0x60, 0xd3, 0x90, 0x37, 0x60, 0xc4, 0xf2, 0xcf, 0xd2, 0xb0, 0xe9, 0x9e, 0x3b, 0x1d, 0xe1, + 0x39, 0x8d, 0x11, 0x5f, 0x61, 0xc4, 0x83, 0x11, 0x17, 0x2c, 0x14, 0x98, 0xde, 0x4a, 0xdb, 0xff, + 0xb9, 0x4f, 0x3b, 0x7f, 0x11, 0x28, 0xc0, 0xbf, 0x43, 0x6d, 0x1b, 0x26, 0x8d, 0x59, 0x15, 0x34, + 0x81, 0x01, 0xdf, 0x65, 0x89, 0x32, 0x2b, 0x6b, 0xfb, 0x0c, 0x86, 0x1e, 0x63, 0x94, 0xfd, 0xe3, + 0xc0, 0xbe, 0xc2, 0xc9, 0xa6, 0x60, 0x18, 0xd3, 0xb4, 0xc8, 0x7e, 0x60, 0x72, 0x55, 0xcb, 0x36, + 0xcc, 0x6b, 0x18, 0x62, 0x5d, 0x48, 0xc2, 0x74, 0x9f, 0x74, 0x9a, 0x94, 0x98, 0xdf, 0x40, 0xf7, + 0xe1, 0xf5, 0x5b, 0xe1, 0x3d, 0x5b, 0xc2, 0x68, 0xbf, 0x15, 0x62, 0xc2, 0xd1, 0x3b, 0xef, 0xfd, + 0x72, 0x73, 0xf9, 0x79, 0xda, 0x23, 0x00, 0x86, 0xef, 0xad, 0x96, 0x81, 0x37, 0xd5, 0xc8, 0xff, + 0x70, 0x1c, 0x5c, 0x6d, 0x96, 0xc1, 0x87, 0x6b, 0xb5, 0xd4, 0x27, 0x63, 0x18, 0x7e, 0xf4, 0xfc, + 0x0b, 0x6f, 0xaa, 0xbb, 0xbf, 0x35, 0x20, 0x81, 0x54, 0x97, 0x5e, 0x2f, 0x1a, 0x71, 0x82, 0x30, + 0xa8, 0xef, 0x1d, 0x79, 0xd1, 0x69, 0xb3, 0x75, 0x91, 0x4f, 0x5f, 0x1e, 0x38, 0xdd, 0x64, 0x6c, + 0xf7, 0x6a, 0x99, 0x3a, 0xf5, 0x03, 0x64, 0x5a, 0x37, 0xe9, 0x00, 0x99, 0xf6, 0x51, 0xda, 0xbd, + 0x55, 0x04, 0x8f, 0x63, 0x9a, 0x77, 0x51, 0xab, 0x89, 0xda, 0xfd, 0xba, 0x7e, 0xc5, 0x6b, 0xed, + 0xcb, 0xf3, 0x34, 0x13, 0xdb, 0x2a, 0x72, 0x62, 0x9a, 0x2f, 0x6a, 0x76, 0xd1, 0x82, 0x16, 0x0a, + 0x5a, 0xc8, 0x27, 0x5f, 0x46, 0x91, 0x21, 0x8b, 0x57, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x20, + 0x51, 0xf6, 0x91, 0x0c, 0x04, 0x00, 0x00, }, } diff --git a/integration_tests/suite_test.go b/integration_tests/suite_test.go index 6dc45a92..c1ffd4d0 100644 --- a/integration_tests/suite_test.go +++ b/integration_tests/suite_test.go @@ -120,7 +120,7 @@ func (s *IntegrationSuite) TestLandRequest() { req := &gatewaypb.LandRequest{ Queue: "integration-test-queue", Change: &gatewaypb.Change{Source: "github", Ids: []string{"pr-100", "pr-101"}}, - Strategy: gatewaypb.Strategy_STRATEGY_REBASE, + Strategy: gatewaypb.Strategy_REBASE, } s.log.logf("Sending Land request for queue=%s", req.Queue)