From f73a91128ddd884e5b46b0a88aabae38a081aa56 Mon Sep 17 00:00:00 2001 From: Marlon Gamez Date: Thu, 27 May 2021 14:52:27 -0700 Subject: [PATCH 1/3] update metadata emission --- .../event/v2/{util.go => metadata.go} | 68 ++-- .../v2/{util_test.go => metadata_test.go} | 34 +- pkg/skaffold/runner/v1/dev.go | 5 + pkg/skaffold/runner/v1/new.go | 2 - proto/v2/skaffold.pb.go | 344 +++++++++--------- proto/v2/skaffold.proto | 12 +- 6 files changed, 233 insertions(+), 232 deletions(-) rename pkg/skaffold/event/v2/{util.go => metadata.go} (72%) rename pkg/skaffold/event/v2/{util_test.go => metadata_test.go} (73%) diff --git a/pkg/skaffold/event/v2/util.go b/pkg/skaffold/event/v2/metadata.go similarity index 72% rename from pkg/skaffold/event/v2/util.go rename to pkg/skaffold/event/v2/metadata.go index d6dd75fdc37..9803c8a63db 100644 --- a/pkg/skaffold/event/v2/util.go +++ b/pkg/skaffold/event/v2/metadata.go @@ -17,21 +17,31 @@ limitations under the License. package v2 import ( + "fmt" "strings" latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1" + "github.com/GoogleContainerTools/skaffold/pkg/skaffold/version" proto "github.com/GoogleContainerTools/skaffold/proto/v2" ) +func LogMetaEvent() { + metadata := handler.state.Metadata + handler.handle( + &proto.Event{ + EventType: &proto.Event_MetaEvent{ + MetaEvent: &proto.MetaEvent{ + Entry: fmt.Sprintf("Starting Skaffold: %+v", version.Get()), + Metadata: metadata, + }, + }, + }, + ) +} + func initializeMetadata(pipelines []latestV1.Pipeline, kubeContext string) *proto.Metadata { - artifactCount := 0 - for _, p := range pipelines { - artifactCount += len(p.Build.Artifacts) - } m := &proto.Metadata{ - Build: &proto.BuildMetadata{ - NumberOfArtifacts: int32(artifactCount), - }, + Build: &proto.BuildMetadata{}, Deploy: &proto.DeployMetadata{}, } @@ -48,13 +58,13 @@ func initializeMetadata(pipelines []latestV1.Pipeline, kubeContext string) *prot m.Build.Type = proto.BuildType_UNKNOWN_BUILD_TYPE } - var builders []*proto.BuildMetadata_ImageBuilder + var artifacts []*proto.BuildMetadata_Artifact var deployers []*proto.DeployMetadata_Deployer for _, p := range pipelines { - builders = append(builders, getBuilders(p.Build)...) + artifacts = append(artifacts, getArtifacts(p.Build)...) deployers = append(deployers, getDeploy(p.Deploy)...) } - m.Build.Builders = builders + m.Build.Artifacts = artifacts if len(deployers) == 0 { m.Deploy = &proto.DeployMetadata{} @@ -67,33 +77,31 @@ func initializeMetadata(pipelines []latestV1.Pipeline, kubeContext string) *prot return m } -func getBuilders(b latestV1.BuildConfig) []*proto.BuildMetadata_ImageBuilder { - m := map[proto.BuilderType]int{} +func getArtifacts(b latestV1.BuildConfig) []*proto.BuildMetadata_Artifact { + result := []*proto.BuildMetadata_Artifact{} for _, a := range b.Artifacts { + artifact := &proto.BuildMetadata_Artifact{ + Name: a.ImageName, + } switch { case a.BazelArtifact != nil: - updateOrAddKey(m, proto.BuilderType_BAZEL) + artifact.Type = proto.BuilderType_BAZEL case a.BuildpackArtifact != nil: - updateOrAddKey(m, proto.BuilderType_BUILDPACKS) + artifact.Type = proto.BuilderType_BUILDPACKS case a.CustomArtifact != nil: - updateOrAddKey(m, proto.BuilderType_CUSTOM) + artifact.Type = proto.BuilderType_CUSTOM case a.DockerArtifact != nil: - updateOrAddKey(m, proto.BuilderType_DOCKER) + artifact.Type = proto.BuilderType_DOCKER case a.JibArtifact != nil: - updateOrAddKey(m, proto.BuilderType_JIB) + artifact.Type = proto.BuilderType_JIB case a.KanikoArtifact != nil: - updateOrAddKey(m, proto.BuilderType_KANIKO) + artifact.Type = proto.BuilderType_KANIKO default: - updateOrAddKey(m, proto.BuilderType_UNKNOWN_BUILDER_TYPE) + artifact.Type = proto.BuilderType_UNKNOWN_BUILDER_TYPE } + result = append(result, artifact) } - builders := make([]*proto.BuildMetadata_ImageBuilder, len(m)) - i := 0 - for k, v := range m { - builders[i] = &proto.BuildMetadata_ImageBuilder{Type: k, Count: int32(v)} - i++ - } - return builders + return result } func getDeploy(d latestV1.DeployConfig) []*proto.DeployMetadata_Deployer { @@ -111,14 +119,6 @@ func getDeploy(d latestV1.DeployConfig) []*proto.DeployMetadata_Deployer { return deployers } -func updateOrAddKey(m map[proto.BuilderType]int, k proto.BuilderType) { - if _, ok := m[k]; ok { - m[k]++ - return - } - m[k] = 1 -} - func getClusterType(c string) proto.ClusterType { switch { case strings.Contains(c, "minikube"): diff --git a/pkg/skaffold/event/v2/util_test.go b/pkg/skaffold/event/v2/metadata_test.go similarity index 73% rename from pkg/skaffold/event/v2/util_test.go rename to pkg/skaffold/event/v2/metadata_test.go index 771ccfa7b2d..4e047bd6565 100644 --- a/pkg/skaffold/event/v2/util_test.go +++ b/pkg/skaffold/event/v2/metadata_test.go @@ -37,7 +37,7 @@ func TestEmptyState(t *testing.T) { cfg: latestV1.Pipeline{ Build: latestV1.BuildConfig{ BuildType: latestV1.BuildType{LocalBuild: &latestV1.LocalBuild{}}, - Artifacts: []*latestV1.Artifact{{ImageName: "img", ArtifactType: latestV1.ArtifactType{DockerArtifact: &latestV1.DockerArtifact{}}}}, + Artifacts: []*latestV1.Artifact{{ImageName: "docker-artifact-1", ArtifactType: latestV1.ArtifactType{DockerArtifact: &latestV1.DockerArtifact{}}}}, }, Deploy: latestV1.DeployConfig{ DeployType: latestV1.DeployType{ @@ -49,9 +49,8 @@ func TestEmptyState(t *testing.T) { cluster: "minikube", expected: &proto.Metadata{ Build: &proto.BuildMetadata{ - NumberOfArtifacts: 1, - Type: proto.BuildType_LOCAL, - Builders: []*proto.BuildMetadata_ImageBuilder{{Type: proto.BuilderType_DOCKER, Count: 1}}, + Type: proto.BuildType_LOCAL, + Artifacts: []*proto.BuildMetadata_Artifact{{Type: proto.BuilderType_DOCKER, Name: "docker-artifact-1"}}, }, Deploy: &proto.DeployMetadata{ Cluster: proto.ClusterType_MINIKUBE, @@ -67,9 +66,9 @@ func TestEmptyState(t *testing.T) { Build: latestV1.BuildConfig{ BuildType: latestV1.BuildType{Cluster: &latestV1.ClusterDetails{}}, Artifacts: []*latestV1.Artifact{ - {ImageName: "img1", ArtifactType: latestV1.ArtifactType{DockerArtifact: &latestV1.DockerArtifact{}}}, - {ImageName: "img2", ArtifactType: latestV1.ArtifactType{DockerArtifact: &latestV1.DockerArtifact{}}}, - {ImageName: "img3", ArtifactType: latestV1.ArtifactType{JibArtifact: &latestV1.JibArtifact{}}}, + {ImageName: "docker-artifact-1", ArtifactType: latestV1.ArtifactType{DockerArtifact: &latestV1.DockerArtifact{}}}, + {ImageName: "docker-artifact-2", ArtifactType: latestV1.ArtifactType{DockerArtifact: &latestV1.DockerArtifact{}}}, + {ImageName: "jib-artifact-1", ArtifactType: latestV1.ArtifactType{JibArtifact: &latestV1.JibArtifact{}}}, }, }, Deploy: latestV1.DeployConfig{ @@ -81,11 +80,11 @@ func TestEmptyState(t *testing.T) { cluster: "gke-tejal-test", expected: &proto.Metadata{ Build: &proto.BuildMetadata{ - NumberOfArtifacts: 3, - Type: proto.BuildType_CLUSTER, - Builders: []*proto.BuildMetadata_ImageBuilder{ - {Type: proto.BuilderType_JIB, Count: 1}, - {Type: proto.BuilderType_DOCKER, Count: 2}, + Type: proto.BuildType_CLUSTER, + Artifacts: []*proto.BuildMetadata_Artifact{ + {Type: proto.BuilderType_JIB, Name: "jib-artifact-1"}, + {Type: proto.BuilderType_DOCKER, Name: "docker-artifact-1"}, + {Type: proto.BuilderType_DOCKER, Name: "docker-artifact-2"}, }, }, Deploy: &proto.DeployMetadata{ @@ -99,16 +98,15 @@ func TestEmptyState(t *testing.T) { Build: latestV1.BuildConfig{ BuildType: latestV1.BuildType{GoogleCloudBuild: &latestV1.GoogleCloudBuild{}}, Artifacts: []*latestV1.Artifact{ - {ImageName: "img1", ArtifactType: latestV1.ArtifactType{KanikoArtifact: &latestV1.KanikoArtifact{}}}, + {ImageName: "artifact-1", ArtifactType: latestV1.ArtifactType{KanikoArtifact: &latestV1.KanikoArtifact{}}}, }, }, }, cluster: "gke-tejal-test", expected: &proto.Metadata{ Build: &proto.BuildMetadata{ - NumberOfArtifacts: 1, - Type: proto.BuildType_GCB, - Builders: []*proto.BuildMetadata_ImageBuilder{{Type: proto.BuilderType_KANIKO, Count: 1}}, + Type: proto.BuildType_GCB, + Artifacts: []*proto.BuildMetadata_Artifact{{Type: proto.BuilderType_KANIKO, Name: "artifact-1"}}, }, Deploy: &proto.DeployMetadata{}, }, @@ -138,10 +136,10 @@ func TestEmptyState(t *testing.T) { state: emptyState(mockCfg([]latestV1.Pipeline{test.cfg}, test.cluster)), } metadata := handler.state.Metadata - builders := metadata.Build.Builders + artifacts := metadata.Build.Artifacts // sort and compare - sort.Slice(builders, func(i, j int) bool { return builders[i].Type < builders[j].Type }) + sort.Slice(artifacts, func(i, j int) bool { return artifacts[i].Type < artifacts[j].Type }) t.CheckDeepEqual(metadata, test.expected) }) } diff --git a/pkg/skaffold/runner/v1/dev.go b/pkg/skaffold/runner/v1/dev.go index 68e4a5187e0..f1a31f523f4 100644 --- a/pkg/skaffold/runner/v1/dev.go +++ b/pkg/skaffold/runner/v1/dev.go @@ -70,8 +70,10 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer, logger *logge defer r.monitor.Reset() defer r.listener.LogWatchToUser(out) event.DevLoopInProgress(r.devIteration) + eventV2.InitializeState(r.runCtx) eventV2.TaskInProgress(constants.DevLoop) defer func() { r.devIteration++ }() + eventV2.LogMetaEvent() meterUpdated := false if needsSync { @@ -177,8 +179,11 @@ func (r *SkaffoldRunner) doDev(ctx context.Context, out io.Writer, logger *logge // config until interrupted by the user. func (r *SkaffoldRunner) Dev(ctx context.Context, out io.Writer, artifacts []*latestV1.Artifact) error { event.DevLoopInProgress(r.devIteration) + eventV2.InitializeState(r.runCtx) eventV2.TaskInProgress(constants.DevLoop) defer func() { r.devIteration++ }() + eventV2.LogMetaEvent() + g := getTransposeGraph(artifacts) // Watch artifacts start := time.Now() diff --git a/pkg/skaffold/runner/v1/new.go b/pkg/skaffold/runner/v1/new.go index 7426aa3540a..5af79c15a8b 100644 --- a/pkg/skaffold/runner/v1/new.go +++ b/pkg/skaffold/runner/v1/new.go @@ -34,7 +34,6 @@ import ( "github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/label" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/status" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/event" - eventV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/event/v2" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/filemon" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph" pkgkubectl "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl" @@ -54,7 +53,6 @@ import ( func NewForConfig(runCtx *runcontext.RunContext) (*SkaffoldRunner, error) { event.InitializeState(runCtx) event.LogMetaEvent() - eventV2.InitializeState(runCtx) kubectlCLI := pkgkubectl.NewCLI(runCtx, "") tagger, err := tag.NewTaggerMux(runCtx) diff --git a/proto/v2/skaffold.pb.go b/proto/v2/skaffold.pb.go index fbe0cf36e91..d7b1012e67b 100644 --- a/proto/v2/skaffold.pb.go +++ b/proto/v2/skaffold.pb.go @@ -520,6 +520,7 @@ type Metadata struct { Build *BuildMetadata `protobuf:"bytes,1,opt,name=build,proto3" json:"build,omitempty"` Deploy *DeployMetadata `protobuf:"bytes,2,opt,name=deploy,proto3" json:"deploy,omitempty"` Test *TestMetadata `protobuf:"bytes,3,opt,name=test,proto3" json:"test,omitempty"` + RunID string `protobuf:"bytes,4,opt,name=runID,proto3" json:"runID,omitempty"` // Additional key value pairs to describe the build pipeline Additional map[string]string `protobuf:"bytes,99,rep,name=additional,proto3" json:"additional,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -573,6 +574,13 @@ func (m *Metadata) GetTest() *TestMetadata { return nil } +func (m *Metadata) GetRunID() string { + if m != nil { + return m.RunID + } + return "" +} + func (m *Metadata) GetAdditional() map[string]string { if m != nil { return m.Additional @@ -581,10 +589,9 @@ func (m *Metadata) GetAdditional() map[string]string { } type BuildMetadata struct { - NumberOfArtifacts int32 `protobuf:"varint,1,opt,name=numberOfArtifacts,proto3" json:"numberOfArtifacts,omitempty"` - Builders []*BuildMetadata_ImageBuilder `protobuf:"bytes,2,rep,name=builders,proto3" json:"builders,omitempty"` - Type enums.BuildType `protobuf:"varint,3,opt,name=type,proto3,enum=proto.enums.BuildType" json:"type,omitempty"` - // Additional key value pairs to describe the deploy pipeline + Artifacts []*BuildMetadata_Artifact `protobuf:"bytes,1,rep,name=artifacts,proto3" json:"artifacts,omitempty"` + Type enums.BuildType `protobuf:"varint,2,opt,name=type,proto3,enum=proto.enums.BuildType" json:"type,omitempty"` + // Additional key value pairs to describe the build pipeline Additional map[string]string `protobuf:"bytes,99,rep,name=additional,proto3" json:"additional,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -616,16 +623,9 @@ func (m *BuildMetadata) XXX_DiscardUnknown() { var xxx_messageInfo_BuildMetadata proto.InternalMessageInfo -func (m *BuildMetadata) GetNumberOfArtifacts() int32 { - if m != nil { - return m.NumberOfArtifacts - } - return 0 -} - -func (m *BuildMetadata) GetBuilders() []*BuildMetadata_ImageBuilder { +func (m *BuildMetadata) GetArtifacts() []*BuildMetadata_Artifact { if m != nil { - return m.Builders + return m.Artifacts } return nil } @@ -644,51 +644,51 @@ func (m *BuildMetadata) GetAdditional() map[string]string { return nil } -type BuildMetadata_ImageBuilder struct { +type BuildMetadata_Artifact struct { Type enums.BuilderType `protobuf:"varint,1,opt,name=type,proto3,enum=proto.enums.BuilderType" json:"type,omitempty"` - Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *BuildMetadata_ImageBuilder) Reset() { *m = BuildMetadata_ImageBuilder{} } -func (m *BuildMetadata_ImageBuilder) String() string { return proto.CompactTextString(m) } -func (*BuildMetadata_ImageBuilder) ProtoMessage() {} -func (*BuildMetadata_ImageBuilder) Descriptor() ([]byte, []int) { +func (m *BuildMetadata_Artifact) Reset() { *m = BuildMetadata_Artifact{} } +func (m *BuildMetadata_Artifact) String() string { return proto.CompactTextString(m) } +func (*BuildMetadata_Artifact) ProtoMessage() {} +func (*BuildMetadata_Artifact) Descriptor() ([]byte, []int) { return fileDescriptor_39088757fd9c8e40, []int{5, 0} } -func (m *BuildMetadata_ImageBuilder) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_BuildMetadata_ImageBuilder.Unmarshal(m, b) +func (m *BuildMetadata_Artifact) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_BuildMetadata_Artifact.Unmarshal(m, b) } -func (m *BuildMetadata_ImageBuilder) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_BuildMetadata_ImageBuilder.Marshal(b, m, deterministic) +func (m *BuildMetadata_Artifact) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_BuildMetadata_Artifact.Marshal(b, m, deterministic) } -func (m *BuildMetadata_ImageBuilder) XXX_Merge(src proto.Message) { - xxx_messageInfo_BuildMetadata_ImageBuilder.Merge(m, src) +func (m *BuildMetadata_Artifact) XXX_Merge(src proto.Message) { + xxx_messageInfo_BuildMetadata_Artifact.Merge(m, src) } -func (m *BuildMetadata_ImageBuilder) XXX_Size() int { - return xxx_messageInfo_BuildMetadata_ImageBuilder.Size(m) +func (m *BuildMetadata_Artifact) XXX_Size() int { + return xxx_messageInfo_BuildMetadata_Artifact.Size(m) } -func (m *BuildMetadata_ImageBuilder) XXX_DiscardUnknown() { - xxx_messageInfo_BuildMetadata_ImageBuilder.DiscardUnknown(m) +func (m *BuildMetadata_Artifact) XXX_DiscardUnknown() { + xxx_messageInfo_BuildMetadata_Artifact.DiscardUnknown(m) } -var xxx_messageInfo_BuildMetadata_ImageBuilder proto.InternalMessageInfo +var xxx_messageInfo_BuildMetadata_Artifact proto.InternalMessageInfo -func (m *BuildMetadata_ImageBuilder) GetType() enums.BuilderType { +func (m *BuildMetadata_Artifact) GetType() enums.BuilderType { if m != nil { return m.Type } return enums.BuilderType_UNKNOWN_BUILDER_TYPE } -func (m *BuildMetadata_ImageBuilder) GetCount() int32 { +func (m *BuildMetadata_Artifact) GetName() string { if m != nil { - return m.Count + return m.Name } - return 0 + return "" } // TestMetadata describes the test pipeline @@ -2666,7 +2666,7 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "proto.v2.Metadata.AdditionalEntry") proto.RegisterType((*BuildMetadata)(nil), "proto.v2.BuildMetadata") proto.RegisterMapType((map[string]string)(nil), "proto.v2.BuildMetadata.AdditionalEntry") - proto.RegisterType((*BuildMetadata_ImageBuilder)(nil), "proto.v2.BuildMetadata.ImageBuilder") + proto.RegisterType((*BuildMetadata_Artifact)(nil), "proto.v2.BuildMetadata.Artifact") proto.RegisterType((*TestMetadata)(nil), "proto.v2.TestMetadata") proto.RegisterType((*TestMetadata_Tester)(nil), "proto.v2.TestMetadata.Tester") proto.RegisterType((*DeployMetadata)(nil), "proto.v2.DeployMetadata") @@ -2704,143 +2704,143 @@ func init() { func init() { proto.RegisterFile("v2/skaffold.proto", fileDescriptor_39088757fd9c8e40) } var fileDescriptor_39088757fd9c8e40 = []byte{ - // 2176 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x73, 0x1c, 0x47, - 0x15, 0xd7, 0xee, 0x6a, 0xff, 0xcc, 0x5b, 0x49, 0x96, 0x5a, 0xb6, 0xb4, 0xac, 0xe5, 0xc4, 0x1e, - 0x1c, 0x70, 0x12, 0x67, 0xd7, 0x92, 0x21, 0x4e, 0xb9, 0x10, 0x41, 0x52, 0x64, 0x49, 0xd8, 0xc4, - 0xf1, 0x48, 0x49, 0x15, 0x7f, 0x52, 0xae, 0xd1, 0x4e, 0x6b, 0x3d, 0xa5, 0xdd, 0x99, 0x65, 0xa6, - 0x47, 0x61, 0x6f, 0x14, 0x17, 0x38, 0x43, 0x4e, 0x9c, 0x38, 0x70, 0xe1, 0xc4, 0x85, 0x6f, 0xc0, - 0x47, 0xa0, 0x8a, 0x2b, 0x45, 0x15, 0x07, 0x8a, 0xe2, 0x43, 0x50, 0xfd, 0xba, 0x7b, 0xa6, 0x7b, - 0x66, 0xd7, 0x92, 0xec, 0x72, 0x71, 0x91, 0xa6, 0xbb, 0x7f, 0xef, 0xd7, 0xef, 0xbd, 0x7e, 0xfd, - 0xfa, 0x75, 0x2f, 0x2c, 0x9d, 0x6d, 0x74, 0xe3, 0x53, 0xf7, 0xe4, 0x24, 0x1c, 0x78, 0x9d, 0x51, - 0x14, 0xb2, 0x90, 0x34, 0xf0, 0x5f, 0xe7, 0x6c, 0xa3, 0xbd, 0xd6, 0x0f, 0xc3, 0xfe, 0x80, 0x76, - 0xdd, 0x91, 0xdf, 0x75, 0x83, 0x20, 0x64, 0x2e, 0xf3, 0xc3, 0x20, 0x16, 0xb8, 0xf6, 0xdb, 0x72, - 0x14, 0x5b, 0xc7, 0xc9, 0x49, 0x97, 0xf9, 0x43, 0x1a, 0x33, 0x77, 0x38, 0x92, 0x80, 0xeb, 0x79, - 0x00, 0x1d, 0x8e, 0xd8, 0x58, 0x0e, 0x2e, 0xd1, 0x20, 0x19, 0xc6, 0x5d, 0xfc, 0x2b, 0xba, 0xec, - 0x0f, 0x61, 0xfe, 0x90, 0xb9, 0x8c, 0x3a, 0x34, 0x1e, 0x85, 0x41, 0x4c, 0xc9, 0x3b, 0x50, 0x8d, - 0x79, 0x47, 0xab, 0x74, 0xb3, 0x74, 0xa7, 0xb9, 0x71, 0xa5, 0xa3, 0x34, 0xeb, 0x08, 0x9c, 0x18, - 0xb5, 0xd7, 0xa0, 0x91, 0x8a, 0x2c, 0x42, 0x65, 0x18, 0xf7, 0x51, 0xc0, 0x72, 0xf8, 0xa7, 0x7d, - 0x03, 0xea, 0x0e, 0xfd, 0x79, 0x42, 0x63, 0x46, 0x08, 0xcc, 0x06, 0xee, 0x90, 0xca, 0x51, 0xfc, - 0xb6, 0xff, 0x39, 0x0b, 0x55, 0x64, 0x23, 0xdf, 0x01, 0x38, 0x4e, 0xfc, 0x81, 0x77, 0xa8, 0x4d, - 0x79, 0x35, 0x9b, 0x72, 0x3b, 0x1d, 0x73, 0x34, 0x1c, 0x79, 0x00, 0x4d, 0x8f, 0x8e, 0x06, 0xe1, - 0x58, 0x88, 0x95, 0x51, 0xec, 0x5a, 0x26, 0xf6, 0x49, 0x36, 0xe8, 0xe8, 0x48, 0xf2, 0x18, 0x16, - 0x4e, 0xc2, 0xe8, 0x2b, 0x37, 0xf2, 0xa8, 0xf7, 0x59, 0x18, 0xb1, 0xb8, 0x55, 0xb9, 0x59, 0xb9, - 0xd3, 0xdc, 0xf8, 0x66, 0xce, 0xca, 0xce, 0x23, 0x03, 0xb5, 0x1b, 0xb0, 0x68, 0xec, 0xe4, 0x44, - 0xc9, 0x23, 0x58, 0xe4, 0xbe, 0x48, 0xe2, 0x9d, 0x17, 0xb4, 0x77, 0x2a, 0x54, 0x99, 0x45, 0x55, - 0xda, 0x26, 0x9d, 0x8e, 0x70, 0x0a, 0x32, 0x64, 0x13, 0xe6, 0x4f, 0xfc, 0x01, 0x3d, 0x1c, 0x07, - 0x3d, 0x41, 0x52, 0x45, 0x92, 0xd5, 0x8c, 0xe4, 0x91, 0x3e, 0xec, 0x98, 0x68, 0x72, 0x08, 0xcb, - 0x1e, 0x3d, 0x4e, 0xfa, 0x7d, 0x3f, 0xe8, 0xef, 0x84, 0x01, 0x73, 0xfd, 0x80, 0x46, 0x71, 0xab, - 0x86, 0x86, 0xdd, 0xd2, 0x9d, 0x92, 0x07, 0xed, 0x9e, 0xd1, 0x80, 0x39, 0x93, 0xa4, 0x49, 0x07, - 0x1a, 0x43, 0xca, 0x5c, 0xcf, 0x65, 0x6e, 0xab, 0x8e, 0xea, 0x90, 0x8c, 0xe9, 0x47, 0x72, 0xc4, - 0x49, 0x31, 0x64, 0x1d, 0x2c, 0x46, 0x63, 0x26, 0xf4, 0x6f, 0xa0, 0xc0, 0x72, 0x26, 0x70, 0xa4, - 0x86, 0x9c, 0x0c, 0xd5, 0xfe, 0x12, 0x96, 0x27, 0x78, 0x99, 0x07, 0xd3, 0x29, 0x1d, 0x63, 0x28, - 0x54, 0x1d, 0xfe, 0x49, 0xee, 0x41, 0xf5, 0xcc, 0x1d, 0x24, 0x6a, 0x9d, 0x35, 0xe7, 0x72, 0x31, - 0xc9, 0x21, 0x6c, 0x11, 0xc0, 0x87, 0xe5, 0x8f, 0x4a, 0xf6, 0xef, 0xcb, 0xd0, 0x50, 0x8a, 0x92, - 0x0f, 0xa0, 0x8a, 0xe1, 0x23, 0x23, 0x6c, 0x35, 0x17, 0x61, 0xa9, 0x41, 0x02, 0x45, 0xee, 0x41, - 0x4d, 0x44, 0x8d, 0x9c, 0xb2, 0x95, 0x0f, 0xad, 0x54, 0x40, 0xe2, 0xc8, 0x7b, 0x30, 0xcb, 0x2d, - 0x6b, 0x55, 0x10, 0xbf, 0x62, 0x9a, 0x9e, 0xa2, 0x11, 0x43, 0xb6, 0x01, 0x5c, 0xcf, 0xf3, 0xf9, - 0xb6, 0x76, 0x07, 0xad, 0x1e, 0xae, 0x93, 0x5d, 0xf4, 0x6e, 0x67, 0x2b, 0x05, 0x89, 0xf8, 0xd3, - 0xa4, 0xda, 0x9b, 0x70, 0x25, 0x37, 0xac, 0x3b, 0xce, 0x12, 0x8e, 0xbb, 0xaa, 0x3b, 0xce, 0xd2, - 0x9d, 0xf3, 0xeb, 0x0a, 0xcc, 0x1b, 0x96, 0x93, 0xbb, 0xb0, 0x14, 0x24, 0xc3, 0x63, 0x1a, 0x3d, - 0x3d, 0xd9, 0x8a, 0x98, 0x7f, 0xe2, 0xf6, 0x58, 0x2c, 0x17, 0xa1, 0x38, 0x40, 0x7e, 0x00, 0x0d, - 0xf4, 0x14, 0x0f, 0xb4, 0x32, 0x1a, 0x70, 0x7b, 0x8a, 0x4b, 0x3b, 0x07, 0x43, 0xb7, 0x4f, 0xb7, - 0x05, 0xd8, 0x49, 0xa5, 0xd0, 0x61, 0xe3, 0x11, 0x45, 0x87, 0x2d, 0xa4, 0x0e, 0x13, 0x99, 0x09, - 0xd1, 0x47, 0xe3, 0x11, 0x75, 0x10, 0x43, 0xf6, 0x26, 0x38, 0xec, 0xdb, 0xd3, 0xe6, 0x7b, 0x99, - 0xd7, 0x1c, 0x98, 0xd3, 0xd5, 0x21, 0x77, 0xa5, 0x12, 0x25, 0x54, 0xa2, 0x55, 0x54, 0x82, 0x46, - 0x9a, 0x1a, 0x57, 0xa1, 0xda, 0x0b, 0x93, 0x80, 0xa1, 0x3b, 0xab, 0x8e, 0x68, 0xbc, 0xee, 0x4a, - 0x7c, 0x5d, 0x82, 0x39, 0x3d, 0x46, 0xc8, 0x03, 0xa8, 0xf3, 0x36, 0xf7, 0x6c, 0x09, 0x2d, 0xbd, - 0x31, 0x39, 0x98, 0x3a, 0x02, 0xe5, 0x28, 0x74, 0xfb, 0x31, 0xd4, 0xc4, 0x27, 0x79, 0xdf, 0x30, - 0x6b, 0xd5, 0x30, 0x4b, 0x40, 0xce, 0xb3, 0xca, 0xfe, 0x7b, 0x09, 0x16, 0xcc, 0x50, 0x27, 0x1f, - 0x83, 0x25, 0x82, 0x3d, 0x53, 0xed, 0xd6, 0xb4, 0x7d, 0x21, 0x9b, 0x34, 0x72, 0x32, 0x19, 0xb2, - 0x01, 0xf5, 0xde, 0x20, 0xe1, 0xd3, 0xe3, 0x5c, 0x79, 0x87, 0xef, 0x88, 0x31, 0x54, 0x4d, 0x01, - 0xdb, 0x4f, 0xa1, 0xa1, 0xa8, 0xc8, 0x07, 0x86, 0x59, 0xdf, 0x30, 0x84, 0x15, 0xe8, 0x5c, 0xc3, - 0xfe, 0x5d, 0x02, 0xc8, 0x4e, 0x15, 0xb2, 0x05, 0x96, 0xab, 0x85, 0x7b, 0xee, 0x2c, 0xc8, 0x80, - 0x9d, 0x34, 0xf6, 0x45, 0x54, 0x65, 0x52, 0xe4, 0x26, 0x34, 0xdd, 0x84, 0x85, 0x47, 0x91, 0xdf, - 0xef, 0x4b, 0xd3, 0x1a, 0x8e, 0xde, 0x45, 0x1e, 0x00, 0xc8, 0xa4, 0x1f, 0x7a, 0x2a, 0xe2, 0xcd, - 0x55, 0x39, 0x4c, 0x87, 0x1d, 0x0d, 0xda, 0xfe, 0x1e, 0x2c, 0x98, 0xf3, 0x5e, 0x2a, 0xb4, 0x7e, - 0x06, 0x56, 0x9a, 0x78, 0xc9, 0x0a, 0xd4, 0x04, 0xb1, 0x94, 0x95, 0xad, 0x9c, 0x6e, 0xe5, 0x0b, - 0xeb, 0x66, 0xff, 0xb2, 0x04, 0x4d, 0xed, 0x9c, 0x9d, 0x3a, 0xc1, 0x9b, 0x73, 0x8f, 0xfd, 0x9f, - 0x12, 0x2c, 0xe6, 0xcf, 0xd7, 0xa9, 0x7a, 0xec, 0x81, 0x15, 0xd1, 0x38, 0x4c, 0xa2, 0x1e, 0x55, - 0x39, 0xeb, 0xdd, 0xe9, 0xc7, 0x74, 0xc7, 0x51, 0x58, 0xb9, 0xde, 0xa9, 0xec, 0x6b, 0xad, 0xa6, - 0xc9, 0x7a, 0xa9, 0xd5, 0x3c, 0x80, 0x79, 0xa3, 0x0c, 0x78, 0x75, 0x87, 0xdb, 0x7f, 0xa9, 0x43, - 0x15, 0xcf, 0x4b, 0xf2, 0x11, 0x58, 0x69, 0x01, 0x29, 0xcf, 0xc6, 0x76, 0x47, 0x54, 0x90, 0x1d, - 0x55, 0x41, 0x76, 0x8e, 0x14, 0xc2, 0xc9, 0xc0, 0xe4, 0x3e, 0x58, 0xfc, 0xf0, 0x47, 0x1a, 0x79, - 0x4a, 0x2e, 0x9b, 0x67, 0x18, 0x0e, 0xed, 0xcf, 0x38, 0x19, 0x8e, 0xec, 0xc3, 0xa2, 0xaa, 0x7b, - 0x9f, 0x84, 0x7d, 0x21, 0x5b, 0x29, 0x54, 0x4c, 0x39, 0xc4, 0xfe, 0x8c, 0x53, 0x90, 0x22, 0xcf, - 0x60, 0xd9, 0x1d, 0x8d, 0x06, 0x7e, 0x0f, 0xab, 0xe3, 0x94, 0x4c, 0x94, 0x5f, 0x5a, 0xc6, 0xdc, - 0x2a, 0x82, 0xf6, 0x67, 0x9c, 0x49, 0xb2, 0xdc, 0x22, 0xe6, 0xc6, 0xa7, 0x82, 0xa8, 0x5a, 0x28, - 0x61, 0xd4, 0x10, 0xb7, 0x28, 0xc5, 0x91, 0xc7, 0xb0, 0x24, 0xea, 0xd2, 0xe4, 0x38, 0x13, 0xae, - 0xa1, 0xf0, 0xf5, 0x7c, 0x1e, 0xd1, 0x20, 0xfb, 0x33, 0x4e, 0x51, 0x8e, 0x7c, 0x0a, 0x44, 0x16, - 0xab, 0x3a, 0x9b, 0x28, 0xbf, 0xd6, 0x0a, 0xd5, 0xad, 0x49, 0x37, 0x41, 0x92, 0x3c, 0x04, 0x6b, - 0x14, 0x46, 0x4c, 0xd0, 0x34, 0xce, 0x2b, 0x9e, 0xb8, 0x61, 0x29, 0x9c, 0x7c, 0x09, 0xab, 0x7a, - 0xa1, 0xaa, 0x2b, 0x64, 0x21, 0xd3, 0xad, 0xc9, 0x9b, 0xc7, 0xd4, 0x6a, 0x1a, 0x07, 0xf9, 0x38, - 0xab, 0x79, 0x05, 0x29, 0x4c, 0xab, 0x79, 0x15, 0x95, 0x89, 0xe7, 0xfa, 0x79, 0x93, 0x0b, 0xda, - 0x56, 0x33, 0xaf, 0xdf, 0x94, 0xca, 0x97, 0xeb, 0x37, 0x85, 0x83, 0x47, 0x2a, 0xa3, 0xd1, 0xd0, - 0x0f, 0x30, 0x46, 0x04, 0xef, 0x5c, 0xde, 0x83, 0x47, 0x39, 0x04, 0x8f, 0xd4, 0xbc, 0x14, 0x5f, - 0x04, 0x5e, 0xf5, 0x09, 0x8a, 0xf9, 0x22, 0x45, 0xcc, 0x72, 0x3e, 0xcb, 0xe0, 0xdb, 0x73, 0x00, - 0x94, 0x7f, 0x3c, 0xe7, 0x07, 0x9a, 0xfd, 0x39, 0x2c, 0xe6, 0x67, 0x9c, 0x9a, 0x04, 0xde, 0x85, - 0x0a, 0x8d, 0x22, 0xb9, 0x31, 0x35, 0xaf, 0x6e, 0xf5, 0xb0, 0x50, 0x39, 0x1e, 0xd0, 0xdd, 0x28, - 0x72, 0x38, 0x86, 0x57, 0x20, 0xf3, 0x46, 0x37, 0x59, 0x87, 0x3a, 0x8d, 0x22, 0x4c, 0x6f, 0xa5, - 0x97, 0xa7, 0x37, 0x85, 0x23, 0x2d, 0xa8, 0x0f, 0x69, 0x1c, 0xbb, 0x7d, 0x95, 0xb9, 0x54, 0x93, - 0x7c, 0x08, 0xcd, 0x38, 0xe9, 0xf7, 0x69, 0x8c, 0xd7, 0x58, 0x79, 0xdf, 0xd2, 0xae, 0x78, 0x87, - 0xe9, 0xa0, 0xa3, 0x03, 0xed, 0x67, 0x60, 0xa5, 0x59, 0x84, 0xa7, 0x45, 0xca, 0x33, 0xa6, 0xb4, - 0x52, 0x34, 0x8c, 0x4b, 0x4a, 0xf9, 0xfc, 0x4b, 0x8a, 0xfd, 0x27, 0x7e, 0x5e, 0xe4, 0x33, 0xc9, - 0x2a, 0xd4, 0xb9, 0xf7, 0x9f, 0xfb, 0x9e, 0x72, 0x21, 0x6f, 0x1e, 0x78, 0xe4, 0x06, 0x40, 0x2c, - 0x56, 0x86, 0x8f, 0x09, 0xab, 0x2c, 0xd9, 0x73, 0xe0, 0x71, 0xcf, 0x87, 0x91, 0xdf, 0xf7, 0x03, - 0xcc, 0x60, 0x96, 0x23, 0x5b, 0xe4, 0x7d, 0xa8, 0x0e, 0xe8, 0x19, 0x1d, 0x60, 0x2e, 0x5a, 0x48, - 0x6f, 0xa5, 0xc2, 0x75, 0x4f, 0xc2, 0xfe, 0x13, 0x3e, 0xe8, 0x08, 0x8c, 0xee, 0xb6, 0xaa, 0xe1, - 0x36, 0x3b, 0x84, 0xe5, 0x09, 0xb9, 0x8b, 0xdc, 0x86, 0xf9, 0x9e, 0x8a, 0xd4, 0x4f, 0xb3, 0x6b, - 0xb5, 0xd9, 0xc9, 0x69, 0x47, 0xa1, 0x87, 0xe3, 0x72, 0x35, 0x64, 0x53, 0x9f, 0xb0, 0x62, 0x4e, - 0xf8, 0xc7, 0x12, 0x58, 0x69, 0x92, 0x23, 0x0b, 0x50, 0x4e, 0x1d, 0x52, 0xf6, 0x3d, 0x7e, 0x8b, - 0xe7, 0x76, 0x4b, 0x3a, 0xfc, 0x26, 0x6b, 0x60, 0xf9, 0x8c, 0x46, 0xa8, 0x20, 0xb2, 0x55, 0x9d, - 0xac, 0x43, 0x8b, 0xcc, 0x59, 0x23, 0x32, 0x37, 0x61, 0xde, 0xd5, 0xa3, 0xad, 0x78, 0xdb, 0x35, - 0x63, 0xd4, 0x44, 0xdb, 0x7f, 0x2e, 0xc1, 0x52, 0x21, 0x9d, 0x16, 0xd4, 0xd5, 0x16, 0xb5, 0x6c, - 0x2c, 0x6a, 0x1b, 0x1a, 0xaa, 0x72, 0x93, 0x0e, 0x48, 0xdb, 0x6f, 0x4a, 0xe3, 0xdf, 0x96, 0xf8, - 0xbe, 0x35, 0xb7, 0xf9, 0xc5, 0x15, 0xce, 0x94, 0xaa, 0xbc, 0x5c, 0xa9, 0xd9, 0x4b, 0x29, 0xf5, - 0x75, 0x09, 0x48, 0xf1, 0x1c, 0xf9, 0xbf, 0xab, 0xf5, 0x9b, 0x32, 0xac, 0x4e, 0x39, 0x4d, 0x2e, - 0xb5, 0xc6, 0xaa, 0x5a, 0x53, 0x6b, 0xac, 0xda, 0x53, 0xd7, 0x78, 0xea, 0x46, 0xcc, 0x95, 0x7b, - 0xb5, 0x0b, 0x97, 0x7b, 0x45, 0x57, 0xd4, 0x2f, 0xe5, 0x8a, 0xff, 0x96, 0x61, 0x31, 0x7f, 0x44, - 0x5f, 0xdc, 0x07, 0x6b, 0x60, 0x0d, 0xc2, 0x9e, 0x3b, 0xe0, 0x0c, 0x6a, 0x6f, 0xa6, 0x1d, 0x7a, - 0x7e, 0x98, 0x35, 0xf3, 0x43, 0x21, 0xbf, 0x54, 0x27, 0xe5, 0x97, 0x35, 0xb0, 0x02, 0x77, 0x48, - 0xe3, 0x91, 0xdb, 0x13, 0x2e, 0xb1, 0x9c, 0xac, 0x83, 0xfb, 0x9f, 0xd7, 0x11, 0x28, 0x5e, 0x17, - 0xfe, 0x57, 0x6d, 0x62, 0xc3, 0x9c, 0x5a, 0x0b, 0x7e, 0x55, 0xc3, 0xaa, 0xc4, 0x72, 0x8c, 0x3e, - 0x1d, 0x83, 0x1c, 0x96, 0x89, 0x51, 0x79, 0xcc, 0xf5, 0xbc, 0x88, 0xc6, 0x31, 0x56, 0x0e, 0x96, - 0xa3, 0x9a, 0xe4, 0xbb, 0x00, 0xcc, 0x8d, 0xfa, 0x94, 0xa1, 0xe9, 0xcd, 0xfc, 0xd3, 0xe0, 0x41, - 0xc0, 0x9e, 0x46, 0x87, 0x2c, 0xf2, 0x83, 0xbe, 0xa3, 0x01, 0xed, 0xbf, 0x96, 0xb2, 0xfa, 0xfa, - 0xf2, 0xbe, 0xe6, 0xb5, 0xc9, 0x0e, 0x5e, 0x36, 0xa5, 0xaf, 0xd3, 0x0e, 0x7e, 0x74, 0xf9, 0x43, - 0x1e, 0x57, 0xc2, 0xd3, 0xa2, 0xa1, 0xc5, 0x61, 0xf5, 0xe5, 0xfb, 0xa7, 0x76, 0xa9, 0xa0, 0xf9, - 0x43, 0x05, 0x56, 0xa7, 0x54, 0x3b, 0xaf, 0xbf, 0xb7, 0xdf, 0x78, 0xd4, 0xa4, 0x99, 0xb9, 0x9e, - 0xcb, 0xcc, 0x2d, 0xa8, 0x47, 0x49, 0xc0, 0x2f, 0x1f, 0x32, 0x60, 0x54, 0x93, 0xbc, 0x05, 0xf0, - 0x55, 0x18, 0x9d, 0xfa, 0x41, 0xff, 0x13, 0x3f, 0x92, 0x91, 0xa2, 0xf5, 0x90, 0x67, 0x00, 0x58, - 0xe2, 0x89, 0xc7, 0x5e, 0xc0, 0xe2, 0x63, 0xfd, 0xdc, 0xca, 0x50, 0xf4, 0x6b, 0x4f, 0xbf, 0x1a, - 0x49, 0x7b, 0x13, 0xae, 0xe4, 0x86, 0xcf, 0xbb, 0xc7, 0xcd, 0xeb, 0xf7, 0xb8, 0x4d, 0x58, 0xfa, - 0x3c, 0xa6, 0xd1, 0x41, 0xc0, 0x68, 0xc0, 0xd4, 0x23, 0xf9, 0x1d, 0xa8, 0xf9, 0xd8, 0x21, 0x2f, - 0x61, 0x8b, 0x46, 0xc0, 0x72, 0xa0, 0x1c, 0xb7, 0xbf, 0x0f, 0x0b, 0xf2, 0x1a, 0xa7, 0x64, 0xef, - 0x9a, 0x0f, 0xf6, 0xfa, 0xdb, 0xa3, 0x00, 0x1a, 0xef, 0xf6, 0xeb, 0x30, 0xa7, 0x77, 0x93, 0x36, - 0xd4, 0x29, 0x86, 0x8f, 0x08, 0x8d, 0xc6, 0xfe, 0x8c, 0xa3, 0x3a, 0xb6, 0xab, 0x50, 0x39, 0x73, - 0x07, 0xf6, 0x0f, 0xa1, 0x26, 0x94, 0xe0, 0x56, 0x65, 0xcf, 0xa8, 0x0d, 0xf5, 0x5a, 0x4a, 0x60, - 0x36, 0x1e, 0x07, 0x3d, 0x79, 0xd3, 0xc4, 0x6f, 0x1e, 0x43, 0xf2, 0x05, 0xb5, 0x82, 0xbd, 0xb2, - 0x65, 0xfb, 0x00, 0x59, 0xc1, 0x47, 0x76, 0x60, 0x21, 0x2b, 0xf9, 0xb4, 0x7a, 0xf3, 0xba, 0x99, - 0x5f, 0x0d, 0x88, 0x93, 0x13, 0xe1, 0x53, 0x89, 0x4d, 0xa0, 0xc2, 0x58, 0xb4, 0xec, 0x67, 0xd0, - 0xd4, 0x36, 0x3b, 0x56, 0x30, 0xea, 0xf5, 0xa8, 0x2a, 0x9f, 0x88, 0x56, 0xd0, 0xed, 0x5f, 0xb8, - 0x03, 0xf9, 0x46, 0x24, 0x5b, 0x62, 0x07, 0x44, 0xbc, 0x3f, 0xdd, 0x01, 0xbc, 0xb5, 0xf1, 0x8f, - 0x2a, 0x2c, 0xa9, 0x02, 0xf2, 0x8b, 0x8d, 0x43, 0x1a, 0x9d, 0xf9, 0x3d, 0x4a, 0x1e, 0x41, 0x63, - 0x8f, 0xaa, 0x67, 0x96, 0xc2, 0xed, 0x79, 0x77, 0x38, 0x62, 0xe3, 0x76, 0xfe, 0x67, 0x14, 0x7b, - 0xe9, 0x57, 0x7f, 0xfb, 0xd7, 0xef, 0xca, 0x4d, 0x62, 0x75, 0xcf, 0x36, 0xba, 0xb8, 0x34, 0x64, - 0x0f, 0x6a, 0x18, 0x7d, 0xf1, 0x45, 0x58, 0x10, 0x69, 0x13, 0x64, 0x99, 0x23, 0xc0, 0x59, 0xf0, - 0xaa, 0x10, 0xdf, 0x2b, 0x91, 0x1f, 0xc3, 0x15, 0xb3, 0x76, 0xbc, 0x04, 0xe3, 0x75, 0x64, 0xbc, - 0x46, 0x96, 0x39, 0xa3, 0x79, 0x4d, 0xe6, 0xd4, 0x3f, 0x85, 0xfa, 0xee, 0x2f, 0x68, 0x2f, 0x61, - 0x94, 0x68, 0xf7, 0xdb, 0x42, 0x40, 0xb7, 0xa7, 0xcc, 0xa7, 0xe8, 0xed, 0x26, 0x2a, 0x2c, 0x98, - 0x1e, 0xca, 0xd8, 0x26, 0x1e, 0x58, 0x5b, 0x09, 0x0b, 0xb1, 0xbc, 0x23, 0xad, 0x42, 0x1c, 0x9f, - 0xc7, 0xfd, 0x0e, 0x72, 0xbf, 0xdd, 0x5e, 0xe1, 0xdc, 0x18, 0x9a, 0x5d, 0x37, 0x61, 0xe1, 0x73, - 0x35, 0x8d, 0xd8, 0x01, 0xe4, 0x18, 0x1a, 0x7c, 0x16, 0x9e, 0xe8, 0x5f, 0x61, 0x92, 0xdb, 0x38, - 0xc9, 0x5b, 0xed, 0x6b, 0xb8, 0x6e, 0xe3, 0xa0, 0x37, 0x71, 0x8e, 0x13, 0x00, 0x3e, 0x87, 0xa8, - 0xb0, 0x5e, 0x61, 0x96, 0x6f, 0xe1, 0x2c, 0x37, 0xdb, 0xab, 0x7c, 0x16, 0xb1, 0x75, 0x26, 0xce, - 0xf3, 0x14, 0x6a, 0xfb, 0x6e, 0xe0, 0x0d, 0x28, 0xc9, 0x2f, 0xe4, 0x54, 0xea, 0x35, 0xa4, 0x5e, - 0xb1, 0x97, 0xb2, 0x90, 0xe9, 0xbe, 0x40, 0x8e, 0x87, 0xa5, 0xf7, 0xb6, 0xef, 0xff, 0x64, 0xbd, - 0xef, 0xb3, 0x17, 0xc9, 0x71, 0xa7, 0x17, 0x0e, 0xbb, 0x7b, 0xc8, 0x90, 0xe6, 0xc6, 0xa3, 0x30, - 0x1c, 0xc4, 0xe9, 0x2f, 0x97, 0xe2, 0x27, 0xc6, 0xee, 0xd9, 0xc6, 0x67, 0x95, 0xe3, 0x1a, 0x7e, - 0xdf, 0xff, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x06, 0x68, 0x99, 0x19, 0xda, 0x1c, 0x00, 0x00, + // 2169 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4d, 0x6f, 0x1b, 0xc7, + 0x19, 0x16, 0x49, 0x2d, 0xc9, 0x7d, 0x29, 0xc9, 0xd2, 0xc8, 0x96, 0x58, 0x5a, 0x4e, 0xe4, 0x4d, + 0xd2, 0x3a, 0x5f, 0xa4, 0x25, 0xb7, 0x71, 0x60, 0x54, 0x09, 0x24, 0x59, 0x96, 0x54, 0xbb, 0x76, + 0x3c, 0x52, 0x02, 0xf4, 0x23, 0x30, 0x56, 0xdc, 0x11, 0xbd, 0x10, 0xb9, 0xcb, 0xee, 0xce, 0x32, + 0xe5, 0xad, 0xe8, 0xa9, 0xe7, 0xd6, 0x3f, 0xa0, 0x87, 0x5e, 0x7a, 0x6a, 0x0f, 0xfd, 0x07, 0xfd, + 0x05, 0x45, 0x81, 0x5e, 0x8b, 0x02, 0x3d, 0x14, 0x45, 0x7f, 0x44, 0x31, 0x5f, 0xbb, 0x33, 0xbb, + 0xa4, 0x25, 0xd9, 0x30, 0x72, 0x91, 0x76, 0x66, 0x9e, 0xf7, 0x63, 0xde, 0x79, 0xe7, 0x9d, 0x67, + 0x86, 0xb0, 0x34, 0xda, 0xec, 0xc4, 0x67, 0xee, 0xe9, 0x69, 0xd8, 0xf7, 0xda, 0xc3, 0x28, 0xa4, + 0x21, 0xaa, 0xf3, 0x7f, 0xed, 0xd1, 0x66, 0x6b, 0xad, 0x17, 0x86, 0xbd, 0x3e, 0xe9, 0xb8, 0x43, + 0xbf, 0xe3, 0x06, 0x41, 0x48, 0x5d, 0xea, 0x87, 0x41, 0x2c, 0x70, 0xad, 0xb7, 0xe5, 0x28, 0x6f, + 0x9d, 0x24, 0xa7, 0x1d, 0xea, 0x0f, 0x48, 0x4c, 0xdd, 0xc1, 0x50, 0x02, 0xae, 0xe7, 0x01, 0x64, + 0x30, 0xa4, 0x63, 0x39, 0xb8, 0x44, 0x82, 0x64, 0x10, 0x77, 0xf8, 0x5f, 0xd1, 0xe5, 0x7c, 0x02, + 0xf3, 0x47, 0xd4, 0xa5, 0x04, 0x93, 0x78, 0x18, 0x06, 0x31, 0x41, 0xef, 0x81, 0x15, 0xb3, 0x8e, + 0x66, 0x69, 0xbd, 0x74, 0xab, 0xb1, 0x79, 0xa5, 0xad, 0x3c, 0x6b, 0x0b, 0x9c, 0x18, 0x75, 0xd6, + 0xa0, 0x9e, 0x8a, 0x2c, 0x42, 0x65, 0x10, 0xf7, 0xb8, 0x80, 0x8d, 0xd9, 0xa7, 0x73, 0x03, 0x6a, + 0x98, 0xfc, 0x22, 0x21, 0x31, 0x45, 0x08, 0x66, 0x03, 0x77, 0x40, 0xe4, 0x28, 0xff, 0x76, 0xfe, + 0x35, 0x0b, 0x16, 0xd7, 0x86, 0xbe, 0x0f, 0x70, 0x92, 0xf8, 0x7d, 0xef, 0x48, 0x33, 0x79, 0x35, + 0x33, 0xb9, 0x93, 0x8e, 0x61, 0x0d, 0x87, 0xee, 0x42, 0xc3, 0x23, 0xc3, 0x7e, 0x38, 0x16, 0x62, + 0x65, 0x2e, 0x76, 0x2d, 0x13, 0xbb, 0x9f, 0x0d, 0x62, 0x1d, 0x89, 0x1e, 0xc2, 0xc2, 0x69, 0x18, + 0x7d, 0xe3, 0x46, 0x1e, 0xf1, 0xbe, 0x08, 0x23, 0x1a, 0x37, 0x2b, 0xeb, 0x95, 0x5b, 0x8d, 0xcd, + 0x77, 0x72, 0xb3, 0x6c, 0x3f, 0x30, 0x50, 0x7b, 0x01, 0x8d, 0xc6, 0x38, 0x27, 0x8a, 0x1e, 0xc0, + 0x22, 0x8b, 0x45, 0x12, 0xef, 0x3e, 0x27, 0xdd, 0x33, 0xe1, 0xca, 0x2c, 0x77, 0xa5, 0x65, 0xaa, + 0xd3, 0x11, 0xb8, 0x20, 0x83, 0xb6, 0x60, 0xfe, 0xd4, 0xef, 0x93, 0xa3, 0x71, 0xd0, 0x15, 0x4a, + 0x2c, 0xae, 0x64, 0x35, 0x53, 0xf2, 0x40, 0x1f, 0xc6, 0x26, 0x1a, 0x1d, 0xc1, 0xb2, 0x47, 0x4e, + 0x92, 0x5e, 0xcf, 0x0f, 0x7a, 0xbb, 0x61, 0x40, 0x5d, 0x3f, 0x20, 0x51, 0xdc, 0xac, 0xf2, 0x89, + 0xdd, 0xd4, 0x83, 0x92, 0x07, 0xed, 0x8d, 0x48, 0x40, 0xf1, 0x24, 0x69, 0xd4, 0x86, 0xfa, 0x80, + 0x50, 0xd7, 0x73, 0xa9, 0xdb, 0xac, 0x71, 0x77, 0x50, 0xa6, 0xe9, 0xc7, 0x72, 0x04, 0xa7, 0x18, + 0xb4, 0x01, 0x36, 0x25, 0x31, 0x15, 0xfe, 0xd7, 0xb9, 0xc0, 0x72, 0x26, 0x70, 0xac, 0x86, 0x70, + 0x86, 0x6a, 0x7d, 0x0d, 0xcb, 0x13, 0xa2, 0xcc, 0x92, 0xe9, 0x8c, 0x8c, 0x79, 0x2a, 0x58, 0x98, + 0x7d, 0xa2, 0xdb, 0x60, 0x8d, 0xdc, 0x7e, 0xa2, 0xd6, 0x59, 0x0b, 0x2e, 0x13, 0x93, 0x3a, 0xc4, + 0x5c, 0x04, 0xf0, 0x5e, 0xf9, 0xd3, 0x92, 0xf3, 0xe7, 0x32, 0xd4, 0x95, 0xa3, 0xe8, 0x63, 0xb0, + 0x78, 0xfa, 0xc8, 0x0c, 0x5b, 0xcd, 0x65, 0x58, 0x3a, 0x21, 0x81, 0x42, 0xb7, 0xa1, 0x2a, 0xb2, + 0x46, 0x9a, 0x6c, 0xe6, 0x53, 0x2b, 0x15, 0x90, 0x38, 0xf4, 0x01, 0xcc, 0xb2, 0x99, 0x35, 0x2b, + 0x1c, 0xbf, 0x62, 0x4e, 0x3d, 0x45, 0x73, 0x0c, 0xba, 0x0a, 0x56, 0x94, 0x04, 0x87, 0xf7, 0x79, + 0xb2, 0xd8, 0x58, 0x34, 0xd0, 0x0e, 0x80, 0xeb, 0x79, 0x3e, 0xdb, 0xec, 0x6e, 0xbf, 0xd9, 0xe5, + 0xab, 0xe7, 0x14, 0x63, 0xde, 0xde, 0x4e, 0x41, 0x22, 0x2b, 0x35, 0xa9, 0xd6, 0x16, 0x5c, 0xc9, + 0x0d, 0xeb, 0xe1, 0xb4, 0x45, 0x38, 0xaf, 0xea, 0xe1, 0xb4, 0xf5, 0x90, 0xfd, 0xad, 0x0c, 0xf3, + 0x46, 0x3c, 0xd0, 0x67, 0x60, 0xbb, 0x11, 0xf5, 0x4f, 0xdd, 0x2e, 0x8d, 0x9b, 0x25, 0xee, 0xd3, + 0xfa, 0x94, 0xd8, 0xb5, 0xb7, 0x25, 0x10, 0x67, 0x22, 0x3c, 0x2c, 0xe3, 0xa1, 0x30, 0xb5, 0x90, + 0x86, 0x45, 0xd4, 0x1f, 0x2e, 0x7d, 0x3c, 0x1e, 0x12, 0xcc, 0x31, 0x68, 0x7f, 0x42, 0x00, 0xbe, + 0x37, 0xd5, 0xd8, 0x4b, 0xa2, 0xf0, 0x08, 0xea, 0xca, 0x17, 0xf4, 0x91, 0x74, 0xa0, 0xc4, 0x1d, + 0x68, 0x16, 0x1d, 0x20, 0x91, 0xe6, 0x82, 0xaa, 0x55, 0xe5, 0xac, 0x56, 0xbd, 0x6e, 0x4c, 0x5f, + 0x94, 0x60, 0x4e, 0xcf, 0x01, 0x74, 0x17, 0x6a, 0xac, 0xcd, 0xb6, 0xa8, 0x08, 0xe8, 0x8d, 0xc9, + 0xc9, 0xd2, 0x16, 0x28, 0xac, 0xd0, 0xad, 0x87, 0x50, 0x15, 0x9f, 0xe8, 0x43, 0x63, 0x52, 0xab, + 0xc6, 0xa4, 0x04, 0x44, 0x9b, 0xd3, 0x55, 0xb0, 0xba, 0x61, 0x12, 0x50, 0xee, 0x9a, 0x85, 0x45, + 0xc3, 0xf9, 0x47, 0x09, 0x16, 0xcc, 0x54, 0x46, 0x9f, 0x83, 0x2d, 0x92, 0x39, 0x73, 0xed, 0xe6, + 0xb4, 0xbc, 0x97, 0x4d, 0x12, 0xe1, 0x4c, 0x06, 0x6d, 0x42, 0xad, 0xdb, 0x4f, 0x98, 0x79, 0xb9, + 0xde, 0x66, 0xb8, 0x77, 0xc5, 0x18, 0x77, 0x4d, 0x01, 0x5b, 0x4f, 0xa0, 0xae, 0x54, 0xa1, 0x8f, + 0x8d, 0x69, 0x7d, 0xc7, 0x10, 0x56, 0xa0, 0x73, 0x27, 0xf6, 0x9f, 0x12, 0x40, 0x76, 0x6a, 0xa0, + 0xed, 0x62, 0x02, 0xbf, 0x33, 0xe9, 0x78, 0x49, 0xb3, 0x57, 0xd6, 0x7a, 0x2d, 0x87, 0xd7, 0xa1, + 0xe1, 0x26, 0x34, 0x3c, 0x8e, 0xfc, 0x5e, 0x4f, 0x4e, 0xad, 0x8e, 0xf5, 0x2e, 0x74, 0x17, 0x40, + 0x16, 0xf5, 0xd0, 0x23, 0xbc, 0x04, 0xe4, 0x57, 0xe5, 0x28, 0x1d, 0xc6, 0x1a, 0xb4, 0xf5, 0x43, + 0x58, 0x30, 0xed, 0x5e, 0x2a, 0xb5, 0x7e, 0x0e, 0x76, 0x5a, 0x58, 0xd1, 0x0a, 0x54, 0x85, 0x62, + 0x29, 0x2b, 0x5b, 0x39, 0xdf, 0xca, 0x17, 0xf6, 0xcd, 0xf9, 0x55, 0x09, 0x1a, 0xda, 0x39, 0x3a, + 0xd5, 0xc0, 0x9b, 0x0b, 0x8f, 0xf3, 0xdf, 0x12, 0x2c, 0xe6, 0xcf, 0xcf, 0xa9, 0x7e, 0xec, 0x83, + 0x1d, 0x91, 0x38, 0x4c, 0xa2, 0x2e, 0x89, 0x9b, 0x65, 0xbe, 0xd2, 0xef, 0x4f, 0x3f, 0x86, 0xdb, + 0x58, 0x61, 0xe5, 0x7a, 0xa7, 0xb2, 0xaf, 0xb5, 0x9a, 0xa6, 0xd6, 0x4b, 0xad, 0xe6, 0x21, 0xcc, + 0x1b, 0xc7, 0xfc, 0xab, 0x07, 0xdc, 0xf9, 0x4b, 0x0d, 0x2c, 0x7e, 0x1e, 0xa2, 0x4f, 0xc1, 0x4e, + 0x09, 0xa2, 0x3c, 0xfb, 0x5a, 0x6d, 0xc1, 0x10, 0xdb, 0x8a, 0x21, 0xb6, 0x8f, 0x15, 0x02, 0x67, + 0x60, 0x74, 0x07, 0x6c, 0x76, 0xb8, 0x73, 0x35, 0xf2, 0x14, 0x5c, 0x36, 0x4f, 0x23, 0x3e, 0x74, + 0x30, 0x83, 0x33, 0x1c, 0x3a, 0x80, 0x45, 0xc5, 0x6b, 0x1f, 0x85, 0x3d, 0x21, 0x5b, 0x29, 0x30, + 0xa2, 0x1c, 0xe2, 0x60, 0x06, 0x17, 0xa4, 0xd0, 0x53, 0x58, 0x76, 0x87, 0xc3, 0xbe, 0xdf, 0xe5, + 0xec, 0x37, 0x55, 0x26, 0xe8, 0x95, 0x56, 0x31, 0xb7, 0x8b, 0xa0, 0x83, 0x19, 0x3c, 0x49, 0x96, + 0xcd, 0x88, 0xba, 0xf1, 0x99, 0x50, 0x64, 0x15, 0x28, 0x8a, 0x1a, 0x62, 0x33, 0x4a, 0x71, 0xe8, + 0x21, 0x2c, 0x09, 0xde, 0x99, 0x9c, 0x64, 0xc2, 0x55, 0x2e, 0x7c, 0x3d, 0x5f, 0x47, 0x34, 0xc8, + 0xc1, 0x0c, 0x2e, 0xca, 0xa1, 0xc7, 0x80, 0x24, 0x19, 0xd5, 0xb5, 0x09, 0x7a, 0xb5, 0x56, 0x60, + 0xaf, 0xa6, 0xba, 0x09, 0x92, 0xe8, 0x1e, 0xd8, 0xc3, 0x30, 0xa2, 0x42, 0x4d, 0xfd, 0x3c, 0x72, + 0xc4, 0x26, 0x96, 0xc2, 0xd1, 0xd7, 0xb0, 0xaa, 0x13, 0x51, 0xdd, 0x21, 0x9b, 0x6b, 0xba, 0x39, + 0x79, 0xf3, 0x98, 0x5e, 0x4d, 0xd3, 0x81, 0x3e, 0xcf, 0x38, 0xad, 0x50, 0x0a, 0xd3, 0x38, 0xad, + 0x52, 0x65, 0xe2, 0x99, 0x7f, 0xde, 0x64, 0xc2, 0xda, 0x6c, 0xe4, 0xfd, 0x9b, 0xc2, 0x6c, 0x99, + 0x7f, 0x53, 0x74, 0xb0, 0x4c, 0xa5, 0x24, 0x1a, 0xf8, 0x01, 0xcf, 0x11, 0xa1, 0x77, 0x2e, 0x1f, + 0xc1, 0xe3, 0x1c, 0x82, 0x65, 0x6a, 0x5e, 0x8a, 0x2d, 0x02, 0x63, 0x75, 0x42, 0xc5, 0x7c, 0x51, + 0x45, 0x4c, 0x73, 0x31, 0xcb, 0xe0, 0x3b, 0x73, 0x00, 0x84, 0x7d, 0x3c, 0x63, 0x07, 0x9a, 0xf3, + 0x25, 0x2c, 0xe6, 0x2d, 0x4e, 0x2d, 0x02, 0xef, 0x43, 0x85, 0x44, 0x91, 0xdc, 0x98, 0x5a, 0x54, + 0xb7, 0xbb, 0x9c, 0xa8, 0x9c, 0xf4, 0xc9, 0x5e, 0x14, 0x61, 0x86, 0x61, 0x0c, 0x64, 0xde, 0xe8, + 0x46, 0x1b, 0x50, 0x23, 0x51, 0xc4, 0xcb, 0x5b, 0xe9, 0xe5, 0xe5, 0x4d, 0xe1, 0x50, 0x13, 0x6a, + 0x03, 0x12, 0xc7, 0x6e, 0x4f, 0x55, 0x2e, 0xd5, 0x44, 0x9f, 0x40, 0x23, 0x4e, 0x7a, 0x3d, 0x12, + 0xf3, 0x6b, 0xaa, 0xbc, 0x4f, 0x69, 0x57, 0xb8, 0xa3, 0x74, 0x10, 0xeb, 0x40, 0xe7, 0x29, 0xd8, + 0x69, 0x15, 0x61, 0x65, 0x91, 0xb0, 0x8a, 0x29, 0x67, 0x29, 0x1a, 0xc6, 0x25, 0xa4, 0x7c, 0xfe, + 0x25, 0xc4, 0xf9, 0x23, 0x3b, 0x2f, 0xf2, 0x95, 0x64, 0x15, 0x6a, 0x2c, 0xfa, 0xcf, 0x7c, 0x4f, + 0x85, 0x90, 0x35, 0x0f, 0x3d, 0x74, 0x03, 0x20, 0x16, 0x2b, 0xc3, 0xc6, 0xc4, 0xac, 0x6c, 0xd9, + 0x73, 0xe8, 0xb1, 0xc8, 0x87, 0x91, 0xdf, 0xf3, 0x03, 0x5e, 0xc1, 0x6c, 0x2c, 0x5b, 0xe8, 0x43, + 0xb0, 0xfa, 0x64, 0x44, 0xfa, 0xbc, 0x16, 0x2d, 0xa4, 0xb7, 0x4e, 0x11, 0xba, 0x47, 0x61, 0xef, + 0x11, 0x1b, 0xc4, 0x02, 0xa3, 0x87, 0xcd, 0x32, 0xc2, 0xe6, 0x84, 0xb0, 0x3c, 0xa1, 0x76, 0xa1, + 0x77, 0x61, 0xbe, 0xab, 0x32, 0xf5, 0x71, 0x76, 0x6d, 0x36, 0x3b, 0x99, 0xda, 0x61, 0xe8, 0x3d, + 0xce, 0xa8, 0xaa, 0x6a, 0xea, 0x06, 0x2b, 0xa6, 0xc1, 0x3f, 0x94, 0xc0, 0x4e, 0x8b, 0x1c, 0x5a, + 0x80, 0x72, 0x1a, 0x90, 0xb2, 0xef, 0x31, 0xe6, 0xcb, 0xe6, 0xad, 0x98, 0x2f, 0xfb, 0x46, 0x6b, + 0x60, 0xfb, 0x94, 0x44, 0xdc, 0x41, 0xae, 0xcd, 0xc2, 0x59, 0x87, 0x96, 0x99, 0xb3, 0x46, 0x66, + 0x6e, 0xc1, 0xbc, 0xab, 0x67, 0x5b, 0xf1, 0x36, 0x6b, 0xe6, 0xa8, 0x89, 0x76, 0xfe, 0x54, 0x82, + 0xa5, 0x42, 0x39, 0x2d, 0xb8, 0xab, 0x2d, 0x6a, 0xd9, 0x58, 0xd4, 0x16, 0xd4, 0x15, 0x73, 0x93, + 0x01, 0x48, 0xdb, 0x6f, 0xca, 0xe3, 0xdf, 0x96, 0xd8, 0xbe, 0x35, 0xb7, 0xf9, 0xc5, 0x1d, 0xce, + 0x9c, 0xaa, 0xbc, 0xdc, 0xa9, 0xd9, 0x4b, 0x39, 0xf5, 0xa2, 0x04, 0xa8, 0x78, 0x8e, 0x7c, 0xeb, + 0x6e, 0xfd, 0xa6, 0x0c, 0xab, 0x53, 0x4e, 0x93, 0x4b, 0xad, 0xb1, 0x62, 0x6b, 0x6a, 0x8d, 0x55, + 0x7b, 0xea, 0x1a, 0x4f, 0xdd, 0x88, 0x39, 0xba, 0x57, 0xbd, 0x30, 0xdd, 0x2b, 0x86, 0xa2, 0x76, + 0xa9, 0x50, 0xfc, 0xaf, 0x0c, 0x8b, 0xf9, 0x23, 0xfa, 0xe2, 0x31, 0x58, 0x03, 0xbb, 0x1f, 0x76, + 0xdd, 0x3e, 0xd3, 0xa0, 0xf6, 0x66, 0xda, 0xa1, 0xd7, 0x87, 0x59, 0xb3, 0x3e, 0x14, 0xea, 0x8b, + 0x35, 0xa9, 0xbe, 0xac, 0x81, 0xcd, 0xee, 0xbe, 0xf1, 0xd0, 0xed, 0x8a, 0x90, 0xd8, 0x38, 0xeb, + 0x60, 0xf1, 0x67, 0x3c, 0x82, 0x8b, 0xd7, 0x44, 0xfc, 0x55, 0x1b, 0x39, 0x30, 0xa7, 0xd6, 0x82, + 0x5d, 0xd5, 0x38, 0x2b, 0xb1, 0xb1, 0xd1, 0xa7, 0x63, 0xb8, 0x0e, 0xdb, 0xc4, 0xa8, 0x3a, 0xe6, + 0x7a, 0x5e, 0x44, 0xe2, 0x98, 0x33, 0x07, 0x1b, 0xab, 0x26, 0xfa, 0x01, 0x00, 0x75, 0xa3, 0x1e, + 0xa1, 0x7c, 0xea, 0x8d, 0xfc, 0xd3, 0xdf, 0x61, 0x40, 0x9f, 0x44, 0x47, 0x34, 0xf2, 0x83, 0x1e, + 0xd6, 0x80, 0xce, 0x5f, 0x4b, 0x19, 0xbf, 0xbe, 0x7c, 0xac, 0x19, 0x37, 0xd9, 0xe5, 0x97, 0x4d, + 0x19, 0xeb, 0xb4, 0x83, 0x1d, 0x5d, 0xfe, 0x80, 0xe5, 0x95, 0x7c, 0xcd, 0xe1, 0x0d, 0x2d, 0x0f, + 0xad, 0x97, 0xef, 0x9f, 0xea, 0xa5, 0x92, 0xe6, 0xf7, 0x15, 0x58, 0x9d, 0xc2, 0x76, 0x5e, 0x7f, + 0x6f, 0xbf, 0xf1, 0xac, 0x49, 0x2b, 0x73, 0x2d, 0x57, 0x99, 0x9b, 0x50, 0x8b, 0x92, 0x80, 0x5d, + 0x3e, 0x64, 0xc2, 0xa8, 0x26, 0x7a, 0x0b, 0xe0, 0x9b, 0x30, 0x3a, 0xf3, 0x83, 0xde, 0x7d, 0x3f, + 0x92, 0x99, 0xa2, 0xf5, 0xa0, 0xa7, 0x00, 0x9c, 0xe2, 0x89, 0xc7, 0x5c, 0xe0, 0xe4, 0x63, 0xe3, + 0x5c, 0x66, 0x28, 0xfa, 0xb5, 0xa7, 0x5d, 0x4d, 0x49, 0x6b, 0x0b, 0xae, 0xe4, 0x86, 0xcf, 0xbb, + 0xc7, 0xcd, 0xeb, 0xf7, 0xb8, 0x2d, 0x58, 0xfa, 0x32, 0x26, 0xd1, 0x61, 0x40, 0x49, 0x40, 0xd5, + 0x23, 0xf8, 0x2d, 0xa8, 0xfa, 0xbc, 0x43, 0x5e, 0xc2, 0x16, 0x8d, 0x84, 0x65, 0x40, 0x39, 0xee, + 0x7c, 0x06, 0x0b, 0xf2, 0x1a, 0xa7, 0x64, 0x3f, 0x32, 0x1f, 0xe4, 0xf5, 0xb7, 0x45, 0x01, 0x34, + 0xde, 0xe5, 0x37, 0x60, 0x4e, 0xef, 0x46, 0x2d, 0xa8, 0x11, 0x9e, 0x3e, 0x22, 0x35, 0xea, 0x07, + 0x33, 0x58, 0x75, 0xec, 0x58, 0x50, 0x19, 0xb9, 0x7d, 0xe7, 0x47, 0x50, 0x15, 0x4e, 0xb0, 0x59, + 0x65, 0xcf, 0xa4, 0x75, 0xf5, 0x1a, 0x8a, 0x60, 0x36, 0x1e, 0x07, 0x5d, 0x79, 0xd3, 0xe4, 0xdf, + 0x2c, 0x87, 0xe4, 0x0b, 0x69, 0x85, 0xf7, 0xca, 0x96, 0xe3, 0x03, 0x64, 0x84, 0x0f, 0xed, 0xc2, + 0x42, 0x46, 0xf9, 0x34, 0xbe, 0x79, 0xdd, 0xac, 0xaf, 0x06, 0x04, 0xe7, 0x44, 0x98, 0x29, 0xb1, + 0x09, 0x54, 0x1a, 0x8b, 0x96, 0xf3, 0x14, 0x1a, 0xda, 0x66, 0xe7, 0x0c, 0x46, 0xbd, 0x1e, 0x59, + 0xf2, 0x89, 0x68, 0x85, 0x87, 0xfd, 0x2b, 0xb7, 0x2f, 0xdf, 0x88, 0x64, 0x4b, 0xec, 0x80, 0x88, + 0xf5, 0xa7, 0x3b, 0x80, 0xb5, 0x36, 0xff, 0x69, 0xc1, 0x92, 0x22, 0x90, 0x5f, 0x6d, 0x1e, 0x91, + 0x68, 0xe4, 0x77, 0x09, 0x7a, 0x00, 0xf5, 0x7d, 0xa2, 0x9e, 0x59, 0x0a, 0xb7, 0xe7, 0xbd, 0xc1, + 0x90, 0x8e, 0x5b, 0xf9, 0x9f, 0x49, 0x9c, 0xa5, 0x5f, 0xff, 0xfd, 0xdf, 0xbf, 0x2b, 0x37, 0x90, + 0xdd, 0x19, 0x6d, 0x76, 0xf8, 0xd2, 0xa0, 0x7d, 0xa8, 0xf2, 0xec, 0x8b, 0x2f, 0xa2, 0x85, 0x23, + 0x1d, 0xc4, 0xb5, 0xcc, 0x21, 0x60, 0x5a, 0xf8, 0x55, 0x21, 0xbe, 0x5d, 0x42, 0x3f, 0x81, 0x2b, + 0x26, 0x77, 0xbc, 0x84, 0xc6, 0xeb, 0x5c, 0xe3, 0x35, 0xb4, 0xcc, 0x34, 0x9a, 0xd7, 0x64, 0xa6, + 0xfa, 0x67, 0x50, 0xdb, 0xfb, 0x25, 0xe9, 0x26, 0x94, 0x20, 0xed, 0x7e, 0x5b, 0x48, 0xe8, 0xd6, + 0x14, 0x7b, 0x4a, 0xbd, 0xd3, 0xe0, 0x0e, 0x0b, 0x4d, 0xf7, 0x64, 0x6e, 0x23, 0x0f, 0xec, 0xed, + 0x84, 0x86, 0x9c, 0xde, 0xa1, 0x66, 0x21, 0x8f, 0xcf, 0xd3, 0xfd, 0x1e, 0xd7, 0xfd, 0x76, 0x6b, + 0x85, 0xe9, 0xe6, 0xa9, 0xd9, 0x71, 0x13, 0x1a, 0x3e, 0x53, 0x66, 0xc4, 0x0e, 0x40, 0x27, 0x50, + 0x67, 0x56, 0x58, 0xa1, 0x7f, 0x05, 0x23, 0xef, 0x72, 0x23, 0x6f, 0xb5, 0xae, 0xf1, 0x75, 0x1b, + 0x07, 0xdd, 0x89, 0x36, 0x4e, 0x01, 0x98, 0x0d, 0xc1, 0xb0, 0x5e, 0xc1, 0xca, 0x77, 0xb9, 0x95, + 0xf5, 0xd6, 0x2a, 0xb3, 0x22, 0xb6, 0xce, 0x44, 0x3b, 0x4f, 0xa0, 0x7a, 0xe0, 0x06, 0x5e, 0x9f, + 0xa0, 0xfc, 0x42, 0x4e, 0x55, 0xbd, 0xc6, 0x55, 0xaf, 0x38, 0x4b, 0x59, 0xca, 0x74, 0x9e, 0x73, + 0x1d, 0xf7, 0x4a, 0x1f, 0xec, 0xdc, 0xf9, 0xe9, 0x46, 0xcf, 0xa7, 0xcf, 0x93, 0x93, 0x76, 0x37, + 0x1c, 0x74, 0xf6, 0xb9, 0x86, 0xb4, 0x36, 0x1e, 0x87, 0x61, 0x3f, 0x4e, 0x7f, 0x99, 0x14, 0x3f, + 0x21, 0x76, 0x46, 0x9b, 0x5f, 0x54, 0x4e, 0xaa, 0xfc, 0xfb, 0xce, 0xff, 0x03, 0x00, 0x00, 0xff, + 0xff, 0x05, 0xd9, 0x98, 0x62, 0xba, 0x1c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/v2/skaffold.proto b/proto/v2/skaffold.proto index 5bba3d8a568..f1f81e143d4 100644 --- a/proto/v2/skaffold.proto +++ b/proto/v2/skaffold.proto @@ -37,19 +37,19 @@ message Metadata { BuildMetadata build = 1; DeployMetadata deploy = 2; TestMetadata test = 3; + string runID = 4; // Additional key value pairs to describe the build pipeline map additional = 99; } message BuildMetadata { - message ImageBuilder { + message Artifact { enums.BuilderType type = 1; - int32 count = 2; + string name = 2; } - int32 numberOfArtifacts = 1; - repeated ImageBuilder builders= 2; - enums.BuildType type = 3; - // Additional key value pairs to describe the deploy pipeline + repeated Artifact artifacts = 1; + enums.BuildType type = 2; + // Additional key value pairs to describe the build pipeline map additional = 99; } From ce9bd5857d656b1a25ea634c498850389c7ba206 Mon Sep 17 00:00:00 2001 From: Marlon Gamez Date: Thu, 27 May 2021 15:36:08 -0700 Subject: [PATCH 2/3] still emit event upon initialization --- pkg/skaffold/runner/v1/new.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/skaffold/runner/v1/new.go b/pkg/skaffold/runner/v1/new.go index 5af79c15a8b..d8bf992476d 100644 --- a/pkg/skaffold/runner/v1/new.go +++ b/pkg/skaffold/runner/v1/new.go @@ -22,6 +22,7 @@ import ( "fmt" "strconv" + eventV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/event/v2" "github.com/sirupsen/logrus" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/build" @@ -53,6 +54,8 @@ import ( func NewForConfig(runCtx *runcontext.RunContext) (*SkaffoldRunner, error) { event.InitializeState(runCtx) event.LogMetaEvent() + eventV2.InitializeState(runCtx) + eventV2.LogMetaEvent() kubectlCLI := pkgkubectl.NewCLI(runCtx, "") tagger, err := tag.NewTaggerMux(runCtx) From feccf31abbdbfc50ad273e68d93e1f95af63c3bf Mon Sep 17 00:00:00 2001 From: Marlon Gamez Date: Thu, 27 May 2021 15:54:42 -0700 Subject: [PATCH 3/3] linters --- pkg/skaffold/runner/v1/new.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/skaffold/runner/v1/new.go b/pkg/skaffold/runner/v1/new.go index d8bf992476d..087aca78bbc 100644 --- a/pkg/skaffold/runner/v1/new.go +++ b/pkg/skaffold/runner/v1/new.go @@ -22,7 +22,6 @@ import ( "fmt" "strconv" - eventV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/event/v2" "github.com/sirupsen/logrus" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/build" @@ -35,6 +34,7 @@ import ( "github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/label" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/status" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/event" + eventV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/event/v2" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/filemon" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph" pkgkubectl "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"