Merge pull request #167 from picodata/166-fix_role_naming

Fix incorrect role names when using tabs and spaces in the genin file

.gitignore

@@ -34,6 +34,8 @@ node_modules
 /deploy/terraform.tfstate.backup
 ./*.genin.yml
 ./*.genin.yaml
+!/configs/*.yaml
+!/configs/*.yml
 !/docs/examples/*
 /tests/.*
 .geninstate

configs/cluster.genin.yml

@@ -0,0 +1,73 @@
+---
+# List of replicasets as an array
+topology:
+  - name: router
+    # How many masters we want, by default equal 1
+    replicasets_count: 1
+    # Array of roles for this instance
+    roles:
+      - router
+      - failover-coordinator
+  - name: storage
+    # How many masters we want, by default equal 1
+    replicasets_count: 2
+    # Number of replicas in replicaset, default 0
+    replication_factor: 2
+    # Array of roles for this instance
+    roles:
+      - storage
+# List of regions, datacenters, and servers
+hosts:
+  - name: datacenter-1
+    # Config with arbitrary key-values pairs
+    config:
+      # Specify http port to start counting from
+      http_port: 8081
+      # Specify binary port to start counting from
+      binary_port: 3031
+    # List of regions, datacenters, and servers
+    hosts:
+      - name: server-1
+        # Config with arbitrary key-values pairs
+        config:
+          # Specify http port to start counting from
+          http_port: 8081
+          # Specify binary port to start counting from
+          binary_port: 3031
+          # Host or instance address (maybe IP or URI)
+          address: 192.168.16.11
+      - name: server-2
+        # Config with arbitrary key-values pairs
+        config:
+          # Specify http port to start counting from
+          http_port: 8081
+          # Specify binary port to start counting from
+          binary_port: 3031
+          # Host or instance address (maybe IP or URI)
+          address: 192.168.16.12
+# Failover management options
+failover:
+  # Failover mode (stateful, eventual, disabled)
+  mode: stateful
+  # What is serve failover (stateboard, stateful)
+  state_provider: stateboard
+  # Params for chosen in state_provider failover type
+  stateboard_params:
+    # Uri on which the stateboard will be available
+    uri: "192.168.16.11:4401"
+    # Stateboard password
+    password: password
+# Vars similar to those configured in the cartridge inventory
+vars:
+  # Username under which the ansible will connect to the servers
+  ansible_user: ansible
+  # Ansible user password
+  ansible_password: ansible
+  # Application name
+  cartridge_app_name: myapp
+  # Cookie for connecting to the administrative console of the instances
+  cartridge_cluster_cookie: myapp-cookie
+  # Path to the application package
+  cartridge_package_path: /tmp/myapp.rpm
+  # Indicates if vshard must be bootstrapped on the cluster
+  cartridge_bootstrap_vshard: true

src/main.rs

@@ -10,6 +10,9 @@ const DEFAULT_STATEBOARD_PORT: u16 = 4401;
 const DEFAULT_HTTP_PORT: u16 = 8081;
 const DEFAULT_BINARY_PORT: u16 = 3031;
 
+const DEFAULT_CFG_NAME: &str = "cluster.genin.yml";
+const DEFAULT_CFG: &[u8] = include_bytes!("../configs/cluster.genin.yml");
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     task::run_v2()?;
     Ok(())

src/task.rs

@@ -199,8 +199,6 @@ pub trait Validate {
     type Error: fmt::Debug + ToString;
 
     fn validate(bytes: &[u8]) -> Result<Self::Type, Self::Error>;
-
-    fn whole_block(bytes: &[u8]) -> String;
 }
 
 trait AsError {

src/task/args.rs

@@ -109,25 +109,6 @@ pub(super) fn read() -> ArgMatches {
                             "Used to overwrite the output file, whether \
                             or not it exists.",
                         ),
-                    Arg::new("failover-mode")
-                        .long("failover-mode")
-                        .short('m')
-                        .action(ArgAction::Set)
-                        .default_value("stateful")
-                        .help("(string): failover mode (stateful, eventual, disabled)"),
-                    Arg::new("failover-state-provider")
-                        .long("failover-state-provider")
-                        .short('F')
-                        .action(ArgAction::Set)
-                        .default_value("stateboard")
-                        .help("(string): failover state provider (etcd2, stateboard, disabled)"),
-                    Arg::new("print")
-                        .long("print")
-                        .short('p')
-                        .action(ArgAction::Set)
-                        .default_values(["colorized", "ports"])
-                        .num_args(1..=3)
-                        .help("(list, optional): cluster print output option"),
                     Arg::new("quiet")
                         .long("quiet")
                         .short('q')