Add HWIDInfo to project.proto.
- Will be used to replicate HWID info to project repos.
BUG=chromium:1080711
TEST=./generate.sh
Change-Id: I027078dc52a9e9ecd5af735118d883a18fb765f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2190622
Commit-Queue: Andrew Lamb <andrewlamb@chromium.org>
Tested-by: Andrew Lamb <andrewlamb@chromium.org>
Reviewed-by: C Shapiro <shapiroc@chromium.org>
Reviewed-by: Sean McAllister <smcallis@google.com>
diff --git a/go/project_mgmt/project.pb.go b/go/project_mgmt/project.pb.go
index 87e3680..979903b 100644
--- a/go/project_mgmt/project.pb.go
+++ b/go/project_mgmt/project.pb.go
@@ -114,10 +114,60 @@
return ""
}
+// Information about the project's HWID file in the chromeos-hwid repo.
+type HWIDInfo struct {
+ // A key in the project.yaml metadata file, to look up the branch, path, etc.
+ // For example, to match the entry in the project.yaml file:
+ //
+ // MILKYWAY:
+ // board: GALAXY
+ // branch: master
+ // version: 3
+ // path: v3/MILKYWAY
+ //
+ // project_key should be 'MILKYWAY'. The matching is case-insensitive.
+ ProjectKey string `protobuf:"bytes,1,opt,name=project_key,json=projectKey,proto3" json:"project_key,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *HWIDInfo) Reset() { *m = HWIDInfo{} }
+func (m *HWIDInfo) String() string { return proto.CompactTextString(m) }
+func (*HWIDInfo) ProtoMessage() {}
+func (*HWIDInfo) Descriptor() ([]byte, []int) {
+ return fileDescriptor_18d734e2ff24bda5, []int{2}
+}
+
+func (m *HWIDInfo) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_HWIDInfo.Unmarshal(m, b)
+}
+func (m *HWIDInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_HWIDInfo.Marshal(b, m, deterministic)
+}
+func (m *HWIDInfo) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_HWIDInfo.Merge(m, src)
+}
+func (m *HWIDInfo) XXX_Size() int {
+ return xxx_messageInfo_HWIDInfo.Size(m)
+}
+func (m *HWIDInfo) XXX_DiscardUnknown() {
+ xxx_messageInfo_HWIDInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_HWIDInfo proto.InternalMessageInfo
+
+func (m *HWIDInfo) GetProjectKey() string {
+ if m != nil {
+ return m.ProjectKey
+ }
+ return ""
+}
+
// Defines the metadata for a project, which ultimately controls how this
// project is managed throughout the infrastructure.
//
-// NEXT ID: 8
+// NEXT ID: 9
type Project struct {
// Defines the human-readable name for the project.
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
@@ -134,17 +184,18 @@
// Define the project's local_manifest.
LocalManifest *LocalManifest `protobuf:"bytes,6,opt,name=local_manifest,json=localManifest,proto3" json:"local_manifest,omitempty"`
// The Google Storage bucket for artifacts from the project's builds.
- GsBucket string `protobuf:"bytes,7,opt,name=gs_bucket,json=gsBucket,proto3" json:"gs_bucket,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ GsBucket string `protobuf:"bytes,7,opt,name=gs_bucket,json=gsBucket,proto3" json:"gs_bucket,omitempty"`
+ HwidInfo *HWIDInfo `protobuf:"bytes,8,opt,name=hwid_info,json=hwidInfo,proto3" json:"hwid_info,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *Project) Reset() { *m = Project{} }
func (m *Project) String() string { return proto.CompactTextString(m) }
func (*Project) ProtoMessage() {}
func (*Project) Descriptor() ([]byte, []int) {
- return fileDescriptor_18d734e2ff24bda5, []int{2}
+ return fileDescriptor_18d734e2ff24bda5, []int{3}
}
func (m *Project) XXX_Unmarshal(b []byte) error {
@@ -214,6 +265,13 @@
return ""
}
+func (m *Project) GetHwidInfo() *HWIDInfo {
+ if m != nil {
+ return m.HwidInfo
+ }
+ return nil
+}
+
type ProjectList struct {
Value []*Project `protobuf:"bytes,1,rep,name=value,proto3" json:"value,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -225,7 +283,7 @@
func (m *ProjectList) String() string { return proto.CompactTextString(m) }
func (*ProjectList) ProtoMessage() {}
func (*ProjectList) Descriptor() ([]byte, []int) {
- return fileDescriptor_18d734e2ff24bda5, []int{3}
+ return fileDescriptor_18d734e2ff24bda5, []int{4}
}
func (m *ProjectList) XXX_Unmarshal(b []byte) error {
@@ -256,6 +314,7 @@
func init() {
proto.RegisterType((*BuildbucketAcls)(nil), "project_mgmt.BuildbucketAcls")
proto.RegisterType((*LocalManifest)(nil), "project_mgmt.LocalManifest")
+ proto.RegisterType((*HWIDInfo)(nil), "project_mgmt.HWIDInfo")
proto.RegisterType((*Project)(nil), "project_mgmt.Project")
proto.RegisterType((*ProjectList)(nil), "project_mgmt.ProjectList")
}
@@ -263,28 +322,31 @@
func init() { proto.RegisterFile("project_mgmt/project.proto", fileDescriptor_18d734e2ff24bda5) }
var fileDescriptor_18d734e2ff24bda5 = []byte{
- // 362 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x4f, 0x6b, 0xa3, 0x40,
- 0x18, 0xc6, 0x31, 0xff, 0xf3, 0x9a, 0x6c, 0xc2, 0x2c, 0x0b, 0xee, 0x86, 0x65, 0x83, 0x7b, 0x09,
- 0xb4, 0x28, 0xa4, 0x50, 0x4a, 0x6f, 0xb5, 0x97, 0x1e, 0x52, 0x1a, 0x84, 0x5e, 0x7a, 0x91, 0x71,
- 0x32, 0x51, 0x9b, 0xd1, 0x91, 0x99, 0xb1, 0x5f, 0xaa, 0x5f, 0xb2, 0x38, 0x4e, 0xa8, 0xe6, 0x36,
- 0xef, 0xf3, 0x3c, 0x3e, 0xf3, 0xfa, 0x53, 0xf8, 0x53, 0x0a, 0xfe, 0x4e, 0x89, 0x8a, 0xf2, 0x24,
- 0x57, 0xbe, 0x19, 0xbc, 0x52, 0x70, 0xc5, 0xd1, 0xac, 0xed, 0xb9, 0x01, 0x2c, 0x82, 0x2a, 0x63,
- 0x87, 0xb8, 0x22, 0x27, 0xaa, 0x1e, 0x08, 0x93, 0xc8, 0x87, 0x9f, 0xf1, 0xb7, 0x14, 0x09, 0x8a,
- 0x0f, 0x54, 0x48, 0xc7, 0x5a, 0xf7, 0x37, 0xd3, 0x10, 0xb5, 0xac, 0xb0, 0x71, 0xdc, 0x17, 0x98,
- 0xef, 0x38, 0xc1, 0xec, 0x19, 0x17, 0xd9, 0x91, 0x4a, 0x85, 0x7e, 0xc3, 0x44, 0xd0, 0x92, 0x47,
- 0x95, 0x60, 0x8e, 0xb5, 0xb6, 0x36, 0xd3, 0x70, 0x5c, 0xcf, 0xaf, 0x82, 0xa1, 0xff, 0x30, 0xcf,
- 0x4d, 0x2c, 0x2a, 0xb1, 0x4a, 0x9d, 0x9e, 0xf6, 0x67, 0x67, 0x71, 0x8f, 0x55, 0xea, 0x7e, 0xf6,
- 0x60, 0xbc, 0x6f, 0xb6, 0x44, 0x08, 0x06, 0x05, 0xce, 0xa9, 0xe9, 0xd1, 0xe7, 0x5a, 0xab, 0xfb,
- 0xcc, 0xb3, 0xfa, 0x8c, 0xfe, 0x81, 0x4d, 0x78, 0x71, 0xcc, 0x92, 0xa6, 0xb6, 0xaf, 0x2d, 0x68,
- 0xa4, 0xba, 0x14, 0x5d, 0x03, 0xd2, 0x4b, 0x91, 0x94, 0x92, 0x13, 0xaf, 0xcc, 0xf5, 0x03, 0x9d,
- 0x5b, 0xd6, 0xce, 0xa3, 0x31, 0x74, 0xfa, 0x09, 0x96, 0x6d, 0x08, 0x98, 0x30, 0xe9, 0x0c, 0xd7,
- 0xd6, 0xc6, 0xde, 0xfe, 0xf5, 0xda, 0x00, 0xbd, 0x0b, 0x7a, 0xe1, 0x22, 0xbe, 0xc0, 0x19, 0xc0,
- 0x0f, 0x56, 0xd3, 0x89, 0xce, 0xaf, 0xe8, 0x8c, 0x74, 0xcf, 0xaa, 0xdb, 0xd3, 0x21, 0x18, 0xce,
- 0x59, 0x07, 0xe8, 0x0a, 0xa6, 0x89, 0x8c, 0x9a, 0x52, 0x67, 0xac, 0x57, 0x9e, 0x24, 0x32, 0xd0,
- 0xb3, 0x7b, 0x0f, 0xb6, 0x81, 0xb5, 0xcb, 0xa4, 0x42, 0x57, 0x30, 0xfc, 0xc0, 0xac, 0xa2, 0xfa,
- 0x83, 0xd9, 0xdb, 0x5f, 0xdd, 0x6b, 0x4c, 0x32, 0x6c, 0x32, 0xc1, 0xdd, 0xdb, 0x6d, 0xc2, 0x3d,
- 0x92, 0x0a, 0x9e, 0x67, 0x55, 0xee, 0x71, 0x91, 0xf8, 0xe7, 0x81, 0x4b, 0x3f, 0x2b, 0x8e, 0x02,
- 0xfb, 0xfa, 0xb7, 0xf1, 0x13, 0xee, 0xb7, 0x8b, 0xe2, 0x91, 0x96, 0x6f, 0xbe, 0x02, 0x00, 0x00,
- 0xff, 0xff, 0x2b, 0x7e, 0xe3, 0x1c, 0x6b, 0x02, 0x00, 0x00,
+ // 411 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x5f, 0x6b, 0xd5, 0x30,
+ 0x18, 0xc6, 0xe9, 0xfe, 0x9d, 0xf6, 0xed, 0x8e, 0x1b, 0x11, 0xa5, 0x3a, 0xc4, 0x43, 0xbd, 0x39,
+ 0x30, 0x69, 0x61, 0x03, 0x11, 0xef, 0xac, 0x5e, 0x6c, 0x38, 0x71, 0x14, 0x44, 0xf0, 0xa6, 0xa4,
+ 0x39, 0x69, 0x1b, 0x4f, 0xda, 0x94, 0x24, 0x55, 0xf6, 0x6d, 0xfd, 0x28, 0x92, 0x34, 0xc5, 0x76,
+ 0x77, 0x79, 0x9f, 0xe7, 0xe9, 0x93, 0xb7, 0x3f, 0x02, 0x2f, 0x7b, 0x29, 0x7e, 0x51, 0xa2, 0x8b,
+ 0xb6, 0x6e, 0x75, 0xea, 0x86, 0xa4, 0x97, 0x42, 0x0b, 0x74, 0x3a, 0xf7, 0xe2, 0x0c, 0xce, 0xb2,
+ 0x81, 0xf1, 0x5d, 0x39, 0x90, 0x3d, 0xd5, 0x1f, 0x09, 0x57, 0x28, 0x85, 0xa7, 0xe5, 0x7f, 0xa9,
+ 0x90, 0x14, 0xef, 0xa8, 0x54, 0x91, 0xb7, 0x39, 0xdc, 0x06, 0x39, 0x9a, 0x59, 0xf9, 0xe8, 0xc4,
+ 0xdf, 0x60, 0x7d, 0x27, 0x08, 0xe6, 0x5f, 0x71, 0xc7, 0x2a, 0xaa, 0x34, 0x7a, 0x01, 0xbe, 0xa4,
+ 0xbd, 0x28, 0x06, 0xc9, 0x23, 0x6f, 0xe3, 0x6d, 0x83, 0x7c, 0x65, 0xe6, 0xef, 0x92, 0xa3, 0x37,
+ 0xb0, 0x6e, 0x5d, 0xac, 0xe8, 0xb1, 0x6e, 0xa2, 0x03, 0xeb, 0x9f, 0x4e, 0xe2, 0x3d, 0xd6, 0x4d,
+ 0x7c, 0x09, 0xfe, 0xcd, 0x8f, 0xdb, 0xcf, 0xb7, 0x5d, 0x25, 0xd0, 0x6b, 0x08, 0xa7, 0x85, 0xf7,
+ 0xf4, 0xc1, 0xd5, 0x81, 0x93, 0xbe, 0xd0, 0x87, 0xf8, 0xef, 0x01, 0xac, 0xee, 0xc7, 0x11, 0x21,
+ 0x38, 0xea, 0x70, 0x4b, 0x5d, 0xca, 0x9e, 0x8d, 0x66, 0x2e, 0x77, 0x17, 0xd9, 0xb3, 0x29, 0x25,
+ 0xa2, 0xab, 0x58, 0x3d, 0xee, 0x70, 0x38, 0x96, 0x8e, 0x92, 0xd9, 0x00, 0xbd, 0x05, 0x64, 0xff,
+ 0x80, 0x34, 0x94, 0xec, 0xc5, 0xe0, 0x76, 0x3d, 0xb2, 0xb9, 0x73, 0xe3, 0x7c, 0x72, 0x86, 0x4d,
+ 0xdf, 0xc0, 0xf9, 0x9c, 0x18, 0x26, 0x5c, 0x45, 0xc7, 0x1b, 0x6f, 0x1b, 0x5e, 0xbd, 0x4a, 0xe6,
+ 0xb4, 0x93, 0x47, 0xa8, 0xf3, 0xb3, 0xf2, 0x11, 0xfb, 0x0c, 0x9e, 0x70, 0x83, 0xb2, 0x98, 0x78,
+ 0x44, 0x27, 0xb6, 0xe7, 0x62, 0xd9, 0xb3, 0xc0, 0x9d, 0xaf, 0xf9, 0x82, 0xfe, 0x05, 0x04, 0xb5,
+ 0x2a, 0xc6, 0xd2, 0x68, 0x65, 0x57, 0xf6, 0x6b, 0x95, 0xd9, 0x19, 0x5d, 0x43, 0xd0, 0xfc, 0x61,
+ 0xbb, 0x82, 0x75, 0x95, 0x88, 0x7c, 0xdb, 0xfd, 0x7c, 0xd9, 0x3d, 0x91, 0xcf, 0x7d, 0x13, 0x34,
+ 0xa7, 0xf8, 0x03, 0x84, 0x8e, 0xf0, 0x1d, 0x53, 0x1a, 0x5d, 0xc2, 0xf1, 0x6f, 0xcc, 0x07, 0x6a,
+ 0x9f, 0x44, 0x78, 0xf5, 0x6c, 0xf9, 0xbd, 0x4b, 0xe6, 0x63, 0x26, 0x7b, 0xff, 0xf3, 0x5d, 0x2d,
+ 0x12, 0xd2, 0x48, 0xd1, 0xb2, 0xa1, 0x4d, 0x84, 0xac, 0xd3, 0x69, 0x10, 0x2a, 0x65, 0x5d, 0x25,
+ 0x71, 0x6a, 0x1f, 0x66, 0x5a, 0x8b, 0x74, 0x5e, 0x54, 0x9e, 0x58, 0xf9, 0xfa, 0x5f, 0x00, 0x00,
+ 0x00, 0xff, 0xff, 0x8e, 0xe9, 0x25, 0x62, 0xcd, 0x02, 0x00, 0x00,
}
diff --git a/src/project_mgmt/project.proto b/src/project_mgmt/project.proto
index 200662a..bf4c5fd 100644
--- a/src/project_mgmt/project.proto
+++ b/src/project_mgmt/project.proto
@@ -25,10 +25,25 @@
string manifest_path = 2;
}
+// Information about the project's HWID file in the chromeos-hwid repo.
+message HWIDInfo {
+ // A key in the project.yaml metadata file, to look up the branch, path, etc.
+ // For example, to match the entry in the project.yaml file:
+ //
+ // MILKYWAY:
+ // board: GALAXY
+ // branch: master
+ // version: 3
+ // path: v3/MILKYWAY
+ //
+ // project_key should be 'MILKYWAY'. The matching is case-insensitive.
+ string project_key = 1;
+}
+
// Defines the metadata for a project, which ultimately controls how this
// project is managed throughout the infrastructure.
//
-// NEXT ID: 8
+// NEXT ID: 9
message Project {
// Defines the human-readable name for the project.
string name = 1;
@@ -46,6 +61,8 @@
LocalManifest local_manifest = 6;
// The Google Storage bucket for artifacts from the project's builds.
string gs_bucket = 7;
+
+ HWIDInfo hwid_info = 8;
}
message ProjectList {
