Merge "Remove getters/setters of AirshipCTLSettings"

cmd/cluster/cluster_test.go

@@ -23,9 +23,10 @@ import (
 )
 
 func TestNewClusterCommandReturn(t *testing.T) {
-	fakeRootSettings := &environment.AirshipCTLSettings{}
+	fakeRootSettings := &environment.AirshipCTLSettings{
-	fakeRootSettings.SetAirshipConfigPath("../../testdata/k8s/config.yaml")
+		AirshipConfigPath: "../../testdata/k8s/config.yaml",
-	fakeRootSettings.SetKubeConfigPath("../../testdata/k8s/kubeconfig.yaml")
+		KubeConfigPath:    "../../testdata/k8s/kubeconfig.yaml",
+	}
 	fakeRootSettings.InitConfig()
 
 	tests := []*testutil.CmdTest{

cmd/config/get_authinfo.go

@@ -46,7 +46,7 @@ func NewCmdConfigGetAuthInfo(rootSettings *environment.AirshipCTLSettings) *cobr
 			if len(args) == 1 {
 				o.Name = args[0]
 			}
-			return config.RunGetAuthInfo(o, cmd.OutOrStdout(), rootSettings.Config())
+			return config.RunGetAuthInfo(o, cmd.OutOrStdout(), rootSettings.Config)
 		},
 	}
 

cmd/config/get_authinfo_test.go

