Merge pull request #155 from nicholasSUSE/bug-fix-lifecycle-status

Bug fixes
rancher · Dec 10, 2024 · 0722cc5 · 0722cc5
2 parents 5066d7b + ca4ba91
commit 0722cc5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pkg/lifecycle/state.go b/pkg/lifecycle/state.go
@@ -40,7 +40,7 @@ func LoadState(rootFs billy.Filesystem) (*Status, error) {
 		return nil, err
 	}
 	if !exist {
-		return nil, err
+		return nil, errors.New("state.json file does not exist")
 	}
 
 	// Read the file content

diff --git a/pkg/regsync/cosign.go b/pkg/regsync/cosign.go
@@ -195,7 +195,7 @@ func checkCosignedImages(imageTags map[string][]string) (map[string][]string, er
 	for image, tags := range imageTags {
 		for _, tag := range tags {
 			imageTag := baseImageRepository + image + ":" + tag
-
+			fmt.Printf("checking: %s\n", imageTag)
 			// Close the stdout and stderr so there are no leaks
 			oldStdout, oldStderr, r, w := closeStdOut()
 			// Verify the image, if it's cosigned

diff --git a/pkg/regsync/generateconfig.go b/pkg/regsync/generateconfig.go
@@ -154,6 +154,9 @@ sync:`)
 	sort.Strings(repositories)
 
 	for _, repo := range repositories {
+		if repo == "" {
+			continue // skip empty repository
+		}
 		fmt.Fprintf(file, "%s%s\n", "- source: docker.io/", repo)
 		fmt.Fprintf(file, `  target: '{{ env "REGISTRY_ENDPOINT" }}/%s'`, repo)
 		fmt.Fprintln(file)
@@ -168,6 +171,9 @@ sync:`)
 		sort.Strings(tags)
 
 		for _, tag := range tags {
+			if tag == "" {
+				continue // skip empty tag
+			}
 			fmt.Fprintf(file, "    - %s\n", tag)
 		}
 	}