refactoring flux config

pkg/bootstrap/bootstrap.go

@@ -30,7 +30,6 @@ func Bootstrap(config steps.Config) error {
 
 	// TODO have a single workflow source of truth and documented in https://docs.gitops.weave.works/docs/0.33.0/enterprise/getting-started/install-enterprise/
 	var workflow = []steps.BootstrapStep{
-		steps.VerifyFluxInstallation,
 		steps.NewAskBootstrapFluxStep(config),
 		repositoryConfig,
 		steps.NewBootstrapFlux(config),

pkg/bootstrap/steps/ask_bootstrap_flux.go

@@ -59,5 +59,5 @@ func askBootstrapFlux(input []StepInput, c *Config) ([]StepOutput, error) {
 
 // canAskForGitConfig if fluxInstallation is false, then can ask for git config
 func canAskForFluxBootstrap(input []StepInput, c *Config) bool {
-	return !c.FluxInstalled
+	return !c.FluxConfig.IsInstalled
 }

pkg/bootstrap/steps/ask_bootstrap_flux_test.go

@@ -18,7 +18,9 @@ func TestAskBootstrapFlux(t *testing.T) {
 			name:  "check with flux installed",
 			input: []StepInput{},
 			config: &Config{
-				FluxInstalled: true,
+				FluxConfig: FluxConfig{
+					IsInstalled: true,
+				},
 			},
 			err:    false,
 			canAsk: false,
@@ -32,7 +34,9 @@ func TestAskBootstrapFlux(t *testing.T) {
 				},
 			},
 			config: &Config{
-				FluxInstalled: false,
+				FluxConfig: FluxConfig{
+					IsInstalled: false,
+				},
 			},
 			err:    true,
 			canAsk: true,
@@ -46,7 +50,9 @@ func TestAskBootstrapFlux(t *testing.T) {
 				},
 			},
 			config: &Config{
-				FluxInstalled: false,
+				FluxConfig: FluxConfig{
+					IsInstalled: false,
+				},
 			},
 			err:    false,
 			canAsk: true,
@@ -55,7 +61,9 @@ func TestAskBootstrapFlux(t *testing.T) {
 			name:  "check with silent mode and bootstrap flux flag available",
 			input: []StepInput{},
 			config: &Config{
-				FluxInstalled: false,
+				FluxConfig: FluxConfig{
+					IsInstalled: false,
+				},
 				BootstrapFlux: true,
 				ModesConfig: ModesConfig{
 					Silent: true,
@@ -73,7 +81,9 @@ func TestAskBootstrapFlux(t *testing.T) {
 				},
 			},
 			config: &Config{
-				FluxInstalled: false,
+				FluxConfig: FluxConfig{
+					IsInstalled: false,
+				},
 				ModesConfig: ModesConfig{
 					Export: true,
 				},

pkg/bootstrap/steps/bootstrap_flux_test.go

@@ -29,7 +29,9 @@ func TestConfigureFluxCreds(t *testing.T) {
 				},
 			},
 			config: &Config{
-				FluxInstalled: true,
+				FluxConfig: FluxConfig{
+					IsInstalled: true,
+				},
 				GitRepository: GitRepositoryConfig{
 					Scheme: sshScheme,
 				},
@@ -51,7 +53,9 @@ func TestConfigureFluxCreds(t *testing.T) {
 				},
 			},
 			config: &Config{
-				FluxInstalled: true,
+				FluxConfig: FluxConfig{
+					IsInstalled: true,
+				},
 				GitRepository: GitRepositoryConfig{
 					Scheme: httpsScheme,
 				},

pkg/bootstrap/steps/bootstrap_git_repo_config.go

@@ -127,7 +127,7 @@ func NewGitRepositoryConfigStep(config GitRepositoryConfig) BootstrapStep {
 
 func createGitRepositoryConfig(input []StepInput, c *Config) ([]StepOutput, error) {
 
-	if c.FluxInstalled {
+	if c.FluxConfig.IsInstalled {
 		return []StepOutput{}, nil
 	}
 

pkg/bootstrap/steps/common_tests.go

@@ -52,7 +52,7 @@ func MakeTestConfig(t *testing.T, config Config, objects ...runtime.Object) Conf
 		ModesConfig:             config.ModesConfig,
 		ClusterUserAuth:         config.ClusterUserAuth,
 		GitRepository:           config.GitRepository,
-		FluxInstalled:           config.FluxInstalled,
+		FluxConfig:              config.FluxConfig,
 		PrivateKeyPath:          config.PrivateKeyPath,
 		PrivateKeyPassword:      config.PrivateKeyPassword,
 		GitUsername:             config.GitUsername,

pkg/bootstrap/steps/config.go

@@ -175,21 +175,17 @@ type Config struct {
 	GitClient utils.GitClient
 	// TODO move me to a better package
 	FluxClient utils.FluxClient
-
-	Logger logger.Logger
-
+	Logger     logger.Logger
 	// InReader holds the stream to read input from
 	InReader io.Reader
-
 	// OutWriter holds the output to write to
-	OutWriter io.Writer
-
-	WgeConfig WgeConfig
+	OutWriter  io.Writer
+	FluxConfig FluxConfig
+	WgeConfig  WgeConfig
 
 	ClusterUserAuth ClusterUserAuthConfig
 	ModesConfig     ModesConfig
 
-	FluxInstalled      bool
 	PrivateKeyPath     string
 	PrivateKeyPassword string
 
@@ -252,12 +248,12 @@ func (cb *ConfigBuilder) Build() (Config, error) {
 		return Config{}, fmt.Errorf("error creating git repository configuration: %v", err)
 	}
 
-	wgeConfig, err := NewWgeConfig(cb.wgeVersion, kubeHttp.Client, fluxConfig.FluxInstalled)
+	wgeConfig, err := NewWgeConfig(cb.wgeVersion, kubeHttp.Client, fluxConfig.IsInstalled)
 	if err != nil {
 		return Config{}, fmt.Errorf("cannot create WGE configuration: %v", err)
 	}
 
-	componentsExtraConfig, err := NewInstallExtraComponentsConfig(cb.componentsExtra, kubeHttp.Client, fluxConfig.FluxInstalled)
+	componentsExtraConfig, err := NewInstallExtraComponentsConfig(cb.componentsExtra, kubeHttp.Client, fluxConfig.IsInstalled)
 	if err != nil {
 		return Config{}, fmt.Errorf("cannot create components extra configuration: %v", err)
 	}
@@ -288,6 +284,7 @@ func (cb *ConfigBuilder) Build() (Config, error) {
 		ClientSecret:            cb.clientSecret,
 		PromptedForDiscoveryURL: cb.PromptedForDiscoveryURL,
 		ComponentsExtra:         componentsExtraConfig,
+		FluxConfig:              fluxConfig,
 		BootstrapFlux:           cb.bootstrapFlux,
 	}, nil
 

pkg/bootstrap/steps/flux.go

@@ -25,8 +25,8 @@ type FluxConfig struct {
 	Url string
 	// Scheme flux-system git repository scheme
 	Scheme string
-	// FluxInstalled indicates whether flux is already installed
-	FluxInstalled bool
+	// IsInstalled indicates whether flux is already installed
+	IsInstalled bool
 }
 
 // NewFluxConfig creates a Flux configuration out of the existing cluster
@@ -38,7 +38,7 @@ func NewFluxConfig(logger logger.Logger, client k8s_client.Client) (FluxConfig,
 	if err != nil {
 		if strings.Contains(string(out), "customresourcedefinitions.apiextensions.k8s.io \"gitrepositories.source.toolkit.fluxcd.io\" not found") {
 			return FluxConfig{
-				FluxInstalled: false,
+				IsInstalled: false,
 			}, nil
 		}
 		return FluxConfig{}, fmt.Errorf("flux installed error: %v. %s", string(out), fluxRecoverMsg)
@@ -65,9 +65,9 @@ func NewFluxConfig(logger logger.Logger, client k8s_client.Client) (FluxConfig,
 	logger.Successf("detected git scheme: %s", scheme)
 
 	return FluxConfig{
-		Url:           repoUrl,
-		Scheme:        scheme,
-		FluxInstalled: true,
+		Url:         repoUrl,
+		Scheme:      scheme,
+		IsInstalled: true,
 	}, nil
 }
 

pkg/bootstrap/utils/flux_test.go

@@ -186,17 +186,16 @@ func TestGetHelmReleaseProperty(t *testing.T) {
 			},
 		},
 		{
-			name:        "should return err if helm release CRD does not exist",
+			name:        "should return err if helm release not found",
 			objects:     []runtime.Object{},
 			property:    "domain",
-			expectedOut: "testdomain.com",
+			expectedOut: "",
 			wantErr: func(t tassert.TestingT, err error, i ...interface{}) bool {
 				tassert.Error(t, err)
-				tassert.Contains(t, err.Error(), "invalid repository scheme")
+				tassert.Contains(t, err.Error(), "helmreleases.helm.toolkit.fluxcd.io \"wego\" not found")
 				return true
 			},
 		},
-
 		{
 			name: "should return value for supported property 'version'",
 			objects: []runtime.Object{
@@ -222,6 +221,7 @@ func TestGetHelmReleaseProperty(t *testing.T) {
 			prop, err := GetHelmReleaseProperty(client, "wego", "flux-system", tt.property)
 			if tt.wantErr != nil {
 				tt.wantErr(t, err, "unexpected error ")
+				return
 			}
 			assert.Equal(t, tt.expectedOut, prop, "invalid property")
 		})