Merge pull request kubernetes#93529 from latteczy/master

k8s-ci-robot · web-flow · commit 01ca6fb5c951 · 2020-08-28T06:37:31.000-07:00
reduce the number of type conversions and correct variable name
diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go b/staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go
@@ -52,13 +52,14 @@ func (cml *ConfigMapLock) Get(ctx context.Context) (*LeaderElectionRecord, []byt
 	if cml.cm.Annotations == nil {
 		cml.cm.Annotations = make(map[string]string)
 	}
-	recordBytes, found := cml.cm.Annotations[LeaderElectionRecordAnnotationKey]
+	recordStr, found := cml.cm.Annotations[LeaderElectionRecordAnnotationKey]
+	recordBytes := []byte(recordStr)
 	if found {
-		if err := json.Unmarshal([]byte(recordBytes), &record); err != nil {
+		if err := json.Unmarshal(recordBytes, &record); err != nil {
 			return nil, nil, err
 		}
 	}
-	return &record, []byte(recordBytes), nil
+	return &record, recordBytes, nil
 }
 
 // Create attempts to create a LeaderElectionRecord annotation
diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/endpointslock.go b/staging/src/k8s.io/client-go/tools/leaderelection/resourcelock/endpointslock.go
@@ -47,13 +47,14 @@ func (el *EndpointsLock) Get(ctx context.Context) (*LeaderElectionRecord, []byte
 	if el.e.Annotations == nil {
 		el.e.Annotations = make(map[string]string)
 	}
-	recordBytes, found := el.e.Annotations[LeaderElectionRecordAnnotationKey]
+	recordStr, found := el.e.Annotations[LeaderElectionRecordAnnotationKey]
+	recordBytes := []byte(recordStr)
 	if found {
-		if err := json.Unmarshal([]byte(recordBytes), &record); err != nil {
+		if err := json.Unmarshal(recordBytes, &record); err != nil {
 			return nil, nil, err
 		}
 	}
-	return &record, []byte(recordBytes), nil
+	return &record, recordBytes, nil
 }
 
 // Create attempts to create a LeaderElectionRecord annotation

Original file line number	Diff line number	Diff line change
`@@ -52,13 +52,14 @@ func (cml ConfigMapLock) Get(ctx context.Context) (LeaderElectionRecord, []byt`
`52`	`52`	`if cml.cm.Annotations == nil {`
`53`	`53`	`cml.cm.Annotations = make(map[string]string)`
`54`	`54`	`}`
`55`		`- recordBytes, found := cml.cm.Annotations[LeaderElectionRecordAnnotationKey]`
	`55`	`+ recordStr, found := cml.cm.Annotations[LeaderElectionRecordAnnotationKey]`
	`56`	`+ recordBytes := []byte(recordStr)`
`56`	`57`	`if found {`
`57`		`- if err := json.Unmarshal([]byte(recordBytes), &record); err != nil {`
	`58`	`+ if err := json.Unmarshal(recordBytes, &record); err != nil {`
`58`	`59`	`return nil, nil, err`
`59`	`60`	`}`
`60`	`61`	`}`
`61`		`- return &record, []byte(recordBytes), nil`
	`62`	`+ return &record, recordBytes, nil`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`// Create attempts to create a LeaderElectionRecord annotation`
Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,14 @@ func (el EndpointsLock) Get(ctx context.Context) (LeaderElectionRecord, []byte`
`47`	`47`	`if el.e.Annotations == nil {`
`48`	`48`	`el.e.Annotations = make(map[string]string)`
`49`	`49`	`}`
`50`		`- recordBytes, found := el.e.Annotations[LeaderElectionRecordAnnotationKey]`
	`50`	`+ recordStr, found := el.e.Annotations[LeaderElectionRecordAnnotationKey]`
	`51`	`+ recordBytes := []byte(recordStr)`
`51`	`52`	`if found {`
`52`		`- if err := json.Unmarshal([]byte(recordBytes), &record); err != nil {`
	`53`	`+ if err := json.Unmarshal(recordBytes, &record); err != nil {`
`53`	`54`	`return nil, nil, err`
`54`	`55`	`}`
`55`	`56`	`}`
`56`		`- return &record, []byte(recordBytes), nil`
	`57`	`+ return &record, recordBytes, nil`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`// Create attempts to create a LeaderElectionRecord annotation`