Merge pull request #9 from liornoy/specify-static-entries-namespace

Specify static entries namespace

README.md

@@ -32,7 +32,7 @@ Examples are available in the `example-custom-entries` files.
 The following environment variables are used to configure:
 ```
 FORMAT (csv/json/yaml)
-CLUSTER_ENV (baremetal/aws)
+CLUSTER_ENV (baremetal/cloud)
 DEST_DIR (path to the directory containing the artifacts)
 DEPLOYMENT (mno/sno)
 CUSTOM_ENTRIES_PATH (path to the file containing custom entries to add to the matrix)

cmd/main.go

@@ -33,7 +33,7 @@ func main() {
 
 	flag.StringVar(&destDir, "destDir", "communication-matrix", "Output files dir")
 	flag.StringVar(&format, "format", "csv", "Desired format (json,yaml,csv)")
-	flag.StringVar(&envStr, "env", "baremetal", "Cluster environment (baremetal/aws)")
+	flag.StringVar(&envStr, "env", "baremetal", "Cluster environment (baremetal/cloud)")
 	flag.StringVar(&deploymentStr, "deployment", "mno", "Deployment type (mno/sno)")
 	flag.StringVar(&customEntriesPath, "customEntriesPath", "", "Add custom entries from a file to the matrix")
 	flag.StringVar(&customEntriesFormat, "customEntriesFormat", "", "Set the format of the custom entries file (json,yaml,csv)")
@@ -60,8 +60,8 @@ func main() {
 	switch envStr {
 	case "baremetal":
 		env = commatrix.Baremetal
-	case "aws":
-		env = commatrix.AWS
+	case "cloud":
+		env = commatrix.Cloud
 	default:
 		panic(fmt.Sprintf("invalid cluster environment: %s", envStr))
 	}

commatrix/commatrix.go

@@ -21,7 +21,7 @@ type Env int
 
 const (
 	Baremetal Env = iota
-	AWS
+	Cloud
 )
 
 type Deployment int
@@ -125,12 +125,12 @@ func getStaticEntries(e Env, d Deployment) ([]types.ComDetails, error) {
 			break
 		}
 		comDetails = append(comDetails, baremetalStaticEntriesWorker...)
-	case AWS:
-		comDetails = append(comDetails, awsCloudStaticEntriesMaster...)
+	case Cloud:
+		comDetails = append(comDetails, cloudStaticEntriesMaster...)
 		if d == SNO {
 			break
 		}
-		comDetails = append(comDetails, awsCloudStaticEntriesWorker...)
+		comDetails = append(comDetails, cloudStaticEntriesWorker...)
 	default:
 		return nil, fmt.Errorf("invalid value for cluster environment")
 	}