Merge pull request containerd#10510 from k8s-infra-cherrypick-robot/cherry-pick-10503-to-release/1.7

estesp · web-flow · commit 36a3e962346c · 2024-07-26T11:05:41.000-04:00
[release/1.7] introspection: regenerate UUID if state is empty
diff --git a/services/introspection/local.go b/services/introspection/local.go
@@ -163,6 +163,9 @@ func (l *Local) getUUID() (string, error) {
 		}
 		return "", err
 	}
+	if len(data) == 0 {
+		return l.generateUUID()
+	}
 	u := string(data)
 	if _, err := uuid.Parse(u); err != nil {
 		return "", err

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,9 @@ func (l *Local) getUUID() (string, error) {`
`163`	`163`	`}`
`164`	`164`	`return "", err`
`165`	`165`	`}`
	`166`	`+ if len(data) == 0 {`
	`167`	`+ return l.generateUUID()`
	`168`	`+ }`
`166`	`169`	`u := string(data)`
`167`	`170`	`if _, err := uuid.Parse(u); err != nil {`
`168`	`171`	`return "", err`