Delete ansible-roles, Switch to Ansible tasks in one playbook

Author: Vic Shóstak

.editorconfig

@@ -12,6 +12,6 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
-[{Dockerfile,Makefile,*.yml,*.yaml}]
+[{Dockerfile,*.yml,*.yaml}]
 indent_style = tab
 indent_size = 2

README.md

@@ -4,7 +4,7 @@
 </h1>
 <p align="center">Create a new production-ready project with <b>backend</b> (Golang), <b>frontend</b> (JavaScript, TypeScript)<br/>and <b>deploy automation</b> (Ansible, Docker) by running one CLI command.<br/><br/>Focus on <b>writing</b> code and <b>thinking</b> of business-logic! The CLI will take care of the rest.</p>
 
-<p align="center"><a href="https://github.com/create-go-app/cli/releases" target="_blank"><img src="https://img.shields.io/badge/version-v1.5.1-blue?style=for-the-badge&logo=none" alt="cli version" /></a>&nbsp;<a href="https://pkg.go.dev/github.com/create-go-app/cli?tab=doc" target="_blank"><img src="https://img.shields.io/badge/Go-1.11+-00ADD8?style=for-the-badge&logo=go" alt="go version" /></a>&nbsp;<a href="https://gocover.io/github.com/create-go-app/cli/pkg/cgapp" target="_blank"><img src="https://img.shields.io/badge/Go_Cover-94%25-success?style=for-the-badge&logo=none" alt="go cover" /></a>&nbsp;<a href="https://goreportcard.com/report/github.com/create-go-app/cli" target="_blank"><img src="https://img.shields.io/badge/Go_report-A+-success?style=for-the-badge&logo=none" alt="go report" /></a>&nbsp;<img src="https://img.shields.io/badge/license-apache_2.0-red?style=for-the-badge&logo=none" alt="license" /></p>
+<p align="center"><a href="https://github.com/create-go-app/cli/releases" target="_blank"><img src="https://img.shields.io/badge/version-v1.5.2-blue?style=for-the-badge&logo=none" alt="cli version" /></a>&nbsp;<a href="https://pkg.go.dev/github.com/create-go-app/cli?tab=doc" target="_blank"><img src="https://img.shields.io/badge/Go-1.11+-00ADD8?style=for-the-badge&logo=go" alt="go version" /></a>&nbsp;<a href="https://gocover.io/github.com/create-go-app/cli/pkg/cgapp" target="_blank"><img src="https://img.shields.io/badge/Go_Cover-94%25-success?style=for-the-badge&logo=none" alt="go cover" /></a>&nbsp;<a href="https://goreportcard.com/report/github.com/create-go-app/cli" target="_blank"><img src="https://img.shields.io/badge/Go_report-A+-success?style=for-the-badge&logo=none" alt="go report" /></a>&nbsp;<img src="https://img.shields.io/badge/license-apache_2.0-red?style=for-the-badge&logo=none" alt="license" /></p>
 
 ## ⚡️ [Quick start](https://create-go.app/quick-start/)
 