@@ -36,17 +36,16 @@ const (
 )
 
 func TestGetAuthInfoCmd(t *testing.T) {
-	conf := &config.Config{
+	settings := &environment.AirshipCTLSettings{
+		Config: &config.Config{
 			AuthInfos: map[string]*config.AuthInfo{
 				fooAuthInfo: getTestAuthInfo(),
 				barAuthInfo: getTestAuthInfo(),
 				bazAuthInfo: getTestAuthInfo(),
 			},
+		},
 	}
 
-	settings := &environment.AirshipCTLSettings{}
-	settings.SetConfig(conf)
-
 	cmdTests := []*testutil.CmdTest{
 		{
 			Name:    "get-credentials",
@@ -80,8 +79,7 @@ func TestGetAuthInfoCmd(t *testing.T) {
 }
 
 func TestNoAuthInfosGetAuthInfoCmd(t *testing.T) {
-	settings := &environment.AirshipCTLSettings{}
+	settings := &environment.AirshipCTLSettings{Config: new(config.Config)}
-	settings.SetConfig(&config.Config{})
 	cmdTest := &testutil.CmdTest{
 		Name:    "no-credentials",
 		CmdLine: "",

cmd/config/get_cluster.go

@@ -53,7 +53,7 @@ func NewCmdConfigGetCluster(rootSettings *environment.AirshipCTLSettings) *cobra
 				return err
 			}
 
-			return config.RunGetCluster(o, cmd.OutOrStdout(), rootSettings.Config())
+			return config.RunGetCluster(o, cmd.OutOrStdout(), rootSettings.Config)
 		},
 	}
 

cmd/config/get_cluster_test.go

@@ -39,7 +39,8 @@ const (
 )
 
 func TestGetClusterCmd(t *testing.T) {
-	conf := &config.Config{
+	settings := &environment.AirshipCTLSettings{
+		Config: &config.Config{
 			Clusters: map[string]*config.ClusterPurpose{
 				fooCluster: {
 					ClusterTypes: map[string]*config.Cluster{
@@ -60,11 +61,9 @@ func TestGetClusterCmd(t *testing.T) {
 					},
 				},
 			},
+		},
 	}
 
-	settings := &environment.AirshipCTLSettings{}
-	settings.SetConfig(conf)
-
 	cmdTests := []*testutil.CmdTest{
 		{
 			Name:    "get-ephemeral",
@@ -121,8 +120,7 @@ func TestGetClusterCmd(t *testing.T) {
 }
 
 func TestNoClustersGetClusterCmd(t *testing.T) {
-	settings := &environment.AirshipCTLSettings{}
+	settings := &environment.AirshipCTLSettings{Config: new(config.Config)}
-	settings.SetConfig(&config.Config{})
 	cmdTest := &testutil.CmdTest{
 		Name:    "no-clusters",
 		CmdLine: "",

cmd/config/get_context.go

@@ -54,7 +54,7 @@ func NewCmdConfigGetContext(rootSettings *environment.AirshipCTLSettings) *cobra
 			if len(args) == 1 {
 				o.Name = args[0]
 			}
-			return config.RunGetContext(o, cmd.OutOrStdout(), rootSettings.Config())
+			return config.RunGetContext(o, cmd.OutOrStdout(), rootSettings.Config)
 		},
 	}
 

cmd/config/get_context_test.go

@@ -38,18 +38,17 @@ const (
 )
 
 func TestGetContextCmd(t *testing.T) {
-	conf := &config.Config{
+	settings := &environment.AirshipCTLSettings{
+		Config: &config.Config{
 			Contexts: map[string]*config.Context{
 				fooContext: getNamedTestContext(fooContext),
 				barContext: getNamedTestContext(barContext),
 				bazContext: getNamedTestContext(bazContext),
 			},
 			CurrentContext: bazContext,
+		},
 	}
 
-	settings := &environment.AirshipCTLSettings{}
-	settings.SetConfig(conf)
-
 	cmdTests := []*testutil.CmdTest{
 		{
 			Name:    "get-context",
@@ -88,8 +87,7 @@ found in the configuration.`, missingContext),
 }
 
 func TestNoContextsGetContextCmd(t *testing.T) {
-	settings := &environment.AirshipCTLSettings{}
+	settings := &environment.AirshipCTLSettings{Config: new(config.Config)}
-	settings.SetConfig(&config.Config{})
 	cmdTest := &testutil.CmdTest{
 		Name:    "no-contexts",
 		CmdLine: "",

cmd/config/init.go

@@ -32,14 +32,7 @@ func NewCmdConfigInit(rootSettings *environment.AirshipCTLSettings) *cobra.Comma
 		Use:   "init",
 		Short: configInitLong,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			c := rootSettings.Config()
+			return rootSettings.Config.PersistConfig()
-
-			err := c.PersistConfig()
-			if err != nil {
-				return err
-			}
-
-			return nil
 		},
 	}
 

cmd/config/set_authinfo.go

@@ -61,7 +61,7 @@ func NewCmdConfigSetAuthInfo(rootSettings *environment.AirshipCTLSettings) *cobr
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.Name = args[0]
-			modified, err := config.RunSetAuthInfo(o, rootSettings.Config(), true)
+			modified, err := config.RunSetAuthInfo(o, rootSettings.Config, true)
 			if err != nil {
 				return err
 			}

cmd/config/set_authinfo_test.go

@@ -88,12 +88,11 @@ func initInputConfig(t *testing.T) (given *config.Config, cleanup func(*testing.
 }
 
 func (test setAuthInfoTest) run(t *testing.T) {
-	settings := &environment.AirshipCTLSettings{}
+	settings := &environment.AirshipCTLSettings{Config: test.inputConfig}
-	settings.SetConfig(test.inputConfig)
 	test.cmdTest.Cmd = cmd.NewCmdConfigSetAuthInfo(settings)
 	testutil.RunTest(t, test.cmdTest)
 
-	afterRunConf := settings.Config()
+	afterRunConf := settings.Config
 	// Find the AuthInfo Created or Modified
 	afterRunAuthInfo, err := afterRunConf.GetAuthInfo(test.userName)
 	require.NoError(t, err)

cmd/config/set_cluster.go

@@ -66,7 +66,7 @@ func NewCmdConfigSetCluster(rootSettings *environment.AirshipCTLSettings) *cobra
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.Name = args[0]
-			modified, err := config.RunSetCluster(o, rootSettings.Config(), true)
+			modified, err := config.RunSetCluster(o, rootSettings.Config, true)
 			if err != nil {
 				return err
 			}

cmd/config/set_cluster_test.go

@@ -201,10 +201,7 @@ func TestModifyCluster(t *testing.T) {
 }
 
 func (test setClusterTest) run(t *testing.T) {
-	// Get the Environment
+	settings := &environment.AirshipCTLSettings{Config: test.givenConfig}
-	settings := &environment.AirshipCTLSettings{}
-	settings.SetConfig(test.givenConfig)
-
 	buf := bytes.NewBuffer([]byte{})
 
 	cmd := cmd.NewCmdConfigSetCluster(settings)
@@ -219,7 +216,7 @@ func (test setClusterTest) run(t *testing.T) {
 	require.NoErrorf(t, err, "unexpected error executing command: %v, args: %v, flags: %v", err, test.args, test.flags)
 
 	// Loads the Config File that was updated
-	afterRunConf := settings.Config()
+	afterRunConf := settings.Config
 	// Get ClusterType
 	tctypeFlag := cmd.Flag(config.FlagClusterType)
 	require.NotNil(t, tctypeFlag)

cmd/config/set_context.go

@@ -70,7 +70,7 @@ func NewCmdConfigSetContext(rootSettings *environment.AirshipCTLSettings) *cobra
 				return nil
 			}
 
-			modified, err := config.RunSetContext(o, rootSettings.Config(), true)
+			modified, err := config.RunSetContext(o, rootSettings.Config, true)
 
 			if err != nil {
 				return err

cmd/config/set_context_test.go

@@ -127,13 +127,12 @@ func TestSetContext(t *testing.T) {
 
 func (test setContextTest) run(t *testing.T) {
 	// Get the Environment
-	settings := &environment.AirshipCTLSettings{}
+	settings := &environment.AirshipCTLSettings{Config: test.givenConfig}
-	settings.SetConfig(test.givenConfig)
 
 	test.cmdTest.Cmd = cmd.NewCmdConfigSetContext(settings)
 	testutil.RunTest(t, test.cmdTest)
 
-	afterRunConf := settings.Config()
+	afterRunConf := settings.Config
 
 	// Find the Context Created or Modified
 	afterRunContext, err := afterRunConf.GetContext(test.contextName)

cmd/config/use_context.go

@@ -44,7 +44,7 @@ func NewCmdConfigUseContext(rootSettings *environment.AirshipCTLSettings) *cobra
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			contextName := args[0]
-			err := config.RunUseContext(contextName, rootSettings.Config())
+			err := config.RunUseContext(contextName, rootSettings.Config)
 			if err != nil {
 				return err
 			}

cmd/config/use_context_test.go

@@ -26,11 +26,7 @@ import (
 )
 
 func TestConfigUseContext(t *testing.T) {
-	conf := testutil.DummyConfig()
+	settings := &environment.AirshipCTLSettings{Config: testutil.DummyConfig()}
-
-	settings := &environment.AirshipCTLSettings{}
-	settings.SetConfig(conf)
-
 	cmdTests := []*testutil.CmdTest{
 		{
 			Name:    "config-use-context",

cmd/document/pull_test.go

@@ -27,16 +27,16 @@ import (
 )
 
 func getDummyAirshipSettings(t *testing.T) *environment.AirshipCTLSettings {
-	settings := new(environment.AirshipCTLSettings)
+	settings := &environment.AirshipCTLSettings{Config: testutil.DummyConfig()}
-	conf := testutil.DummyConfig()
-	mfst := conf.Manifests["dummy_manifest"]
 
 	err := fixtures.Init()
 	require.NoError(t, err)
 
 	fx := fixtures.Basic().One()
 
-	mfst.Repositories = map[string]*config.Repository{"primary": {
+	mfst := settings.Config.Manifests["dummy_manifest"]
+	mfst.Repositories = map[string]*config.Repository{
+		"primary": {
 			URLString: fx.DotGit().Root(),
 			CheckoutOptions: &config.RepoCheckout{
 				Branch:        "master",
@@ -47,7 +47,6 @@ func getDummyAirshipSettings(t *testing.T) *environment.AirshipCTLSettings {
 			},
 		},
 	}
-	settings.SetConfig(conf)
 	return settings
 }
 

cmd/root_test.go

@@ -82,7 +82,7 @@ func TestFlagLoading(t *testing.T) {
 			err = rootCmd.Execute()
 			require.NoError(t, err)
 
-			assert.Equal(t, settings.AirshipConfigPath(), tt.expected)
+			assert.Equal(t, settings.AirshipConfigPath, tt.expected)
 		})
 	}
 }

pkg/bootstrap/isogen/command.go

@@ -38,7 +38,7 @@ const (
 func GenerateBootstrapIso(settings *environment.AirshipCTLSettings) error {
 	ctx := context.Background()
 
-	globalConf := settings.Config()
+	globalConf := settings.Config
 	if err := globalConf.EnsureComplete(); err != nil {
 		return err
 	}

pkg/cluster/initinfra/infra.go

@@ -64,7 +64,7 @@ func (infra *Infra) Deploy() error {
 		ao.SetPrune(document.InitInfraSelector)
 	}
 
-	globalConf := infra.RootSettings.Config()
+	globalConf := infra.RootSettings.Config
 	if err = globalConf.EnsureComplete(); err != nil {
 		return err
 	}

pkg/cluster/initinfra/infra_test.go

@@ -100,10 +100,9 @@ func TestDeploy(t *testing.T) {
 	}
 }
 
-// MakeNewFakeRootSettings takes kubeconfig path and directory path to fixture dir as argument.
+// makeNewFakeRootSettings takes kubeconfig path and directory path to fixture dir as argument.
 func makeNewFakeRootSettings(t *testing.T, kp string, dir string) *environment.AirshipCTLSettings {
 	t.Helper()
-	rs := &environment.AirshipCTLSettings{}
 
 	akp, err := filepath.Abs(kp)
 	require.NoError(t, err)
@@ -111,9 +110,11 @@ func makeNewFakeRootSettings(t *testing.T, kp string, dir string) *environment.A
 	adir, err := filepath.Abs(dir)
 	require.NoError(t, err)
 
-	rs.SetAirshipConfigPath(adir)
+	settings := &environment.AirshipCTLSettings{
-	rs.SetKubeConfigPath(akp)
+		AirshipConfigPath: adir,
+		KubeConfigPath:    akp,
+	}
 
-	rs.InitConfig()
+	settings.InitConfig()
-	return rs
+	return settings
 }

pkg/document/pull/pull.go

@@ -34,7 +34,7 @@ func (s *Settings) Pull() error {
 
 func (s *Settings) cloneRepositories() error {
 	// Clone main repository
-	currentManifest, err := s.Config().CurrentContextManifest()
+	currentManifest, err := s.Config.CurrentContextManifest()
 	if err != nil {
 		return err
 	}

pkg/document/pull/pull_test.go

@@ -34,12 +34,11 @@ import (
 )
 
 func getDummyPullSettings() *Settings {
-	mockPullSettings := &Settings{
+	return &Settings{
-		AirshipCTLSettings: new(environment.AirshipCTLSettings),
+		AirshipCTLSettings: &environment.AirshipCTLSettings{
+			Config: testutil.DummyConfig(),
+		},
 	}
-	mockConf := testutil.DummyConfig()
-	mockPullSettings.AirshipCTLSettings.SetConfig(mockConf)
-	return mockPullSettings
 }
 
 func TestPull(t *testing.T) {
@@ -48,7 +47,7 @@ func TestPull(t *testing.T) {
 
 	t.Run("cloneRepositories", func(t *testing.T) {
 		dummyPullSettings := getDummyPullSettings()
-		currentManifest, err := dummyPullSettings.Config().CurrentContextManifest()
+		currentManifest, err := dummyPullSettings.Config.CurrentContextManifest()
 		require.NoError(err)
 
 		err = fixtures.Init()
@@ -89,7 +88,7 @@ func TestPull(t *testing.T) {
 
 	t.Run("Pull", func(t *testing.T) {
 		dummyPullSettings := getDummyPullSettings()
-		conf := dummyPullSettings.AirshipCTLSettings.Config()
+		conf := dummyPullSettings.AirshipCTLSettings.Config
 
 		err := fixtures.Init()
 		require.NoError(err)
@@ -109,7 +108,7 @@ func TestPull(t *testing.T) {
 				},
 			},
 		}
-		dummyPullSettings.SetConfig(conf)
+		dummyPullSettings.Config = conf
 
 		tmpDir, cleanup := testutil.TempDir(t, "airshipctlPullTest-")
 		defer cleanup(t)

pkg/environment/settings.go

@@ -30,9 +30,9 @@ import (
 type AirshipCTLSettings struct {
 	// Debug is used for verbose output
 	Debug             bool
-	airshipConfigPath string
+	AirshipConfigPath string
-	kubeConfigPath    string
+	KubeConfigPath    string
-	config            *config.Config
+	Config            *config.Config
 }
 
 // InitFlags adds the default settings flags to cmd
@@ -48,51 +48,27 @@ func (a *AirshipCTLSettings) InitFlags(cmd *cobra.Command) {
 
 	defaultAirshipConfigPath := filepath.Join(defaultAirshipConfigDir, config.AirshipConfig)
 	flags.StringVar(
-		&a.airshipConfigPath,
+		&a.AirshipConfigPath,
 		config.FlagConfigFilePath,
 		"",
 		`Path to file for airshipctl configuration. (default "`+defaultAirshipConfigPath+`")`)
 
 	defaultKubeConfigPath := filepath.Join(defaultAirshipConfigDir, config.AirshipKubeConfig)
 	flags.StringVar(
-		&a.kubeConfigPath,
+		&a.KubeConfigPath,
 		clientcmd.RecommendedConfigPathFlag,
 		"",
 		`Path to kubeconfig associated with airshipctl configuration. (default "`+defaultKubeConfigPath+`")`)
 }
 
-func (a *AirshipCTLSettings) Config() *config.Config {
-	return a.config
-}
-
-func (a *AirshipCTLSettings) SetConfig(conf *config.Config) {
-	a.config = conf
-}
-
-func (a *AirshipCTLSettings) AirshipConfigPath() string {
-	return a.airshipConfigPath
-}
-
-func (a *AirshipCTLSettings) SetAirshipConfigPath(acp string) {
-	a.airshipConfigPath = acp
-}
-
-func (a *AirshipCTLSettings) KubeConfigPath() string {
-	return a.kubeConfigPath
-}
-
-func (a *AirshipCTLSettings) SetKubeConfigPath(kcp string) {
-	a.kubeConfigPath = kcp
-}
-
 // InitConfig - Initializes and loads Config it exists.
 func (a *AirshipCTLSettings) InitConfig() {
-	a.SetConfig(config.NewConfig())
+	a.Config = config.NewConfig()
 
 	a.initAirshipConfigPath()
 	a.initKubeConfigPath()
 
-	err := a.Config().LoadConfig(a.AirshipConfigPath(), a.KubeConfigPath())
+	err := a.Config.LoadConfig(a.AirshipConfigPath, a.KubeConfigPath)
 	if err != nil {
 		// Should stop airshipctl
 		log.Fatal(err)
@@ -101,19 +77,19 @@ func (a *AirshipCTLSettings) InitConfig() {
 
 func (a *AirshipCTLSettings) initAirshipConfigPath() {
 	// The airshipConfigPath may already have been received as a command line argument
-	if a.airshipConfigPath != "" {
+	if a.AirshipConfigPath != "" {
 		return
 	}
 
 	// Otherwise, we can check if we got the path via ENVIRONMENT variable
-	a.airshipConfigPath = os.Getenv(config.AirshipConfigEnv)
+	a.AirshipConfigPath = os.Getenv(config.AirshipConfigEnv)
-	if a.airshipConfigPath != "" {
+	if a.AirshipConfigPath != "" {
 		return
 	}
 
 	// Otherwise, we'll try putting it in the home directory
 	homeDir := userHomeDir()
-	a.airshipConfigPath = filepath.Join(homeDir, config.AirshipConfigDir, config.AirshipConfig)
+	a.AirshipConfigPath = filepath.Join(homeDir, config.AirshipConfigDir, config.AirshipConfig)
 }
 
 func (a *AirshipCTLSettings) initKubeConfigPath() {
@@ -125,19 +101,19 @@ func (a *AirshipCTLSettings) initKubeConfigPath() {
 	// explicitly want airshipctl to use it.
 
 	// The kubeConfigPath may already have been received as a command line argument
-	if a.kubeConfigPath != "" {
+	if a.KubeConfigPath != "" {
 		return
 	}
 
 	// Otherwise, we can check if we got the path via ENVIRONMENT variable
-	a.kubeConfigPath = os.Getenv(config.AirshipKubeConfigEnv)
+	a.KubeConfigPath = os.Getenv(config.AirshipKubeConfigEnv)
-	if a.kubeConfigPath != "" {
+	if a.KubeConfigPath != "" {
 		return
 	}
 
 	// Otherwise, we'll try putting it in the home directory
 	homeDir := userHomeDir()
-	a.kubeConfigPath = filepath.Join(homeDir, config.AirshipConfigDir, config.AirshipKubeConfig)
+	a.KubeConfigPath = filepath.Join(homeDir, config.AirshipConfigDir, config.AirshipKubeConfig)
 }
 
 // userHomeDir is a utility function that wraps os.UserHomeDir and returns no

pkg/environment/settings_test.go

@@ -48,8 +48,8 @@ func TestInitConfig(t *testing.T) {
 		expectedKubeConfig := filepath.Join(testDir, config.AirshipConfigDir, config.AirshipKubeConfig)
 
 		testSettings.InitConfig()
-		assert.Equal(t, expectedAirshipConfig, testSettings.AirshipConfigPath())
+		assert.Equal(t, expectedAirshipConfig, testSettings.AirshipConfigPath)
-		assert.Equal(t, expectedKubeConfig, testSettings.KubeConfigPath())
+		assert.Equal(t, expectedKubeConfig, testSettings.KubeConfigPath)
 	})
 
 	t.Run("PreferEnvToDefault", func(subTest *testing.T) {
@@ -68,8 +68,8 @@ func TestInitConfig(t *testing.T) {
 		defer os.Unsetenv(config.AirshipKubeConfigEnv)
 
 		testSettings.InitConfig()
-		assert.Equal(t, expectedAirshipConfig, testSettings.AirshipConfigPath())
+		assert.Equal(t, expectedAirshipConfig, testSettings.AirshipConfigPath)
-		assert.Equal(t, expectedKubeConfig, testSettings.KubeConfigPath())
+		assert.Equal(t, expectedKubeConfig, testSettings.KubeConfigPath)
 	})
 
 	t.Run("PreferCmdLineArgToDefault", func(subTest *testing.T) {
@@ -78,17 +78,18 @@ func TestInitConfig(t *testing.T) {
 		defer cleanup(t)
 		defer setHome(testDir)()
 
-		var testSettings AirshipCTLSettings
 		expectedAirshipConfig := filepath.Join(testDir, "airshipCmdLine")
 		expectedKubeConfig := filepath.Join(testDir, "kubeCmdLine")
 
-		testSettings.SetAirshipConfigPath(expectedAirshipConfig)
+		testSettings := AirshipCTLSettings{
-		testSettings.SetKubeConfigPath(expectedKubeConfig)
+			AirshipConfigPath: expectedAirshipConfig,
+			KubeConfigPath:    expectedKubeConfig,
+		}
 
 		// InitConfig should not change any values
 		testSettings.InitConfig()
-		assert.Equal(t, expectedAirshipConfig, testSettings.AirshipConfigPath())
+		assert.Equal(t, expectedAirshipConfig, testSettings.AirshipConfigPath)
-		assert.Equal(t, expectedKubeConfig, testSettings.KubeConfigPath())
+		assert.Equal(t, expectedKubeConfig, testSettings.KubeConfigPath)
 	})
 
 	t.Run("PreferCmdLineArgToEnv", func(subTest *testing.T) {
@@ -97,7 +98,6 @@ func TestInitConfig(t *testing.T) {
 		defer cleanup(t)
 		defer setHome(testDir)()
 
-		var testSettings AirshipCTLSettings
 		expectedAirshipConfig := filepath.Join(testDir, "airshipCmdLine")
 		expectedKubeConfig := filepath.Join(testDir, "kubeCmdLine")
 
@@ -111,12 +111,14 @@ func TestInitConfig(t *testing.T) {
 		defer os.Unsetenv(config.AirshipConfigEnv)
 		defer os.Unsetenv(config.AirshipKubeConfigEnv)
 
-		testSettings.SetAirshipConfigPath(expectedAirshipConfig)
+		testSettings := AirshipCTLSettings{
-		testSettings.SetKubeConfigPath(expectedKubeConfig)
+			AirshipConfigPath: expectedAirshipConfig,
+			KubeConfigPath:    expectedKubeConfig,
+		}
 
 		testSettings.InitConfig()
-		assert.Equal(t, expectedAirshipConfig, testSettings.AirshipConfigPath())
+		assert.Equal(t, expectedAirshipConfig, testSettings.AirshipConfigPath)
-		assert.Equal(t, expectedKubeConfig, testSettings.KubeConfigPath())
+		assert.Equal(t, expectedKubeConfig, testSettings.KubeConfigPath)
 	})
 }
 

pkg/k8s/client/client.go

@@ -55,9 +55,9 @@ func NewClient(settings *environment.AirshipCTLSettings) (Interface, error) {
 	client := new(Client)
 	var err error
 
-	f := k8sutils.FactoryFromKubeConfigPath(settings.KubeConfigPath())
+	f := k8sutils.FactoryFromKubeConfigPath(settings.KubeConfigPath)
 
-	pathToBufferDir := filepath.Dir(settings.AirshipConfigPath())
+	pathToBufferDir := filepath.Dir(settings.AirshipConfigPath)
 	client.kubectl = kubectl.NewKubectl(f).WithBufferDir(pathToBufferDir)
 
 	client.clientSet, err = f.KubernetesClientSet()

pkg/k8s/client/client_test.go

@@ -32,10 +32,8 @@ const (
 )
 
 func TestNewClient(t *testing.T) {
-	settings := &environment.AirshipCTLSettings{}
 	conf, cleanup := testutil.InitConfig(t)
 	defer cleanup(t)
-	settings.SetConfig(conf)
 
 	akp, err := filepath.Abs(kubeconfigPath)
 	require.NoError(t, err)
@@ -43,8 +41,11 @@ func TestNewClient(t *testing.T) {
 	adir, err := filepath.Abs(airshipConfigDir)
 	require.NoError(t, err)
 
-	settings.SetAirshipConfigPath(adir)
+	settings := &environment.AirshipCTLSettings{
-	settings.SetKubeConfigPath(akp)
+		Config:            conf,
+		AirshipConfigPath: adir,
+		KubeConfigPath:    akp,
+	}
 
 	client, err := client.NewClient(settings)
 	assert.NoError(t, err)

pkg/remote/remote_direct.go

@@ -91,7 +91,7 @@ func (a *Adapter) configureClient(remoteURL string) error {
 
 // initializeAdapter retrieves the remote direct configuration defined in the Airship configuration file.
 func (a *Adapter) initializeAdapter(settings *environment.AirshipCTLSettings) error {
-	cfg := settings.Config()
+	cfg := settings.Config
 	bootstrapSettings, err := cfg.CurrentContextBootstrapInfo()
 	if err != nil {
 		return err

pkg/remote/remote_direct_test.go

@@ -35,12 +35,11 @@ const (
 
 func initSettings(t *testing.T, rd *config.RemoteDirect, testdata string) *environment.AirshipCTLSettings {
 	t.Helper()
-	settings := &environment.AirshipCTLSettings{}
+	settings := &environment.AirshipCTLSettings{Config: testutil.DummyConfig()}
-	settings.SetConfig(testutil.DummyConfig())
+	bi, err := settings.Config.CurrentContextBootstrapInfo()
-	bi, err := settings.Config().CurrentContextBootstrapInfo()
 	require.NoError(t, err)
 	bi.RemoteDirect = rd
-	cm, err := settings.Config().CurrentContextManifest()
+	cm, err := settings.Config.CurrentContextManifest()
 	require.NoError(t, err)
 	cm.TargetPath = "testdata/" + testdata
 	return settings