Merge pull request #1399 from carvel-dev/break-release-package

Splitting cli release package
carvel-dev · Nov 15, 2023 · b4886df · b4886df
2 parents 934d244 + 1783efd
commit b4886df
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/cli/pkg/kctrl/cmd/package/release/release.go b/cli/pkg/kctrl/cmd/package/release/release.go
@@ -14,6 +14,7 @@ import (
 	cmdapprelease "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app/release"
 	cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core"
 	cmdpkg "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package"
+	"github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/release/schemagenerator"
 	"github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local"
 	buildconfigs "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/buildconfigs"
 	"github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger"
@@ -175,9 +176,9 @@ func generateValuesSchema(pkgBuild buildconfigs.PackageBuild) (*kcdatav1alpha1.V
 		templateStage := pkgBuild.Spec.Template.Spec.App.Spec.Template[0]
 		switch {
 		case templateStage.HelmTemplate != nil:
-			return NewHelmValuesSchemaGen(templateStage.HelmTemplate.Path).Schema()
+			return schemagenerator.NewHelmValuesSchemaGen(templateStage.HelmTemplate.Path).Schema()
 		case templateStage.Ytt != nil:
-			return NewValuesSchemaGen(templateStage.Ytt.Paths).Schema()
+			return schemagenerator.NewValuesSchemaGen(templateStage.Ytt.Paths).Schema()
 		}
 	}
 	return nil, nil

diff --git a/...ackage/release/helm_openapi_schema_gen.go → ...chemagenerator/helm_openapi_schema_gen.go b/...ackage/release/helm_openapi_schema_gen.go → ...chemagenerator/helm_openapi_schema_gen.go
@@ -1,7 +1,7 @@
 // Copyright 2022 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package release
+package schemagenerator
 
 import (
 	"fmt"

diff --git a/...e/release/helm_openapi_schema_gen_test.go → ...generator/helm_openapi_schema_gen_test.go b/...e/release/helm_openapi_schema_gen_test.go → ...generator/helm_openapi_schema_gen_test.go
@@ -1,7 +1,7 @@
 // Copyright 2022 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package release_test
+package schemagenerator_test
 
 import (
 	"io/fs"
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/release"
+	"github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/release/schemagenerator"
 	"sigs.k8s.io/yaml"
 )
 
@@ -225,7 +225,7 @@ type: object
 			fileName := "values.yaml"
 			err = os.WriteFile(filepath.Join(dirName, fileName), []byte(test.input), fs.ModePerm)
 			require.NoError(t, err)
-			valuesSchema, err := release.NewHelmValuesSchemaGen("tmp").Schema()
+			valuesSchema, err := schemagenerator.NewHelmValuesSchemaGen("tmp").Schema()
 			output, err := yaml.JSONToYAML(valuesSchema.OpenAPIv3.Raw)
 			require.NoError(t, err)
 			require.Equal(t, test.want, string(output), "Expected valuesSchema to match")
@@ -242,7 +242,7 @@ func TestHelmValuesSchemaGen_Schema_EmptyFile(t *testing.T) {
 	fileName := "values.yaml"
 	err = os.WriteFile(filepath.Join(dirName, fileName), []byte(""), fs.ModePerm)
 	require.NoError(t, err)
-	valuesSchema, err := release.NewHelmValuesSchemaGen("tmp").Schema()
+	valuesSchema, err := schemagenerator.NewHelmValuesSchemaGen("tmp").Schema()
 	require.NoError(t, err)
 	require.Equal(t, 0, len(valuesSchema.OpenAPIv3.Raw), "Expected valuesSchema.OpenAPIv3.Raw to be empty")
 }
@@ -254,7 +254,7 @@ func TestHelmValuesSchemaGen_Schema_File_Not_Present(t *testing.T) {
 	dirName := "tmp"
 	err := os.Mkdir(dirName, fs.ModePerm)
 	require.NoError(t, err)
-	valuesSchema, err := release.NewHelmValuesSchemaGen("tmp").Schema()
+	valuesSchema, err := schemagenerator.NewHelmValuesSchemaGen("tmp").Schema()
 	require.NoError(t, err)
 	require.Equal(t, 0, len(valuesSchema.OpenAPIv3.Raw), "Expected valuesSchema.OpenAPIv3.Raw to be empty")
 }
diff --git a/...cmd/package/release/openapi_schema_gen.go → ...ase/schemagenerator/openapi_schema_gen.go b/...cmd/package/release/openapi_schema_gen.go → ...ase/schemagenerator/openapi_schema_gen.go
@@ -1,7 +1,7 @@
 // Copyright 2022 VMware, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package release
+package schemagenerator
 
 import (
 	"bytes"