Removed old subpackage fragments (#968)

* Removed old subpackage fragments

Signed-off-by: liamfallon <liam.fallon@est.tech>

* Removed subpackage from v1alpha1 API

Signed-off-by: liamfallon <liam.fallon@est.tech>

---------

Signed-off-by: liamfallon <liam.fallon@est.tech>

Author: liamfallon

api/generated/openapi/zz_generated.openapi.go

@@ -198,8 +198,6 @@ type RenderStatus struct {
 
 // PackageInitTaskSpec defines the package initialization task.
 type PackageInitTaskSpec struct {
-	// `Subpackage` is a directory path to a subpackage to initialize. If unspecified, the main package will be initialized.
-	Subpackage string `json:"subpackage,omitempty"`
 	// `Description` is a short description of the package.
 	Description string `json:"description,omitempty"`
 	// `Keywords` is a list of keywords describing the package.
@@ -209,9 +207,6 @@ type PackageInitTaskSpec struct {
 }
 
 type PackageCloneTaskSpec struct {
-	// // `Subpackage` is a path to a directory where to clone the upstream package.
-	// Subpackage string `json:"subpackage,omitempty"`
-
 	// `Upstream` is the reference to the upstream package to clone.
 	Upstream UpstreamPackage `json:"upstreamRef,omitempty"`
 }
@@ -410,10 +405,6 @@ type Result struct {
 	// If user provides an executable file with commands, ExecPath should
 	// contain the entire input string.
 	ExecPath string `json:"exec,omitempty"`
-	// TODO(droot): This is required for making structured results subpackage aware.
-	// Enable this once test harness supports filepath based assertions.
-	// Pkg is OS specific Absolute path to the package.
-	// Pkg string `yaml:"pkg,omitempty"`
 	// Stderr is the content in function stderr
 	Stderr string `json:"stderr,omitempty"`
 	// ExitCode is the exit code from running the function

api/porch/types.go

@@ -198,8 +198,6 @@ type RenderStatus struct {
 
 // PackageInitTaskSpec defines the package initialization task.
 type PackageInitTaskSpec struct {
-	// `Subpackage` is a directory path to a subpackage to initialize. If unspecified, the main package will be initialized.
-	Subpackage string `json:"subpackage,omitempty"`
 	// `Description` is a short description of the package.
 	Description string `json:"description,omitempty"`
 	// `Keywords` is a list of keywords describing the package.
@@ -209,9 +207,6 @@ type PackageInitTaskSpec struct {
 }
 
 type PackageCloneTaskSpec struct {
-	// // `Subpackage` is a path to a directory where to clone the upstream package.
-	// Subpackage string `json:"subpackage,omitempty"`
-
 	// `Upstream` is the reference to the upstream package to clone.
 	Upstream UpstreamPackage `json:"upstreamRef,omitempty"`
 }
@@ -408,10 +403,6 @@ type Result struct {
 	// If user provides an executable file with commands, ExecPath should
 	// contain the entire input string.
 	ExecPath string `json:"exec,omitempty"`
-	// TODO(droot): This is required for making structured results subpackage aware.
-	// Enable this once test harness supports filepath based assertions.
-	// Pkg is OS specific Absolute path to the package.
-	// Pkg string `yaml:"pkg,omitempty"`
 	// Stderr is the content in function stderr
 	Stderr string `json:"stderr,omitempty"`
 	// ExitCode is the exit code from running the function

api/porch/v1alpha1/types.go

@@ -202,11 +202,6 @@ spec:
                         description: Site is a link to page with information about
                           the package.
                         type: string
-                      subpackage:
-                        description: |-
-                          Subpackage is a directory path to a subpackage to initialize.
-                          If unspecified, the main package will be initialized.
-                        type: string
                     type: object
                   upgrade:
                     description: Upgrade merges changes from a new upstream version

api/porch/v1alpha1/zz_generated.conversion.go

@@ -22,9 +22,6 @@ package v1alpha2
 // PackageInitSpec defines the package initialization parameters.
 // Used when creating a brand new package from scratch.
 type PackageInitSpec struct {
-	// Subpackage is a directory path to a subpackage to initialize.
-	// If unspecified, the main package will be initialized.
-	Subpackage string `json:"subpackage,omitempty"`
 	// Description is a short description of the package.
 	Description string `json:"description,omitempty"`
 	// Keywords is a list of keywords describing the package.

api/porch/v1alpha2/porch.kpt.dev_packagerevisions.yaml

@@ -544,11 +544,8 @@ spec:
                                       type: object
                                     type: array
                                   stderr:
-                                    description: |-
-                                      Enable this once test harness supports filepath based assertions.
-                                      Pkg is OS specific Absolute path to the package.
-                                      Pkg string `yaml:"pkg,omitempty"`
-                                      Stderr is the content in function stderr
+                                    description: Stderr is the content in function
+                                      stderr
                                     type: string
                                 required:
                                 - exitCode

api/porch/v1alpha2/source_types.go

@@ -67,9 +67,6 @@ func initPackage(ctx context.Context, pkgName string, spec *porchv1alpha2.Packag
 	fs := filesys.MakeFsInMemory()
 	pkgPath := "/"
 
-	if spec.Subpackage != "" {
-		pkgPath = "/" + spec.Subpackage
-	}
 	if err := fs.Mkdir(pkgPath); err != nil {
 		return nil, err
 	}

controllers/config/crd/bases/config.porch.kpt.dev_packagevariants.yaml

@@ -52,26 +52,6 @@ func TestApplySourceInit(t *testing.T) {
 	assert.Contains(t, resources["Kptfile"], "a test package")
 }
 
-func TestApplySourceInitWithSubpackage(t *testing.T) {
-	r := &PackageRevisionReconciler{}
-	pr := &porchv1alpha2.PackageRevision{
-		Spec: porchv1alpha2.PackageRevisionSpec{
-			PackageName: "test-pkg",
-			Source: &porchv1alpha2.PackageSource{
-				Init: &porchv1alpha2.PackageInitSpec{
-					Subpackage:  "sub/dir",
-					Description: "subpkg",
-				},
-			},
-		},
-	}
-
-	resources, source, err := r.applySource(context.Background(), pr)
-	require.NoError(t, err)
-	assert.Equal(t, "init", source)
-	assert.Contains(t, resources, "sub/dir/Kptfile")
-}
-
 func TestApplySourceSkipsWhenAlreadyCreated(t *testing.T) {
 	r := &PackageRevisionReconciler{}
 	pr := &porchv1alpha2.PackageRevision{
@@ -639,7 +619,6 @@ func TestApplySourceCloneIdempotent(t *testing.T) {
 	assert.Empty(t, source)
 }
 
-
 func TestApplySourceUpgrade(t *testing.T) {
 	ctx := context.Background()
 

controllers/packagerevisions/pkg/controllers/packagerevision/source.go

@@ -192,7 +192,6 @@ _Appears in:_
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
-| `subpackage` _string_ | `Subpackage` is a directory path to a subpackage to initialize. If unspecified, the main package will be initialized. |  |  |
 | `description` _string_ | `Description` is a short description of the package. |  |  |
 | `keywords` _string array_ | `Keywords` is a list of keywords describing the package. |  |  |
 | `site` _string_ | `Site` is a link to page with information about the package. |  |  |