Change naming of constants

Changing the naming to the constants
as they began to feel confusing. So now
GitLabFilter stands for `scm_gitlab` and
GitLabSCM stands for 'gitlab' how we configure
the SCM field in the yaml file. The same
for GitHub

Signed-off-by: Martin Dekov <mdekov@vmware.com>

Author: Martin Dekov

.gitignore

@@ -10,4 +10,4 @@ key.pub
 ofc-bootstrap-darwin
 ofc-bootstrap.exe
 init.yaml
-
+main

main

@@ -157,6 +157,7 @@ func process(plan types.Plan) error {
 	}
 
 	if plan.Orchestration == OrchestrationK8s {
+
 		nsErr := createNamespaces()
 		if nsErr != nil {
 			log.Println(nsErr)
@@ -664,10 +665,10 @@ func filterDNSFeature(plan types.Plan) (types.Plan, error) {
 }
 
 func filterGitRepositoryManager(plan types.Plan) (types.Plan, error) {
-	if plan.SCM == types.GitLabManager {
-		plan.Features = append(plan.Features, types.GitLabSCM)
-	} else if plan.SCM == types.GitHubManager {
-		plan.Features = append(plan.Features, types.GitHubSCM)
+	if plan.SCM == types.GitLabSCM {
+		plan.Features = append(plan.Features, types.GitLabFeature)
+	} else if plan.SCM == types.GitHubSCM {
+		plan.Features = append(plan.Features, types.GitHubFeature)
 	} else {
 		return plan, fmt.Errorf("Error unsupported Git repository manager: %s", plan.SCM)
 	}

main.go

@@ -74,27 +74,27 @@ func Test_filterFeatures(t *testing.T) {
 		{
 			title: "Every field which defines populated feature is populated for github",
 			planConfig: types.Plan{
-				SCM: types.GitHubManager,
+				SCM: types.GitHubSCM,
 				TLS: true,
 				TLSConfig: types.TLSConfig{
 					DNSService: types.Route53,
 				},
 				EnableOAuth: true,
 			},
-			expectedFeatures: []string{types.DefaultFeature, types.GitHubSCM, types.Auth, types.Route53DNS},
+			expectedFeatures: []string{types.DefaultFeature, types.GitHubFeature, types.Auth, types.Route53DNS},
 			expectedError:    nil,
 		},
 		{
 			title: "Every field which defines populated feature is populated for gitlab",
 			planConfig: types.Plan{
-				SCM: types.GitLabManager,
+				SCM: types.GitLabSCM,
 				TLS: true,
 				TLSConfig: types.TLSConfig{
 					DNSService: types.Route53,
 				},
 				EnableOAuth: true,
 			},
-			expectedFeatures: []string{types.DefaultFeature, types.GitLabSCM, types.Auth, types.Route53DNS},
+			expectedFeatures: []string{types.DefaultFeature, types.GitLabFeature, types.Auth, types.Route53DNS},
 			expectedError:    nil,
 		},
 		{
@@ -117,7 +117,7 @@ func Test_filterFeatures(t *testing.T) {
 					DNSService: types.Route53,
 				},
 				EnableOAuth: true,
-				SCM:         types.GitHubManager,
+				SCM:         types.GitHubSCM,
 			},
 			expectedFeatures: []string{types.DefaultFeature, types.Auth, types.Route53DNS},
 			expectedError:    nil,
@@ -160,17 +160,17 @@ func Test_filterGitRepositoryManager(t *testing.T) {
 		{
 			title: "SCM field is populated for gitlab",
 			planConfig: types.Plan{
-				SCM: types.GitLabManager,
+				SCM: types.GitLabSCM,
 			},
-			expectedFeature: []string{types.GitLabSCM},
+			expectedFeature: []string{types.GitLabFeature},
 			expectedError:   nil,
 		},
 		{
 			title: "SCM field is populated for github",
 			planConfig: types.Plan{
-				SCM: types.GitHubManager,
+				SCM: types.GitHubSCM,
 			},
-			expectedFeature: []string{types.GitHubSCM},
+			expectedFeature: []string{types.GitHubFeature},
 			expectedError:   nil,
 		},
 		{

main_test.go

@@ -8,10 +8,10 @@ import (
 const (
 	// DefaultFeature filter is for the features which are mandatory
 	DefaultFeature = "default"
-	// GitHubSCM filter enables secrets created with the scm_github filter
-	GitHubSCM = "scm_github"
-	// GitLabSCM filter is the feature which enables secret creation for GitLab
-	GitLabSCM = "scm_gitlab"
+	// GitHubFeature filter enables secrets created with the scm_github filter
+	GitHubFeature = "scm_github"
+	// GitLabFeature filter is the feature which enables secret creation for GitLab
+	GitLabFeature = "scm_gitlab"
 	// Auth filter enables OAuth secret creation
 	Auth = "auth"
 	// GCPDNS filter enables the creation of secrets for Google Cloud Platform DNS when TLS is enabled
@@ -28,9 +28,9 @@ const (
 	// Route53 is the dns_service field in yaml file for Amazon
 	Route53 = "route53"
 	// GitLabManager repository manager name as displayed in the init.yaml file
-	GitLabManager = "gitlab"
+	GitLabSCM = "gitlab"
 	// GitHubManager repository manager name as displayed in the init.yaml file
-	GitHubManager = "github"
+	GitHubSCM = "github"
 )
 
 type Plan struct {