Minor flagging cleanup
Add an underscore to make the linter more happy.
Bug: 339672075
Bug: 328495189
Test: manual
Change-Id: I6b1d6dcd0aff3c82551021b3f4768a34f27d6fb2
diff --git a/cmd/release_config/crunch_flags/main.go b/cmd/release_config/crunch_flags/main.go
index 8a80a02..44e5539 100644
--- a/cmd/release_config/crunch_flags/main.go
+++ b/cmd/release_config/crunch_flags/main.go
@@ -16,8 +16,8 @@
)
var (
- // When a flag declaration has an initial value that is a string, the default workflow is WorkflowPrebuilt.
- // If the flag name starts with any of prefixes in manualFlagNamePrefixes, it is WorkflowManual.
+ // When a flag declaration has an initial value that is a string, the default workflow is Workflow_Prebuilt.
+ // If the flag name starts with any of prefixes in manualFlagNamePrefixes, it is Workflow_Manual.
manualFlagNamePrefixes []string = []string{
"RELEASE_ACONFIG_",
"RELEASE_PLATFORM_",
@@ -133,8 +133,8 @@
Containers: containers,
}
description = ""
- // Most build flags are `workflow: WorkflowPrebuilt`.
- workflow := rc_proto.Workflow(rc_proto.Workflow_WorkflowPrebuilt)
+ // Most build flags are `workflow: Workflow_Prebuilt`.
+ workflow := rc_proto.Workflow(rc_proto.Workflow_Workflow_Prebuilt)
switch {
case declName == "RELEASE_ACONFIG_VALUE_SETS":
if strings.HasPrefix(declValue, "\"") {
@@ -142,21 +142,21 @@
}
continue
case strings.HasPrefix(declValue, "\""):
- // String values mean that the flag workflow is (most likely) either WorkflowManual or WorkflowPrebuilt.
+ // String values mean that the flag workflow is (most likely) either Workflow_Manual or Workflow_Prebuilt.
declValue = declValue[1 : len(declValue)-1]
flagDeclaration.Value = &rc_proto.Value{Val: &rc_proto.Value_StringValue{declValue}}
for _, prefix := range manualFlagNamePrefixes {
if strings.HasPrefix(declName, prefix) {
- workflow = rc_proto.Workflow(rc_proto.Workflow_WorkflowManual)
+ workflow = rc_proto.Workflow(rc_proto.Workflow_Workflow_Manual)
break
}
}
case declValue == "False" || declValue == "True":
- // Boolean values are WorkflowLaunch flags.
+ // Boolean values are Workflow_Launch flags.
flagDeclaration.Value = &rc_proto.Value{Val: &rc_proto.Value_BoolValue{declValue == "True"}}
- workflow = rc_proto.Workflow(rc_proto.Workflow_WorkflowLaunch)
+ workflow = rc_proto.Workflow(rc_proto.Workflow_Workflow_Launch)
case declValue == "None":
- // Use WorkflowPrebuilt workflow with no initial value.
+ // Use Workflow_Prebuilt workflow with no initial value.
default:
fmt.Printf("%s: Unexpected value %s=%s\n", path, declName, declValue)
}
diff --git a/cmd/release_config/release_config_lib/release_config.go b/cmd/release_config/release_config_lib/release_config.go
index 82adc34..a1b10f5 100644
--- a/cmd/release_config/release_config_lib/release_config.go
+++ b/cmd/release_config/release_config_lib/release_config.go
@@ -177,7 +177,7 @@
contributionsToApply = append(contributionsToApply, config.Contributions...)
- workflowManual := rc_proto.Workflow(rc_proto.Workflow_WorkflowManual)
+ workflowManual := rc_proto.Workflow(rc_proto.Workflow_Workflow_Manual)
myDirsMap := make(map[int]bool)
for _, contrib := range contributionsToApply {
contribAconfigValueSets := []string{}
@@ -211,8 +211,8 @@
return fmt.Errorf("Setting value for flag %s not allowed in %s\n", name, value.path)
}
if isRoot && *fa.FlagDeclaration.Workflow != workflowManual {
- // The "root" release config can only contain workflow: WorkflowManual flags.
- return fmt.Errorf("Setting value for non-WorkflowManual flag %s is not allowed in %s", name, value.path)
+ // The "root" release config can only contain workflow: Workflow_Manual flags.
+ return fmt.Errorf("Setting value for non-Workflow_Manual flag %s is not allowed in %s", name, value.path)
}
if err := fa.UpdateValue(*value); err != nil {
return err
diff --git a/cmd/release_config/release_config_lib/release_configs.go b/cmd/release_config/release_config_lib/release_configs.go
index 65e6d90..403ba1a 100644
--- a/cmd/release_config/release_config_lib/release_configs.go
+++ b/cmd/release_config/release_config_lib/release_configs.go
@@ -107,7 +107,7 @@
configDirIndexes: make(ReleaseConfigDirMap),
FilesUsedMap: make(map[string]bool),
}
- workflowManual := rc_proto.Workflow(rc_proto.Workflow_WorkflowManual)
+ workflowManual := rc_proto.Workflow(rc_proto.Workflow_Workflow_Manual)
releaseAconfigValueSets := FlagArtifact{
FlagDeclaration: &rc_proto.FlagDeclaration{
Name: proto.String("RELEASE_ACONFIG_VALUE_SETS"),
diff --git a/cmd/release_config/release_config_proto/build_flags_out.pb.go b/cmd/release_config/release_config_proto/build_flags_out.pb.go
index 8fa75aa..73cc1dc 100644
--- a/cmd/release_config/release_config_proto/build_flags_out.pb.go
+++ b/cmd/release_config/release_config_proto/build_flags_out.pb.go
@@ -1,3 +1,7 @@
+//
+// Copyright (C) 2024 The Android Open-Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
diff --git a/cmd/release_config/release_config_proto/build_flags_out.proto b/cmd/release_config/release_config_proto/build_flags_out.proto
index 6f34d6f..8c3be5f 100644
--- a/cmd/release_config/release_config_proto/build_flags_out.proto
+++ b/cmd/release_config/release_config_proto/build_flags_out.proto
@@ -1,3 +1,7 @@
+//
+// Copyright (C) 2024 The Android Open-Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
diff --git a/cmd/release_config/release_config_proto/build_flags_src.pb.go b/cmd/release_config/release_config_proto/build_flags_src.pb.go
index c52a238..1a3fb80 100644
--- a/cmd/release_config/release_config_proto/build_flags_src.pb.go
+++ b/cmd/release_config/release_config_proto/build_flags_src.pb.go
@@ -1,3 +1,7 @@
+//
+// Copyright (C) 2024 The Android Open-Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
@@ -34,30 +38,30 @@
type Workflow int32
const (
- Workflow_WorkflowUnspecified Workflow = 0
+ Workflow_Workflow_Unspecified Workflow = 0
// Boolean value flags that progress from false to true.
- Workflow_WorkflowLaunch Workflow = 1
+ Workflow_Workflow_Launch Workflow = 1
// String value flags that get updated with new version strings to control
// prebuilt inclusion.
- Workflow_WorkflowPrebuilt Workflow = 2
+ Workflow_Workflow_Prebuilt Workflow = 2
// Manually managed outside flags. These are likely to be found in a
// different directory than flags with other workflows.
- Workflow_WorkflowManual Workflow = 3
+ Workflow_Workflow_Manual Workflow = 3
)
// Enum value maps for Workflow.
var (
Workflow_name = map[int32]string{
- 0: "WorkflowUnspecified",
- 1: "WorkflowLaunch",
- 2: "WorkflowPrebuilt",
- 3: "WorkflowManual",
+ 0: "Workflow_Unspecified",
+ 1: "Workflow_Launch",
+ 2: "Workflow_Prebuilt",
+ 3: "Workflow_Manual",
}
Workflow_value = map[string]int32{
- "WorkflowUnspecified": 0,
- "WorkflowLaunch": 1,
- "WorkflowPrebuilt": 2,
- "WorkflowManual": 3,
+ "Workflow_Unspecified": 0,
+ "Workflow_Launch": 1,
+ "Workflow_Prebuilt": 2,
+ "Workflow_Manual": 3,
}
)
@@ -295,7 +299,7 @@
if x != nil && x.Workflow != nil {
return *x.Workflow
}
- return Workflow_WorkflowUnspecified
+ return Workflow_Workflow_Unspecified
}
func (x *FlagDeclaration) GetContainers() []string {
@@ -642,17 +646,17 @@
0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a,
0x12, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x64, 0x65, 0x66, 0x61, 0x75,
- 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2a, 0x61, 0x0a, 0x08,
- 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x17, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6b,
- 0x66, 0x6c, 0x6f, 0x77, 0x55, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x10,
- 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4c, 0x61, 0x75,
- 0x6e, 0x63, 0x68, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f,
- 0x77, 0x50, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x57,
- 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x10, 0x03, 0x42,
- 0x33, 0x5a, 0x31, 0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64, 0x2f, 0x73, 0x6f, 0x6f, 0x6e, 0x67,
- 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f,
- 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x70,
- 0x72, 0x6f, 0x74, 0x6f,
+ 0x6c, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2a, 0x65, 0x0a, 0x08,
+ 0x77, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x12, 0x18, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6b,
+ 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x55, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64,
+ 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x4c,
+ 0x61, 0x75, 0x6e, 0x63, 0x68, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6b, 0x66,
+ 0x6c, 0x6f, 0x77, 0x5f, 0x50, 0x72, 0x65, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x10, 0x02, 0x12, 0x13,
+ 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x66, 0x6c, 0x6f, 0x77, 0x5f, 0x4d, 0x61, 0x6e, 0x75, 0x61,
+ 0x6c, 0x10, 0x03, 0x42, 0x33, 0x5a, 0x31, 0x61, 0x6e, 0x64, 0x72, 0x6f, 0x69, 0x64, 0x2f, 0x73,
+ 0x6f, 0x6f, 0x6e, 0x67, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e,
+ 0x66, 0x69, 0x67, 0x2f, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+ 0x69, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
}
var (
diff --git a/cmd/release_config/release_config_proto/build_flags_src.proto b/cmd/release_config/release_config_proto/build_flags_src.proto
index 81c6ae3..6a8e96e 100644
--- a/cmd/release_config/release_config_proto/build_flags_src.proto
+++ b/cmd/release_config/release_config_proto/build_flags_src.proto
@@ -1,3 +1,7 @@
+//
+// Copyright (C) 2024 The Android Open-Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
@@ -39,18 +43,18 @@
// com.android.1mypackage are invalid
enum workflow {
- WorkflowUnspecified = 0;
+ Workflow_Unspecified = 0;
// Boolean value flags that progress from false to true.
- WorkflowLaunch = 1;
+ Workflow_Launch = 1;
// String value flags that get updated with new version strings to control
// prebuilt inclusion.
- WorkflowPrebuilt = 2;
+ Workflow_Prebuilt = 2;
// Manually managed outside flags. These are likely to be found in a
// different directory than flags with other workflows.
- WorkflowManual = 3;
+ Workflow_Manual = 3;
}
message value {