fix ST1003 go naming style errors

BenTheElder · BenTheElder · commit c9eb9e135ba4 · 2025-10-29T14:55:25.000-07:00
diff --git a/experiment/gerrit-onboarder/onboarder.go b/experiment/gerrit-onboarder/onboarder.go
@@ -150,9 +150,9 @@ func ensureUUID(groupsFile, uuid, group string) (string, error) {
 		return "", fmt.Errorf("UUID, %s, already in use for group %s", uuid, value)
 	}
 	// Group name already in use with different UUID
-	for cur_id, groupName := range groupsMap {
+	for curID, groupName := range groupsMap {
 		if groupName == group {
-			return "", fmt.Errorf("%s already used as group name for %s", group, cur_id)
+			return "", fmt.Errorf("%s already used as group name for %s", group, curID)
 		}
 	}
 
@@ -282,12 +282,12 @@ func labelAccessExistsFunc(groupName string) func(map[string][]string) bool {
 	}
 }
 
-func verifyInTree(workDir, host, cur_branch string, configMap map[string][]string, verify func(map[string][]string) bool) (bool, error) {
+func verifyInTree(workDir, host, curBranch string, configMap map[string][]string, verify func(map[string][]string) bool) (bool, error) {
 	if verify(configMap) {
 		return true, nil
 	} else if inheritance := getInheritedRepo(configMap); inheritance != "" {
-		parent_branch := cur_branch + "_parent"
-		if err := fetchMetaConfig(host, inheritance, parent_branch, workDir); err != nil {
+		parentBranch := curBranch + "_parent"
+		if err := fetchMetaConfig(host, inheritance, parentBranch, workDir); err != nil {
 			// This likely won't happen, but if the fail is due to switching branches, we want to fail
 			if strings.Contains(err.Error(), "failed to switch") {
 				return false, fmt.Errorf("unable to fetch refs/meta/config for %s: %w", inheritance, err)
@@ -300,28 +300,28 @@ func verifyInTree(workDir, host, cur_branch string, configMap map[string][]strin
 			return false, fmt.Errorf("failed to read project.config file: %w", err)
 		}
 		newConfig, _ := configToMap(string(data))
-		ret, err := verifyInTree(workDir, host, parent_branch, newConfig, verify)
+		ret, err := verifyInTree(workDir, host, parentBranch, newConfig, verify)
 		if err != nil {
 			return false, fmt.Errorf("failed to check if lines in config for %s/%s: %w", host, inheritance, err)
 		}
-		if err := execInDir(os.Stdout, os.Stderr, workDir, "git", "checkout", cur_branch); err != nil {
-			return false, fmt.Errorf("failed to checkout %s, %w", cur_branch, err)
+		if err := execInDir(os.Stdout, os.Stderr, workDir, "git", "checkout", curBranch); err != nil {
+			return false, fmt.Errorf("failed to checkout %s, %w", curBranch, err)
 		}
-		if err := execInDir(os.Stdout, os.Stderr, workDir, "git", "branch", "-D", parent_branch); err != nil {
-			return false, fmt.Errorf("failed to delete %s branch, %w", parent_branch, err)
+		if err := execInDir(os.Stdout, os.Stderr, workDir, "git", "branch", "-D", parentBranch); err != nil {
+			return false, fmt.Errorf("failed to delete %s branch, %w", parentBranch, err)
 		}
 		return ret, nil
 	}
 	return false, nil
 }
 
-func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (string, error) {
+func ensureProjectConfig(workDir, config, host, curBranch, groupName string) (string, error) {
 	configMap, orderedKeys := configToMap(config)
 
 	// Check that prow automation robot has access to refs/*
 	accessLines := []string{}
 	readAccessLine := fmt.Sprintf(prowReadAccessFormat, groupName)
-	prowReadAccess, err := verifyInTree(workDir, host, cur_branch, configMap, lineInMatchingHeaderFunc(accessRefsRegex, readAccessLine))
+	prowReadAccess, err := verifyInTree(workDir, host, curBranch, configMap, lineInMatchingHeaderFunc(accessRefsRegex, readAccessLine))
 	if err != nil {
 		return "", fmt.Errorf("failed to check if needed lines in config: %w", err)
 	}
@@ -331,7 +331,7 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s
 
 	// Check that the line "label-verified" = ... group GROUPNAME exists under ANY header
 	labelAccessLine := fmt.Sprintf(prowLabelAccessFormat, groupName)
-	prowLabelAccess, err := verifyInTree(workDir, host, cur_branch, configMap, labelAccessExistsFunc(groupName))
+	prowLabelAccess, err := verifyInTree(workDir, host, curBranch, configMap, labelAccessExistsFunc(groupName))
 	if err != nil {
 		return "", fmt.Errorf("failed to check if needed lines in config: %w", err)
 	}
@@ -341,7 +341,7 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s
 	configMap, orderedKeys = addSection(accessHeader, configMap, orderedKeys, accessLines)
 
 	// We need to be less exact with the Label-Verified header so we are just checking if it exists anywhere:
-	labelExists, err := verifyInTree(workDir, host, cur_branch, configMap, labelExists)
+	labelExists, err := verifyInTree(workDir, host, curBranch, configMap, labelExists)
 	if err != nil {
 		return "", fmt.Errorf("failed to check if needed lines in config: %w", err)
 	}
@@ -352,13 +352,13 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s
 
 }
 
-func updatePojectConfig(workDir, host, cur_branch, groupName string) error {
+func updatePojectConfig(workDir, host, curBranch, groupName string) error {
 	data, err := os.ReadFile(path.Join(workDir, projectConfigFile))
 	if err != nil {
 		return fmt.Errorf("failed to read project.config file: %w", err)
 	}
 
-	newData, err := ensureProjectConfig(workDir, string(data), host, cur_branch, groupName)
+	newData, err := ensureProjectConfig(workDir, string(data), host, curBranch, groupName)
 	if err != nil {
 		return fmt.Errorf("failed to ensure updated project config: %w", err)
 	}
diff --git a/gopherage/cmd/metadata/metadata.go b/gopherage/cmd/metadata/metadata.go
@@ -31,7 +31,7 @@ import (
 
 const (
 	// From https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables
-	repo_owner = "REPO_OWNER"
+	repoOwner = "REPO_OWNER"
 )
 
 type Flags struct {
@@ -106,7 +106,7 @@ func MakeCommand() *cobra.Command {
 				Source:      Flags.source,
 				ReplaceRoot: Flags.replace,
 			}
-			WriteJson(Flags, metadata)
+			WriteJSON(Flags, metadata)
 		},
 	}
 	absCmd.Flags().StringVarP(&Flags.outputFile, "output", "o", "-", "output file")
@@ -136,7 +136,7 @@ func MakeCommand() *cobra.Command {
 				ChangeNum: Flags.changeNum,
 				PatchSet:  Flags.patchSet,
 			}
-			WriteJson(Flags, metadata)
+			WriteJSON(Flags, metadata)
 		},
 	}
 	incCmd.Flags().StringVarP(&Flags.outputFile, "output", "o", "-", "output file")
@@ -166,10 +166,10 @@ func gitCommand(args ...string) (string, error) {
 
 func ValidateBase(Flags *Flags, cmd *cobra.Command, env envFetcher) error {
 	if Flags.project == "" {
-		project := env(repo_owner)
+		project := env(repoOwner)
 		if project == "" {
 			cmd.Usage()
-			return fmt.Errorf("Failed to collect project from ENV: (%s) not found", repo_owner)
+			return fmt.Errorf("Failed to collect project from ENV: (%s) not found", repoOwner)
 		}
 		Flags.project = project
 	}
@@ -209,7 +209,7 @@ func ValidateAbs(Flags *Flags, r gitRunner) error {
 	return nil
 }
 
-func WriteJson(Flags *Flags, m Metadata) error {
+func WriteJSON(Flags *Flags, m Metadata) error {
 	var file io.WriteCloser
 
 	j, err := json.Marshal(m)
diff --git a/kubetest/aksengine.go b/kubetest/aksengine.go
@@ -1173,8 +1173,8 @@ func (c *aksEngineDeployer) DumpClusterLogs(localPath, gcsPath string) error {
 	}
 
 	logDumperWindows := func() error {
-		const winLogDumpScriptUrl string = "https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/scripts/win-ci-logs-collector.sh"
-		winLogDumpScript, err := downloadFromURL(winLogDumpScriptUrl, path.Join(c.outputDir, "win-ci-logs-collector.sh"), 2)
+		const winLogDumpScriptURL string = "https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/scripts/win-ci-logs-collector.sh"
+		winLogDumpScript, err := downloadFromURL(winLogDumpScriptURL, path.Join(c.outputDir, "win-ci-logs-collector.sh"), 2)
 
 		masterFQDN := fmt.Sprintf("%s.%s.cloudapp.azure.com", c.dnsPrefix, c.location)
 		if err != nil {
@@ -1245,9 +1245,9 @@ func (c *aksEngineDeployer) TestSetup() error {
 	}
 
 	// Download repo-list that defines repositories for Windows test images.
-	downloadUrl, ok := os.LookupEnv("KUBE_TEST_REPO_LIST_DOWNLOAD_LOCATION")
+	downloadURL, ok := os.LookupEnv("KUBE_TEST_REPO_LIST_DOWNLOAD_LOCATION")
 	if !ok {
-		// Env value for downloadUrl is not set, nothing to do
+		// Env value for downloadURL is not set, nothing to do
 		log.Printf("KUBE_TEST_REPO_LIST_DOWNLOAD_LOCATION not set. Using default test image repos.")
 		return nil
 	}
@@ -1259,11 +1259,11 @@ func (c *aksEngineDeployer) TestSetup() error {
 	}
 	defer f.Close()
 
-	log.Printf("downloading %v from %v.", downloadPath, downloadUrl)
-	err = httpRead(downloadUrl, f)
+	log.Printf("downloading %v from %v.", downloadPath, downloadURL)
+	err = httpRead(downloadURL, f)
 
 	if err != nil {
-		return fmt.Errorf("url=%s failed get %v: %v.", downloadUrl, downloadPath, err)
+		return fmt.Errorf("url=%s failed get %v: %v.", downloadURL, downloadPath, err)
 	}
 	f.Chmod(0744)
 	if err := os.Setenv("KUBE_TEST_REPO_LIST", downloadPath); err != nil {
diff --git a/kubetest/gke_test.go b/kubetest/gke_test.go
@@ -24,10 +24,10 @@ import (
 	"testing"
 )
 
-func newGkeDeployerFactory(instance_group_prefix string) (*gkeDeployer, error) {
+func newGkeDeployerFactory(instanceGroupPrefix string) (*gkeDeployer, error) {
 	flag.Set("gke-environment", "staging")
-	if instance_group_prefix != "" {
-		flag.Set("gke-instance-group-prefix", instance_group_prefix)
+	if instanceGroupPrefix != "" {
+		flag.Set("gke-instance-group-prefix", instanceGroupPrefix)
 	} else {
 		flag.Set("gke-instance-group-prefix", "gke")
 	}
@@ -63,15 +63,15 @@ func TestParseInstanceGroupsFromGcloud(t *testing.T) {
 	cases := []struct {
 		name                  string
 		input                 string
-		instance_group_prefix string
+		instanceGroupPrefix string
 		expected              []*ig
 		expectedError         bool
 	}{
 		// Zonal
 		{
 			name:                  "One instance group with default prefix",
 			input:                 urlZoneADefault,
-			instance_group_prefix: "",
+			instanceGroupPrefix: "",
 			expected: []*ig{
 				{
 					path: `zones/us-central1-a/instanceGroupManagers/gke-default-pool-6f8ec327-grp`,
@@ -83,16 +83,16 @@ func TestParseInstanceGroupsFromGcloud(t *testing.T) {
 			expectedError: false,
 		},
 		{
-			name:                  "One instance group with default prefix, but not matching instance_group_prefix",
+			name:                  "One instance group with default prefix, but not matching instanceGroupPrefix",
 			input:                 urlZoneADefault,
-			instance_group_prefix: "test",
+			instanceGroupPrefix: "test",
 			expected:              nil,
 			expectedError:         true,
 		},
 		{
 			name:                  "One instance group with test prefix",
 			input:                 urlZoneATest,
-			instance_group_prefix: "test",
+			instanceGroupPrefix: "test",
 			expected: []*ig{
 				{
 					path: `zones/us-central1-a/instanceGroupManagers/test-default-pool-6f8ec327-grp`,
@@ -107,7 +107,7 @@ func TestParseInstanceGroupsFromGcloud(t *testing.T) {
 		{
 			name:                  "Three instance groups with default prefix",
 			input:                 strings.Join([]string{urlZoneADefault, urlZoneBDefault, urlZoneCDefault}, ";"),
-			instance_group_prefix: "",
+			instanceGroupPrefix: "",
 			expected: []*ig{
 				{
 					path: `zones/us-central1-a/instanceGroupManagers/gke-default-pool-6f8ec327-grp`,
@@ -131,16 +131,16 @@ func TestParseInstanceGroupsFromGcloud(t *testing.T) {
 			expectedError: false,
 		},
 		{
-			name:                  "Three instance groups with default prefix, but not matching instance_group_prefix",
+			name:                  "Three instance groups with default prefix, but not matching instanceGroupPrefix",
 			input:                 strings.Join([]string{urlZoneADefault, urlZoneBDefault, urlZoneCDefault}, ";"),
-			instance_group_prefix: "test",
+			instanceGroupPrefix: "test",
 			expected:              nil,
 			expectedError:         true,
 		},
 		{
 			name:                  "Three instance groups with test prefix",
 			input:                 strings.Join([]string{urlZoneATest, urlZoneBTest, urlZoneCTest}, ";"),
-			instance_group_prefix: "test",
+			instanceGroupPrefix: "test",
 			expected: []*ig{
 				{
 					path: `zones/us-central1-a/instanceGroupManagers/test-default-pool-6f8ec327-grp`,
@@ -167,7 +167,7 @@ func TestParseInstanceGroupsFromGcloud(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			deployer, err := newGkeDeployerFactory(tc.instance_group_prefix)
+			deployer, err := newGkeDeployerFactory(tc.instanceGroupPrefix)
 			if err != nil {
 				t.Errorf("Error creating gke deployer: %v", err)
 			}
diff --git a/kubetest/kops.go b/kubetest/kops.go
@@ -873,15 +873,15 @@ func parseKubeconfig(kubeconfigPath string) (*kubeconfig, error) {
 }
 
 // setupGCEStateStore is used to create a 1-off state bucket in the active GCP project
-func setupGCEStateStore(projectId string) (*string, error) {
+func setupGCEStateStore(projectID string) (*string, error) {
 	ctx := context.Background()
 	client, err := storage.NewClient(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("error building storage API client: %w", err)
 	}
-	name := gceBucketName(projectId)
+	name := gceBucketName(projectID)
 	bkt := client.Bucket(name)
-	if err := bkt.Create(ctx, projectId, nil); err != nil {
+	if err := bkt.Create(ctx, projectID, nil); err != nil {
 		return nil, err
 	}
 	log.Printf("Created new GCS bucket for state store: %s\n.", name)
@@ -890,9 +890,9 @@ func setupGCEStateStore(projectId string) (*string, error) {
 }
 
 // gceBucketName generates a name for GCE state store bucket
-func gceBucketName(projectId string) string {
+func gceBucketName(projectID string) string {
 	b := make([]byte, 2)
 	cryptorand.Read(b)
 	s := hex.EncodeToString(b)
-	return strings.Join([]string{projectId, "state", s}, "-")
+	return strings.Join([]string{projectID, "state", s}, "-")
 }

Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,9 @@ func ensureUUID(groupsFile, uuid, group string) (string, error) {`
`150`	`150`	`return "", fmt.Errorf("UUID, %s, already in use for group %s", uuid, value)`
`151`	`151`	`}`
`152`	`152`	`// Group name already in use with different UUID`
`153`		`- for cur_id, groupName := range groupsMap {`
	`153`	`+ for curID, groupName := range groupsMap {`
`154`	`154`	`if groupName == group {`
`155`		`- return "", fmt.Errorf("%s already used as group name for %s", group, cur_id)`
	`155`	`+ return "", fmt.Errorf("%s already used as group name for %s", group, curID)`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`@@ -282,12 +282,12 @@ func labelAccessExistsFunc(groupName string) func(map[string][]string) bool {`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
`285`		`-func verifyInTree(workDir, host, cur_branch string, configMap map[string][]string, verify func(map[string][]string) bool) (bool, error) {`
	`285`	`+func verifyInTree(workDir, host, curBranch string, configMap map[string][]string, verify func(map[string][]string) bool) (bool, error) {`
`286`	`286`	`if verify(configMap) {`
`287`	`287`	`return true, nil`
`288`	`288`	`} else if inheritance := getInheritedRepo(configMap); inheritance != "" {`
`289`		`- parent_branch := cur_branch + "_parent"`
`290`		`- if err := fetchMetaConfig(host, inheritance, parent_branch, workDir); err != nil {`
	`289`	`+ parentBranch := curBranch + "_parent"`
	`290`	`+ if err := fetchMetaConfig(host, inheritance, parentBranch, workDir); err != nil {`
`291`	`291`	`// This likely won't happen, but if the fail is due to switching branches, we want to fail`
`292`	`292`	`if strings.Contains(err.Error(), "failed to switch") {`
`293`	`293`	`return false, fmt.Errorf("unable to fetch refs/meta/config for %s: %w", inheritance, err)`
`@@ -300,28 +300,28 @@ func verifyInTree(workDir, host, cur_branch string, configMap map[string][]strin`
`300`	`300`	`return false, fmt.Errorf("failed to read project.config file: %w", err)`
`301`	`301`	`}`
`302`	`302`	`newConfig, _ := configToMap(string(data))`
`303`		`- ret, err := verifyInTree(workDir, host, parent_branch, newConfig, verify)`
	`303`	`+ ret, err := verifyInTree(workDir, host, parentBranch, newConfig, verify)`
`304`	`304`	`if err != nil {`
`305`	`305`	`return false, fmt.Errorf("failed to check if lines in config for %s/%s: %w", host, inheritance, err)`
`306`	`306`	`}`
`307`		`- if err := execInDir(os.Stdout, os.Stderr, workDir, "git", "checkout", cur_branch); err != nil {`
`308`		`- return false, fmt.Errorf("failed to checkout %s, %w", cur_branch, err)`
	`307`	`+ if err := execInDir(os.Stdout, os.Stderr, workDir, "git", "checkout", curBranch); err != nil {`
	`308`	`+ return false, fmt.Errorf("failed to checkout %s, %w", curBranch, err)`
`309`	`309`	`}`
`310`		`- if err := execInDir(os.Stdout, os.Stderr, workDir, "git", "branch", "-D", parent_branch); err != nil {`
`311`		`- return false, fmt.Errorf("failed to delete %s branch, %w", parent_branch, err)`
	`310`	`+ if err := execInDir(os.Stdout, os.Stderr, workDir, "git", "branch", "-D", parentBranch); err != nil {`
	`311`	`+ return false, fmt.Errorf("failed to delete %s branch, %w", parentBranch, err)`
`312`	`312`	`}`
`313`	`313`	`return ret, nil`
`314`	`314`	`}`
`315`	`315`	`return false, nil`
`316`	`316`	`}`
`317`	`317`
`318`		`-func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (string, error) {`
	`318`	`+func ensureProjectConfig(workDir, config, host, curBranch, groupName string) (string, error) {`
`319`	`319`	`configMap, orderedKeys := configToMap(config)`
`320`	`320`
`321`	`321`	`// Check that prow automation robot has access to refs/*`
`322`	`322`	`accessLines := []string{}`
`323`	`323`	`readAccessLine := fmt.Sprintf(prowReadAccessFormat, groupName)`
`324`		`- prowReadAccess, err := verifyInTree(workDir, host, cur_branch, configMap, lineInMatchingHeaderFunc(accessRefsRegex, readAccessLine))`
	`324`	`+ prowReadAccess, err := verifyInTree(workDir, host, curBranch, configMap, lineInMatchingHeaderFunc(accessRefsRegex, readAccessLine))`
`325`	`325`	`if err != nil {`
`326`	`326`	`return "", fmt.Errorf("failed to check if needed lines in config: %w", err)`
`327`	`327`	`}`
`@@ -331,7 +331,7 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s`
`331`	`331`
`332`	`332`	`// Check that the line "label-verified" = ... group GROUPNAME exists under ANY header`
`333`	`333`	`labelAccessLine := fmt.Sprintf(prowLabelAccessFormat, groupName)`
`334`		`- prowLabelAccess, err := verifyInTree(workDir, host, cur_branch, configMap, labelAccessExistsFunc(groupName))`
	`334`	`+ prowLabelAccess, err := verifyInTree(workDir, host, curBranch, configMap, labelAccessExistsFunc(groupName))`
`335`	`335`	`if err != nil {`
`336`	`336`	`return "", fmt.Errorf("failed to check if needed lines in config: %w", err)`
`337`	`337`	`}`
`@@ -341,7 +341,7 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s`
`341`	`341`	`configMap, orderedKeys = addSection(accessHeader, configMap, orderedKeys, accessLines)`
`342`	`342`
`343`	`343`	`// We need to be less exact with the Label-Verified header so we are just checking if it exists anywhere:`
`344`		`- labelExists, err := verifyInTree(workDir, host, cur_branch, configMap, labelExists)`
	`344`	`+ labelExists, err := verifyInTree(workDir, host, curBranch, configMap, labelExists)`
`345`	`345`	`if err != nil {`
`346`	`346`	`return "", fmt.Errorf("failed to check if needed lines in config: %w", err)`
`347`	`347`	`}`
`@@ -352,13 +352,13 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s`
`352`	`352`
`353`	`353`	`}`
`354`	`354`
`355`		`-func updatePojectConfig(workDir, host, cur_branch, groupName string) error {`
	`355`	`+func updatePojectConfig(workDir, host, curBranch, groupName string) error {`
`356`	`356`	`data, err := os.ReadFile(path.Join(workDir, projectConfigFile))`
`357`	`357`	`if err != nil {`
`358`	`358`	`return fmt.Errorf("failed to read project.config file: %w", err)`
`359`	`359`	`}`
`360`	`360`
`361`		`- newData, err := ensureProjectConfig(workDir, string(data), host, cur_branch, groupName)`
	`361`	`+ newData, err := ensureProjectConfig(workDir, string(data), host, curBranch, groupName)`
`362`	`362`	`if err != nil {`
`363`	`363`	`return fmt.Errorf("failed to ensure updated project config: %w", err)`
`364`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`
`32`	`32`	`const (`
`33`	`33`	`// From https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables`
`34`		`- repo_owner = "REPO_OWNER"`
	`34`	`+ repoOwner = "REPO_OWNER"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`type Flags struct {`
`@@ -106,7 +106,7 @@ func MakeCommand() *cobra.Command {`
`106`	`106`	`Source: Flags.source,`
`107`	`107`	`ReplaceRoot: Flags.replace,`
`108`	`108`	`}`
`109`		`- WriteJson(Flags, metadata)`
	`109`	`+ WriteJSON(Flags, metadata)`
`110`	`110`	`},`
`111`	`111`	`}`
`112`	`112`	`absCmd.Flags().StringVarP(&Flags.outputFile, "output", "o", "-", "output file")`
`@@ -136,7 +136,7 @@ func MakeCommand() *cobra.Command {`
`136`	`136`	`ChangeNum: Flags.changeNum,`
`137`	`137`	`PatchSet: Flags.patchSet,`
`138`	`138`	`}`
`139`		`- WriteJson(Flags, metadata)`
	`139`	`+ WriteJSON(Flags, metadata)`
`140`	`140`	`},`
`141`	`141`	`}`
`142`	`142`	`incCmd.Flags().StringVarP(&Flags.outputFile, "output", "o", "-", "output file")`
`@@ -166,10 +166,10 @@ func gitCommand(args ...string) (string, error) {`
`166`	`166`
`167`	`167`	`func ValidateBase(Flags Flags, cmd cobra.Command, env envFetcher) error {`
`168`	`168`	`if Flags.project == "" {`
`169`		`- project := env(repo_owner)`
	`169`	`+ project := env(repoOwner)`
`170`	`170`	`if project == "" {`
`171`	`171`	`cmd.Usage()`
`172`		`- return fmt.Errorf("Failed to collect project from ENV: (%s) not found", repo_owner)`
	`172`	`+ return fmt.Errorf("Failed to collect project from ENV: (%s) not found", repoOwner)`
`173`	`173`	`}`
`174`	`174`	`Flags.project = project`
`175`	`175`	`}`
`@@ -209,7 +209,7 @@ func ValidateAbs(Flags *Flags, r gitRunner) error {`
`209`	`209`	`return nil`
`210`	`210`	`}`
`211`	`211`
`212`		`-func WriteJson(Flags *Flags, m Metadata) error {`
	`212`	`+func WriteJSON(Flags *Flags, m Metadata) error {`
`213`	`213`	`var file io.WriteCloser`
`214`	`214`
`215`	`215`	`j, err := json.Marshal(m)`
Original file line number	Diff line number	Diff line change
`@@ -873,15 +873,15 @@ func parseKubeconfig(kubeconfigPath string) (*kubeconfig, error) {`
`873`	`873`	`}`
`874`	`874`
`875`	`875`	`// setupGCEStateStore is used to create a 1-off state bucket in the active GCP project`
`876`		`-func setupGCEStateStore(projectId string) (*string, error) {`
	`876`	`+func setupGCEStateStore(projectID string) (*string, error) {`
`877`	`877`	`ctx := context.Background()`
`878`	`878`	`client, err := storage.NewClient(ctx)`
`879`	`879`	`if err != nil {`
`880`	`880`	`return nil, fmt.Errorf("error building storage API client: %w", err)`
`881`	`881`	`}`
`882`		`- name := gceBucketName(projectId)`
	`882`	`+ name := gceBucketName(projectID)`
`883`	`883`	`bkt := client.Bucket(name)`
`884`		`- if err := bkt.Create(ctx, projectId, nil); err != nil {`
	`884`	`+ if err := bkt.Create(ctx, projectID, nil); err != nil {`
`885`	`885`	`return nil, err`
`886`	`886`	`}`
`887`	`887`	`log.Printf("Created new GCS bucket for state store: %s\n.", name)`
`@@ -890,9 +890,9 @@ func setupGCEStateStore(projectId string) (*string, error) {`
`890`	`890`	`}`
`891`	`891`
`892`	`892`	`// gceBucketName generates a name for GCE state store bucket`
`893`		`-func gceBucketName(projectId string) string {`
	`893`	`+func gceBucketName(projectID string) string {`
`894`	`894`	`b := make([]byte, 2)`
`895`	`895`	`cryptorand.Read(b)`
`896`	`896`	`s := hex.EncodeToString(b)`
`897`		`- return strings.Join([]string{projectId, "state", s}, "-")`
	`897`	`+ return strings.Join([]string{projectID, "state", s}, "-")`
`898`	`898`	`}`