update code format

kubesphere · Jun 26, 2023 · 94fcd38 · 94fcd38
1 parent 4dad181
commit 94fcd38
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 53 deletions.
diff --git a/pkg/extension/create.go b/pkg/extension/create.go
@@ -4,14 +4,15 @@ import (
 	"embed"
 	"fmt"
 	"io/fs"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"os"
 	"path"
 	"path/filepath"
-	"sigs.k8s.io/yaml"
 	"strings"
 	"text/template"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/yaml"
 )
 
 type Config struct {
@@ -59,7 +60,7 @@ func Create(p string, config Config) error {
 func CreateAppChart(p string, name string, chart []byte) error {
 	var cmName = fmt.Sprintf("application-%s-chart", name)
 
-	var cm = v1.ConfigMap{
+	var cm = corev1.ConfigMap{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
 			Kind:       "ConfigMap",

diff --git a/pkg/extension/publish.go b/pkg/extension/publish.go
@@ -47,61 +47,55 @@ func LoadApplicationClass(name, p, tempDir string) error {
 		return err
 	}
 	var appClass ApplicationClass
-	err = yaml.Unmarshal(content, &appClass)
-	if err != nil {
+	if err = yaml.Unmarshal(content, &appClass); err != nil {
 		return err
 	}
 
 	// Validate
-	if len(appClass.Name) != 0 {
-		filePath := path.Join(tempDir, "charts/applicationclass")
-		err = os.MkdirAll(filePath, 0644)
-		if err != nil {
-			return err
-		}
-
-		c := &chart.Metadata{
-			APIVersion: "v1",
-			Name:       appClass.Name,
-			Version:    appClass.PackageVersion,
-			AppVersion: appClass.AppVersion,
-		}
-		appClassChart, err := yaml.Marshal(c)
-		if err != nil {
-			return err
-		}
+	if len(appClass.Name) == 0 {
+		return nil
+	}
 
-		err = os.WriteFile(filePath+"/Chart.yaml", appClassChart, 0644)
-		if err != nil {
-			return err
-		}
+	filePath := path.Join(tempDir, "charts/applicationclass")
+	if err = os.MkdirAll(filePath, 0644); err != nil {
+		return err
+	}
 
-		err = os.MkdirAll(filePath+"/templates", 0644)
-		if err != nil {
-			return err
-		}
+	c := &chart.Metadata{
+		APIVersion: "v1",
+		Name:       appClass.Name,
+		Version:    appClass.PackageVersion,
+		AppVersion: appClass.AppVersion,
+	}
+	appClassChart, err := yaml.Marshal(c)
+	if err != nil {
+		return err
+	}
 
-		if appClass.Provisioner == "kubesphere.io/helm-application" {
-			var cmName = fmt.Sprintf("application-%s-chart", name)
-			appClass.Parameters = make(map[string]string)
-			appClass.Parameters["configmap"] = cmName
-			appClass.Parameters["namespace"] = "kubesphere-system"
+	if err = os.WriteFile(filePath+"/Chart.yaml", appClassChart, 0644); err != nil {
+		return err
+	}
+	if err = os.MkdirAll(filePath+"/templates", 0644); err != nil {
+		return err
+	}
 
-			err = copy.Copy(tempDir+"/application-package.yaml", filePath+"/templates/application-package.yaml")
-			if err != nil {
-				return err
-			}
-		}
+	if appClass.Provisioner == "kubesphere.io/helm-application" {
+		var cmName = fmt.Sprintf("application-%s-chart", name)
+		appClass.Parameters = make(map[string]string)
+		appClass.Parameters["configmap"] = cmName
+		appClass.Parameters["namespace"] = "kubesphere-system"
 
-		err = applicationClassTmpl.Execute(&b, appClass)
-		if err != nil {
-			return err
-		}
-		err = os.WriteFile(filePath+"/templates/applicationclass.yaml", b.Bytes(), 0644)
-		if err != nil {
+		if err = copy.Copy(tempDir+"/application-package.yaml", filePath+"/templates/application-package.yaml"); err != nil {
 			return err
 		}
 	}
+
+	if err = applicationClassTmpl.Execute(&b, appClass); err != nil {
+		return err
+	}
+	if err = os.WriteFile(filePath+"/templates/applicationclass.yaml", b.Bytes(), 0644); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -119,8 +113,7 @@ func Load(path string) (*Extension, error) {
 	}
 	defer os.RemoveAll(tempDir) // nolint
 
-	err = copy.Copy(path, tempDir)
-	if err != nil {
+	if err = copy.Copy(path, tempDir); err != nil {
 		return nil, err
 	}
 
@@ -134,13 +127,11 @@ func Load(path string) (*Extension, error) {
 		return nil, err
 	}
 
-	err = os.WriteFile(tempDir+"/Chart.yaml", chartMetadata, 0644)
-	if err != nil {
+	if err = os.WriteFile(tempDir+"/Chart.yaml", chartMetadata, 0644); err != nil {
 		return nil, err
 	}
 
-	err = LoadApplicationClass(metadata.Name, path, tempDir)
-	if err != nil {
+	if err = LoadApplicationClass(metadata.Name, path, tempDir); err != nil {
 		return nil, err
 	}