fix: move notFoundError to notExistError (#2213)

Signed-off-by: fungaren <[email protected]>
openyurtio · Dec 2, 2024 · 192ee6e · 192ee6e
1 parent 09078b4
commit 192ee6e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/pkg/yurtmanager/webhook/util/writer/certwriter.go b/pkg/yurtmanager/webhook/util/writer/certwriter.go
@@ -77,7 +77,11 @@ func updateIfNotExists(ch certReadWriter) (*generator.Artifacts, bool, error) {
 	certs, err := ch.read()
 	if isNotExist(err) {
 		// Create if not exists
-		certs, err = ch.overwrite(certs.ResourceVersion)
+		var resourceVersion string
+		if certs != nil {
+			resourceVersion = certs.ResourceVersion
+		}
+		certs, err = ch.overwrite(resourceVersion)
 		return certs, true, err
 	}
 	return certs, false, err

diff --git a/pkg/yurtmanager/webhook/util/writer/error.go b/pkg/yurtmanager/webhook/util/writer/error.go
@@ -16,14 +16,6 @@ limitations under the License.
 
 package writer
 
-type notFoundError struct {
-	err error
-}
-
-func (e notFoundError) Error() string {
-	return e.err.Error()
-}
-
 type alreadyExistError struct {
 	err error
 }

diff --git a/pkg/yurtmanager/webhook/util/writer/fs.go b/pkg/yurtmanager/webhook/util/writer/fs.go
@@ -188,7 +188,7 @@ func ensureExist(dir string) error {
 		case err == nil:
 			continue
 		case os.IsNotExist(err):
-			return notFoundError{err}
+			return notExistError{err}
 		default:
 			return err
 		}