rename CloudInitSettingsSource -> VsphereGuestInfoSettingsSource

per PR feedback

Author: julian-hj

infrastructure/settings_source_factory.go

@@ -64,9 +64,9 @@ type CDROMSourceOptions struct {
 
 func (o CDROMSourceOptions) sourceOptionsInterface() {}
 
-type CloudInitSourceOptions struct{}
+type VsphereGuestInfoSourceOptions struct{}
 
-func (o CloudInitSourceOptions) sourceOptionsInterface() {}
+func (o VsphereGuestInfoSourceOptions) sourceOptionsInterface() {}
 
 type InstanceMetadataSourceOptions struct {
 	URI          string
@@ -139,8 +139,8 @@ func (f SettingsSourceFactory) buildWithoutRegistry() (boshsettings.Source, erro
 				f.logger,
 			)
 
-		case CloudInitSourceOptions:
-			settingsSource = NewCloudInitSettingsSource(
+		case VsphereGuestInfoSourceOptions:
+			settingsSource = NewVsphereGuestInfoSettingsSource(
 				f.platform,
 				f.logger,
 			)
@@ -195,8 +195,8 @@ func (s *SourceOptionsSlice) UnmarshalJSON(data []byte) error {
 				var o CDROMSourceOptions
 				err, opts = mapstruc.Decode(m, &o), o
 
-			case optType == "CloudInit":
-				var o CloudInitSourceOptions
+			case optType == "VsphereGuestInfo":
+				var o VsphereGuestInfoSourceOptions
 				err, opts = mapstruc.Decode(m, &o), o
 
 			default:

…rastructure/cloudinit_settings_source.go …re/vsphere_guest_info_settings_source.goinfrastructure/cloudinit_settings_source.go renamed to infrastructure/vsphere_guest_info_settings_source.go infrastructure/cloudinit_settings_source.go renamed to infrastructure/vsphere_guest_info_settings_source.go

@@ -15,31 +15,31 @@ import (
 	boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings"
 )
 
-type CloudInitSettingsSource struct {
+type VsphereGuestInfoSettingsSource struct {
 	platform  boshplatform.Platform
 	cmdRunner boshsys.CmdRunner
 
 	logTag string
 	logger boshlog.Logger
 }
 
-func NewCloudInitSettingsSource(
+func NewVsphereGuestInfoSettingsSource(
 	platform boshplatform.Platform,
 	logger boshlog.Logger,
-) *CloudInitSettingsSource {
-	return &CloudInitSettingsSource{
+) *VsphereGuestInfoSettingsSource {
+	return &VsphereGuestInfoSettingsSource{
 		platform:  platform,
 		cmdRunner: platform.GetRunner(),
-		logTag:    "CloudInitSettingsSource",
+		logTag:    "VsphereGuestInfoSettingsSource",
 		logger:    logger,
 	}
 }
 
-func (s CloudInitSettingsSource) PublicSSHKeyForUsername(string) (string, error) {
+func (s VsphereGuestInfoSettingsSource) PublicSSHKeyForUsername(string) (string, error) {
 	return "", nil
 }
 
-func (s *CloudInitSettingsSource) Settings() (boshsettings.Settings, error) {
+func (s *VsphereGuestInfoSettingsSource) Settings() (boshsettings.Settings, error) {
 	var settings boshsettings.Settings
 
 	// Try to get settings data from vmware-rpctool first, then fallback to vmtoolsd

…ucture/cloudinit_settings_source_test.go …phere_guest_info_settings_source_test.goinfrastructure/cloudinit_settings_source_test.go renamed to infrastructure/vsphere_guest_info_settings_source_test.go infrastructure/cloudinit_settings_source_test.go renamed to infrastructure/vsphere_guest_info_settings_source_test.go

@@ -18,11 +18,11 @@ import (
 	boshsettings "github.com/cloudfoundry/bosh-agent/v2/settings"
 )
 
-var _ = Describe("CloudInitSettingsSource", func() {
+var _ = Describe("VsphereGuestInfoSettingsSource", func() {
 	var (
 		platform        *platformfakes.FakePlatform
 		cmdRunner       *fakes.FakeCmdRunner
-		source          *CloudInitSettingsSource
+		source          *VsphereGuestInfoSettingsSource
 		settings        boshsettings.Settings
 		encodedSettings string
 	)
@@ -32,7 +32,7 @@ var _ = Describe("CloudInitSettingsSource", func() {
 		cmdRunner = fakes.NewFakeCmdRunner()
 		platform.GetRunnerReturns(cmdRunner)
 		logger := logger.NewLogger(logger.LevelNone)
-		source = NewCloudInitSettingsSource(platform, logger)
+		source = NewVsphereGuestInfoSettingsSource(platform, logger)
 		settings = boshsettings.Settings{AgentID: "123"}
 		settingsBytes, err := json.Marshal(settings)
 		Expect(err).ToNot(HaveOccurred())