fix: updated infra scope from 'infra' to 'cluster' (#4093)

* fix: updated infra scope from 'infra' to 'cluster' Signed-off-by: Saranya-jena <[email protected]> * fix: updated file path from 'infra' to 'cluster' Signed-off-by: Saranya-jena <[email protected]> * updated mongo query field Signed-off-by: Saranya-jena <[email protected]> * added constants for infra scope Signed-off-by: Saranya-jena <[email protected]> --------- Signed-off-by: Saranya-jena <[email protected]>
litmuschaos · Jul 19, 2023 · da2ab7e · da2ab7e
1 parent 20f1ba2
commit da2ab7e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/chaoscenter/authentication/pkg/project/repository.go b/chaoscenter/authentication/pkg/project/repository.go
@@ -81,7 +81,7 @@ func (r repository) GetProjectsByUserID(userID string, isOwner bool) ([]*entitie
 			}}}
 	} else {
 		query = bson.D{
-			{"removed_at", ""},
+			{"is_removed", false},
 			{"members", bson.D{
 				{"$elemMatch", bson.D{
 					{"user_id", userID},

diff --git a/chaoscenter/graphql/server/pkg/chaos_infrastructure/infra_utils.go b/chaoscenter/graphql/server/pkg/chaos_infrastructure/infra_utils.go
@@ -48,22 +48,22 @@ func GetK8sInfraYaml(infra dbChaosInfra.ChaosInfra) ([]byte, error) {
 	config.ServerEndpoint = endpoint
 
 	var scope = utils.Config.ChaosCenterScope
-	if scope == clusterScope && utils.Config.TlsSecretName != "" {
+	if scope == ClusterScope && utils.Config.TlsSecretName != "" {
 		config.TLSCert, err = k8s.GetTLSCert(utils.Config.TlsSecretName)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	if scope == namespaceScope {
+	if scope == NamespaceScope {
 		config.TLSCert = utils.Config.TlsCertB64
 	}
 
 	if !infra.IsRegistered {
 		var respData []byte
-		if infra.InfraScope == "cluster" {
+		if infra.InfraScope == ClusterScope {
 			respData, err = ManifestParser(infra, "manifests/cluster", &config)
-		} else if infra.InfraScope == "namespace" {
+		} else if infra.InfraScope == NamespaceScope {
 			respData, err = ManifestParser(infra, "manifests/namespace", &config)
 		} else {
 			logrus.Error("INFRA_SCOPE env is empty!")

diff --git a/chaoscenter/graphql/server/pkg/chaos_infrastructure/service.go b/chaoscenter/graphql/server/pkg/chaos_infrastructure/service.go
@@ -32,8 +32,8 @@ import (
 const (
 	// CIVersion specifies the version tag used for ci builds
 	CIVersion             = "ci"
-	clusterScope   string = "cluster"
-	namespaceScope string = "namespace"
+	ClusterScope   string = "cluster"
+	NamespaceScope string = "namespace"
 )
 
 type Service interface {
@@ -1062,22 +1062,22 @@ func (in *infraService) GetManifest(token string) ([]byte, int, error) {
 	}
 
 	var scope = utils.Config.ChaosCenterScope
-	if scope == clusterScope && utils.Config.TlsSecretName != "" {
+	if scope == ClusterScope && utils.Config.TlsSecretName != "" {
 		configurations.TLSCert, err = k8s.GetTLSCert(utils.Config.TlsSecretName)
 		if err != nil {
 			return nil, http.StatusInternalServerError, err
 		}
 	}
 
-	if scope == namespaceScope {
+	if scope == NamespaceScope {
 		configurations.TLSCert = utils.Config.TlsCertB64
 	}
 
 	if !reqinfra.IsRegistered {
 		var respData []byte
-		if reqinfra.InfraScope == "infra" {
+		if reqinfra.InfraScope == "cluster" {
 
-			respData, err = ManifestParser(reqinfra, "manifests/infra", &configurations)
+			respData, err = ManifestParser(reqinfra, "manifests/cluster", &configurations)
 		} else if reqinfra.InfraScope == "namespace" {
 			respData, err = ManifestParser(reqinfra, "manifests/namespace", &configurations)
 		} else {
@@ -1112,21 +1112,21 @@ func (in *infraService) GetManifestWithInfraID(infraID string, accessKey string)
 	}
 
 	var scope = utils.Config.ChaosCenterScope
-	if scope == clusterScope && utils.Config.TlsSecretName != "" {
+	if scope == ClusterScope && utils.Config.TlsSecretName != "" {
 		configurations.TLSCert, err = k8s.GetTLSCert(utils.Config.TlsSecretName)
 		if err != nil {
 			return nil, fmt.Errorf("failed to retrieve the tls cert %v", err)
 		}
 	}
 
-	if scope == namespaceScope {
+	if scope == NamespaceScope {
 		configurations.TLSCert = utils.Config.TlsCertB64
 	}
 
 	var respData []byte
-	if reqinfra.InfraScope == clusterScope {
-		respData, err = ManifestParser(reqinfra, "manifests/infra", &configurations)
-	} else if reqinfra.InfraScope == namespaceScope {
+	if reqinfra.InfraScope == ClusterScope {
+		respData, err = ManifestParser(reqinfra, "manifests/cluster", &configurations)
+	} else if reqinfra.InfraScope == NamespaceScope {
 		respData, err = ManifestParser(reqinfra, "manifests/namespace", &configurations)
 	} else {
 		logrus.Error("INFRA_SCOPE env is empty")