[config_parser] Require using project_ prefixed keys
Also, change default setting for cobalt_version to 1
Requires: https://cobalt-analytics-review.googlesource.com/c/config/+/6520
Change-Id: I16c7237d2ea184d1afcd8d291c4f55c0f66e7864
diff --git a/src/bin/config_parser/src/config_parser/config_reader_test.go b/src/bin/config_parser/src/config_parser/config_reader_test.go
index dc28dff..d744991 100644
--- a/src/bin/config_parser/src/config_parser/config_reader_test.go
+++ b/src/bin/config_parser/src/config_parser/config_reader_test.go
@@ -50,18 +50,15 @@
- project_name: ledger
project_id: 1
project_contact: bob
- cobalt_version: 1
- project_name: module_usage_tracking
project_id: 2
project_contact: bob
- cobalt_version: 1
- customer_name: test_customer
customer_id: 100
projects:
- project_name: test_project
project_id: 1
project_contact: bob
- cobalt_version: 1
`
const invalidCustomersYaml = `
@@ -71,18 +68,15 @@
- naINVALIDme: ledger
project_id: 1
project_contact: bob
- cobalt_version: 1
- project_name: module_usage_tracking
project_id: 2
project_contact: bob
- cobalt_version: 1
- customer_name: test_customer
customer_id: 100
projects:
- project_name: test_project
project_id: 1
project_contact: bob
- cobalt_version: 1
`
const projectConfigYaml = `
diff --git a/src/bin/config_parser/src/config_parser/project_list.go b/src/bin/config_parser/src/config_parser/project_list.go
index 8289bc2..153822c 100644
--- a/src/bin/config_parser/src/config_parser/project_list.go
+++ b/src/bin/config_parser/src/config_parser/project_list.go
@@ -146,11 +146,7 @@
func populateProjectConfig(p map[string]interface{}, c *ProjectConfig) (err error) {
v, ok := p["project_name"]
if !ok {
- // TODO(zmbush): Remove once config is updated to use project_name
- v, ok = p["name"]
- if !ok {
- return fmt.Errorf("Missing name in project list.")
- }
+ return fmt.Errorf("Missing name in project list.")
}
c.ProjectName, ok = v.(string)
if !ok {
@@ -160,7 +156,7 @@
return fmt.Errorf("Project name '%v' is invalid. Project names must match the regular expression '%v'", c.ProjectName, validNameRegexp)
}
- c.CobaltVersion = CobaltVersion0
+ c.CobaltVersion = CobaltVersion1
v, ok = p["cobalt_version"]
if ok {
version, ok := v.(int)
@@ -183,11 +179,7 @@
if c.CobaltVersion == CobaltVersion1 {
v, ok := p["project_id"]
if !ok {
- // TODO(zmbush): Remove once config is updated to use project_id
- v, ok = p["id"]
- if !ok {
- return fmt.Errorf("Missing project_id for project %v.", c.ProjectName)
- }
+ return fmt.Errorf("Missing project_id for project %v.", c.ProjectName)
}
projectId, ok := v.(int)
if !ok {
@@ -201,11 +193,7 @@
v, ok = p["project_contact"]
if !ok {
- // TODO(zmbush): Remove once config is updated to use project_contact
- v, ok = p["contact"]
- if !ok {
- return fmt.Errorf("Missing contact for project %v.", c.ProjectName)
- }
+ return fmt.Errorf("Missing contact for project %v.", c.ProjectName)
}
c.Contact, ok = v.(string)
if !ok {
diff --git a/src/bin/config_parser/src/config_parser/project_list_test.go b/src/bin/config_parser/src/config_parser/project_list_test.go
index 6c70145..0a655a8 100644
--- a/src/bin/config_parser/src/config_parser/project_list_test.go
+++ b/src/bin/config_parser/src/config_parser/project_list_test.go
@@ -30,14 +30,12 @@
- project_name: ledger
project_contact: ben
project_id: 10
- cobalt_version: 1
- customer_name: test_project
customer_id: 25
projects:
- project_name: ledger
project_id: 10
project_contact: ben
- cobalt_version: 1
`
e := []ProjectConfig{
@@ -81,13 +79,11 @@
projects:
- project_name: ledger
project_contact: ben
- cobalt_version: 1
- customer_name: fuchsia
customer_id: 11
projects:
- project_name: ledger
project_contact: ben
- cobalt_version: 1
`
if err := parseCustomerList(y, &l); err == nil {
@@ -101,13 +97,11 @@
projects:
- project_name: ledger
project_contact: ben
- cobalt_version: 1
- customer_name: test_project
customer_id: 10
projects:
- project_name: ledger
project_contact: ben
- cobalt_version: 1
`
if err := parseCustomerList(y, &l); err == nil {
@@ -125,7 +119,6 @@
- customer_id: 20
projects:
- project_name: ledger
- cobalt_version: 1
project_contact: ben
`
@@ -139,7 +132,6 @@
customer_id: 10
projects:
- project_name: ledger
- cobalt_version: 1
project_contact: ben
`
@@ -153,7 +145,6 @@
customer_id: 10
projects:
- project_name: ledger
- cobalt_version: 1
project_contact: ben
`
@@ -172,7 +163,6 @@
- customer_name: fuchsia
projects:
- project_name: ledger
- cobalt_version: 1
project_contact: ben
`
@@ -186,7 +176,6 @@
customer_name: fuchsia
projects:
- project_name: ledger
- cobalt_version: 1
project_contact: ben
`
@@ -200,7 +189,6 @@
customer_name: fuchsia
projects:
- project_name: ledger
- cobalt_version: 1
project_contact: ben
`
@@ -225,11 +213,9 @@
- project_name: ledger
project_contact: ben,etienne
project_id: 10
- cobalt_version: 1
- project_name: zircon
project_id: 20
project_contact: yvonne
- cobalt_version: 1
`
l := []ProjectConfig{}
@@ -263,10 +249,8 @@
// Checks that an error is returned if a project_name is duplicated.
y = `
- project_name: ledger
- cobalt_version: 1
project_contact: ben
- project_name: ledger
- cobalt_version: 1
project_contact: yvonne
`
@@ -339,7 +323,6 @@
y = `
project_name: ledger
project_contact: ben
-cobalt_version: 1
`
c = ProjectConfig{}
if err := parseProjectConfigForTest(y, &c); err == nil {
@@ -367,6 +350,7 @@
y = `
project_name: ledger
project_contact: ben
+cobalt_version: 0
`
c = ProjectConfig{}
if err := parseProjectConfigForTest(y, &c); err == nil {
@@ -377,7 +361,6 @@
y = `
project_name: ledger
project_contact: ben
-cobalt_version: 1
`
c = ProjectConfig{}
if err := parseProjectConfigForTest(y, &c); err == nil {
@@ -389,6 +372,7 @@
project_name: ledger
project_id: ledger
project_contact: ben
+cobalt_version: 0
`
c = ProjectConfig{}
if err := parseProjectConfigForTest(y, &c); err == nil {
@@ -400,6 +384,7 @@
project_name: ledger
project_id: -10
project_contact: ben
+cobalt_version: 0
`
c = ProjectConfig{}
if err := parseProjectConfigForTest(y, &c); err == nil {
diff --git a/src/bin/test_app/test_registry/projects.yaml b/src/bin/test_app/test_registry/projects.yaml
index 8e56f71..b27d529 100644
--- a/src/bin/test_app/test_registry/projects.yaml
+++ b/src/bin/test_app/test_registry/projects.yaml
@@ -4,5 +4,4 @@
projects:
- project_name: Cobalt
project_id: 1
- cobalt_version: 1
project_contact: nobody@example.com
diff --git a/src/logger/test_registries/project_context_factory_test_registry/projects.yaml b/src/logger/test_registries/project_context_factory_test_registry/projects.yaml
index 10ca118..9f6eb31 100644
--- a/src/logger/test_registries/project_context_factory_test_registry/projects.yaml
+++ b/src/logger/test_registries/project_context_factory_test_registry/projects.yaml
@@ -3,7 +3,6 @@
projects:
- project_name: Project11
project_id: 1
- cobalt_version: 1
project_contact: nobody@example.com
- customer_name: Customer22
@@ -11,5 +10,4 @@
projects:
- project_name: Project22
project_id: 1
- cobalt_version: 1
project_contact: nobody@example.com
diff --git a/src/logger/test_registries/project_context_test_registry/projects.yaml b/src/logger/test_registries/project_context_test_registry/projects.yaml
index 164456a..1c7c2a4 100644
--- a/src/logger/test_registries/project_context_test_registry/projects.yaml
+++ b/src/logger/test_registries/project_context_test_registry/projects.yaml
@@ -4,11 +4,9 @@
projects:
- project_name: ProjectA1
project_id: 1
- cobalt_version: 1
project_contact: nobody@example.com
- project_name: ProjectA2
project_id: 2
- cobalt_version: 1
project_contact: nobody@example.com
- customer_name: CustomerB
@@ -17,5 +15,4 @@
projects:
- project_name: ProjectB1
project_id: 1
- cobalt_version: 1
project_contact: nobody@example.com