@@ -44,7 +44,7 @@ If you don't want to install Create Go App CLI to your system, you feel free to
 docker run --rm -it -v ${PWD}:${PWD} -w ${PWD} koddr/cgapp:latest
 ```
 
-With this Docker image, you do **not** have to worry about installing tools/CLI of frontend UI libraries/frameworks. Everything is **already included** to this Docker image: `create-react-app`, `preact-cli`, `vue-cli`, `ng-cli` and `degit` (for Svelte and Sapper).
+With this Docker image, you do **not** have to worry about installing tools/CLI of frontend UI libraries/frameworks. Everything is **already included**: `create-react-app`, `preact-cli`, `vue-cli`, `ng-cli` and `degit` (for Svelte and Sapper).
 
 Available commands for official Docker image:
 
@@ -261,9 +261,9 @@ cgapp deploy --use-config
 
 ## 🤔 Why another CLI?
 
-Yes, when we started this project, we asked ourselves this question too and... came to the conclusion, that about **8-10** routine steps in each project can be automated with a smart CLI.
+When we started this project, we asked ourselves this question too and... came to the conclusion, that approximately 8 out of 10 routine operations at the start of a new project and/or the deployment of an existing one **can be automated**. And it would be better to have all the necessary functions inside one CLI. That's why we transferred all our experience to the Create Go App CLI, which we use ourselves!
 
-The Create Go App project allow you to prepare and deploy your project **without** any unnecessary headaches.
+So, yes, this CLI gives you the ability to prepare everything you need to **start a new project** (as `create-react-app` for the React.js ecosystem does) and **deploy an existing project** to a remote server in configured and fully isolated Docker containers.
 
 ## ⭐️ Project assistance
 

cmd/create.go

@@ -114,9 +114,9 @@ var runCreateCmd = func(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
-	// Create Ansible playbook and download roles, if not skipped.
+	// Create Ansible playbook with tasks, if not skipped.
 	if installAnsibleRoles {
-		cgapp.SendMsg(true, "*", "Create Ansible playbook and roles...", "cyan", true)
+		cgapp.SendMsg(true, "*", "Create Ansible playbook with tasks...", "cyan", true)
 
 		// Create playbook.
 		fileToMake := map[string][]byte{
@@ -126,20 +126,6 @@ var runCreateCmd = func(cmd *cobra.Command, args []string) {
 			cgapp.SendMsg(true, "[ERROR]", err.Error(), "red", true)
 			os.Exit(1)
 		}
-
-		// Create Ansible roles.
-		if err := cgapp.CreateProjectFromRegistry(
-			&registry.Project{
-				Type:       "roles",
-				Name:       "deploy",
-				RootFolder: currentDir,
-			},
-			registry.Repositories,
-			registry.RegexpAnsiblePattern,
-		); err != nil {
-			cgapp.SendMsg(true, "[ERROR]", err.Error(), "red", true)
-			os.Exit(1)
-		}
 	}
 
 	// Create backend files.

cmd/deploy.go

@@ -35,7 +35,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// deployCmd represents the `deploy` command
+// deployCmd represents the `deploy` command.
 var deployCmd = &cobra.Command{
 	Use:     "deploy",
 	Aliases: []string{"serve"},
@@ -44,7 +44,7 @@ var deployCmd = &cobra.Command{
 	Run:     runDeployCmd,
 }
 
-// runDeployCmd represents runner for the `deploy` command
+// runDeployCmd represents runner for the `deploy` command.
 var runDeployCmd = func(cmd *cobra.Command, args []string) {
 	// Start message.
 	cgapp.SendMsg(true, "* * *", "Deploying project via Create Go App CLI v"+registry.CLIVersion+"...", "yellow", true)
@@ -112,7 +112,7 @@ var runDeployCmd = func(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
-	// Stop timer
+	// Stop timer.
 	stopTimer := time.Since(startTimer).String()
 
 	// End message.

cmd/init.go

@@ -32,14 +32,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// initCmd represents the init command
+// initCmd represents the init command.
 var initCmd = &cobra.Command{
 	Use:   "init",
 	Short: "Init a configuration file for the Create Go App project",
 	Long:  "\nInit a configuration file for the Create Go App project.",
 	Run:   runInitCmd,
 }
 
+// runInitCmd represents runner for the `init` command.
 var runInitCmd = func(cmd *cobra.Command, args []string) {
 	// Get current directory.
 	currentDir, _ := os.Getwd()

cmd/root.go

@@ -57,7 +57,7 @@ var (
 	}
 )
 
-// rootCmd represents the base command when called without any subcommands
+// rootCmd represents the base command when called without any subcommands.
 var rootCmd = &cobra.Command{
 	Use:     "cgapp",
 	Version: registry.CLIVersion,
@@ -94,7 +94,7 @@ func initConfig() {
 			os.Exit(1)
 		}
 
-		// Parse configs
+		// Parse configs.
 		_ = viper.UnmarshalKey("project", &projectConfig)
 		_ = viper.UnmarshalKey("roles", &rolesConfig)
 	}

configs/.editorconfig

@@ -14,6 +14,6 @@ insert_final_newline = true
 indent_style = tab
 indent_size = 4
 
-[{Dockerfile,Makefile,*.yml,*.yaml}]
+[{Dockerfile,*.yml,*.yaml}]
 indent_style = tab
 indent_size = 2

pkg/cgapp/create.go

@@ -47,11 +47,6 @@ func CreateProjectFromRegistry(p *registry.Project, r map[string]*registry.Repos
 	// Create path in project root folder.
 	folder := filepath.Join(p.RootFolder, p.Type)
 
-	// Re-define folder for Ansible roles
-	if p.Type == "roles" {
-		folder = filepath.Join(p.RootFolder, p.Type, p.Name)
-	}
-
 	// Create match expration.
 	match, err := regexp.MatchString(m, p.Name)
 	if err != nil {

pkg/cgapp/create_test.go

@@ -57,29 +57,16 @@ func TestCreateProjectFromRegistry(t *testing.T) {
 			},
 			false,
 		},
-		{
-			"successfully created Ansible deploy roles",
-			args{
-				p: &registry.Project{
-					Type:       "roles",
-					Name:       "deploy",
-					RootFolder: "../../tmp",
-				},
-				r: registry.Repositories,
-				m: registry.RegexpAnsiblePattern,
-			},
-			false,
-		},
 		{
 			"failed to create (not valid repository)",
 			args{
 				p: &registry.Project{
-					Type:       "roles",
-					Name:       "deploy",
+					Type:       "backend",
+					Name:       "echo",
 					RootFolder: "../../tmp",
 				},
 				r: map[string]*registry.Repository{
-					"roles": {
+					"backend": {
 						List: map[string]string{},
 					},
 				},
@@ -91,12 +78,12 @@ func TestCreateProjectFromRegistry(t *testing.T) {
 			"failed to create (not valid repository with wrong name)",
 			args{
 				p: &registry.Project{
-					Type:       "roles",
+					Type:       "backend",
 					Name:       "wrong-name",
 					RootFolder: "../../tmp",
 				},
 				r: map[string]*registry.Repository{
-					"roles": {
+					"backend": {
 						List: map[string]string{},
 					},
 				},
@@ -108,8 +95,8 @@ func TestCreateProjectFromRegistry(t *testing.T) {
 			"failed to create (repositories is nil)",
 			args{
 				p: &registry.Project{
-					Type:       "roles",
-					Name:       "deploy",
+					Type:       "backend",
+					Name:       "echo",
 					RootFolder: "../../tmp",
 				},
 				r: nil,
@@ -130,8 +117,8 @@ func TestCreateProjectFromRegistry(t *testing.T) {
 			"failed to create (pattern is nil)",
 			args{
 				p: &registry.Project{
-					Type:       "roles",
-					Name:       "deploy",
+					Type:       "backend",
+					Name:       "echo",
 					RootFolder: "../../tmp",
 				},
 				r: registry.Repositories,