Move package_parameters.VmdkPackageParameters -> config.VmdkOptions

- remove unused `VmdkPackageParameters.CopyFrom()` method
cloudfoundry · Jul 24, 2024 · b45d53c · b45d53c
1 parent 73560c6
commit b45d53c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 272 deletions.
diff --git a/package_stemcell/config/vmdk_options.go b/package_stemcell/config/vmdk_options.go
@@ -0,0 +1,8 @@
+package config
+
+type VmdkOptions struct {
+	OSVersion string `yaml:"os_version"`
+	OutputDir string `yaml:"output_dir"`
+	Version   string `yaml:"version"`
+	VMDKFile  string `yaml:"vmdk_file"`
+}
diff --git a/package_stemcell/package_parameters/options_suite_test.go b/package_stemcell/package_parameters/options_suite_test.go
diff --git a/package_stemcell/package_parameters/vmdk_package_parameters.go b/package_stemcell/package_parameters/vmdk_package_parameters.go
diff --git a/package_stemcell/package_parameters/vmdk_package_parameters_test.go b/package_stemcell/package_parameters/vmdk_package_parameters_test.go
diff --git a/package_stemcell/packager/factory.go b/package_stemcell/packager/factory.go
@@ -9,7 +9,6 @@ import (
 	"github.com/cloudfoundry/stembuild/iaas_cli"
 	"github.com/cloudfoundry/stembuild/iaas_cli/iaas_clients"
 	"github.com/cloudfoundry/stembuild/package_stemcell/config"
-	"github.com/cloudfoundry/stembuild/package_stemcell/package_parameters"
 )
 
 type Factory struct{}
@@ -39,7 +38,7 @@ func (f *Factory) NewPackager(sourceConfig config.SourceConfig, outputConfig con
 		}, nil
 	case config.VMDK:
 		options :=
-			package_parameters.VmdkPackageParameters{
+			config.VmdkOptions{
 				VMDKFile:  sourceConfig.Vmdk,
 				OSVersion: strings.ToUpper(outputConfig.Os),
 				Version:   outputConfig.StemcellVersion,

diff --git a/package_stemcell/packager/vmdk_packager.go b/package_stemcell/packager/vmdk_packager.go
@@ -16,8 +16,8 @@ import (
 
 	"github.com/cloudfoundry/stembuild/colorlogger"
 	"github.com/cloudfoundry/stembuild/filesystem"
+	"github.com/cloudfoundry/stembuild/package_stemcell/config"
 	"github.com/cloudfoundry/stembuild/package_stemcell/ovftool"
-	"github.com/cloudfoundry/stembuild/package_stemcell/package_parameters"
 	"github.com/cloudfoundry/stembuild/templates"
 )
 
@@ -30,7 +30,7 @@ type VmdkPackager struct {
 	Sha1sum      string
 	tmpdir       string
 	Stop         chan struct{}
-	BuildOptions package_parameters.VmdkPackageParameters
+	BuildOptions config.VmdkOptions
 	Logger       colorlogger.Logger
 }
 

diff --git a/package_stemcell/packager/vmdk_packager_test.go b/package_stemcell/packager/vmdk_packager_test.go
@@ -14,17 +14,17 @@ import (
 
 	"github.com/cloudfoundry/stembuild/colorlogger"
 	mockfilesystem "github.com/cloudfoundry/stembuild/filesystem/mock"
-	"github.com/cloudfoundry/stembuild/package_stemcell/package_parameters"
+	"github.com/cloudfoundry/stembuild/package_stemcell/config"
 	"github.com/cloudfoundry/stembuild/package_stemcell/packager"
 	"github.com/cloudfoundry/stembuild/test/helpers"
 )
 
 var _ = Describe("VmdkPackager", func() {
-	var stembuildConfig package_parameters.VmdkPackageParameters
+	var stembuildConfig config.VmdkOptions
 	var vmdkPackager packager.VmdkPackager
 
 	BeforeEach(func() {
-		stembuildConfig = package_parameters.VmdkPackageParameters{
+		stembuildConfig = config.VmdkOptions{
 			OSVersion: "2012R2",
 			Version:   "1200.1",
 		}