Feature: Ansible directory path inside repo

api-docs.yml

@@ -3,7 +3,7 @@ swagger: '2.0'
 info:
   title: SEMAPHORE
   description: Semaphore API
-  version: "2.2.0"
+  version: "2.2.1"
 
 host: localhost:3000
 
@@ -231,6 +231,8 @@ definitions:
               type: string
             ssh_key:
               type: string
+            path:
+              type: string
       keys:
         type: array
         items:
@@ -672,6 +674,9 @@ definitions:
         example: master
       ssh_key_id:
         type: integer
+      path:
+        type: string
+        example: deployment/ansible
   Repository:
     type: object
     properties:
@@ -690,6 +695,9 @@ definitions:
         example: master
       ssh_key_id:
         type: integer
+      path:
+        type: string
+        example: deployment/ansible
 
   Task:
     type: object

db/Inventory.go

@@ -1,5 +1,7 @@
 package db
 
+import "path"
+
 type InventoryType string
 
 const (
@@ -42,11 +44,15 @@ type Inventory struct {
 }
 
 func (e Inventory) GetFilename() string {
+	pathPrefix := ""
+	if e.Repository != nil {
+		pathPrefix = e.Repository.Path
+	}
 	if e.Type != InventoryFile {
-		return ""
+		return pathPrefix
 	}
 
-	return e.Inventory
+	return path.Join(pathPrefix, e.Inventory)
 
 	//return strings.TrimPrefix(e.Inventory, "/")
 }

db/Migration.go

@@ -81,6 +81,7 @@ func GetMigrations() []Migration {
 		{Version: "2.12.3"},
 		{Version: "2.12.4"},
 		{Version: "2.12.5"},
+		{Version: "2.12.6"},
 	}
 }
 

db/Repository.go

@@ -31,6 +31,7 @@ type Repository struct {
 	SSHKeyID  int    `db:"ssh_key_id" json:"ssh_key_id" binding:"required" backup:"-"`
 
 	SSHKey AccessKey `db:"-" json:"-" backup:"-"`
+	Path   string    `db:"path" json:"path" backup:"-"`
 }
 
 func (r Repository) ClearCache() error {
@@ -68,6 +69,10 @@ func (r Repository) GetDirName(templateID int) string {
 	return r.getDirNamePrefix() + strconv.Itoa(templateID)
 }
 
+func (r Repository) GetAnsiblePath(templateID int) string {
+	return path.Join(r.GetFullPath(templateID), r.Path)
+}
+
 func (r Repository) GetFullPath(templateID int) string {
 	if r.GetType() == RepositoryLocal {
 		return r.GetGitURL()

db/sql/migrations/v2.12.6.sql

@@ -0,0 +1 @@
+alter table `project__repository` add column path text not null;

db/sql/repository.go

@@ -63,11 +63,12 @@ func (d *SqlDb) UpdateRepository(repository db.Repository) error {
 	}
 
 	_, err = d.exec(
-		"update project__repository set name=?, git_url=?, git_branch=?, ssh_key_id=? where id=?",
+		"update project__repository set name=?, git_url=?, git_branch=?, ssh_key_id=?, path=? where id=?",
 		repository.Name,
 		repository.GitURL,
 		repository.GitBranch,
 		repository.SSHKeyID,
+		repository.Path,
 		repository.ID)
 
 	return err
@@ -82,12 +83,13 @@ func (d *SqlDb) CreateRepository(repository db.Repository) (newRepo db.Repositor
 
 	insertID, err := d.insert(
 		"id",
-		"insert into project__repository(project_id, git_url, git_branch, ssh_key_id, name) values (?, ?, ?, ?, ?)",
+		"insert into project__repository(project_id, git_url, git_branch, ssh_key_id, name, path) values (?, ?, ?, ?, ?, ?)",
 		repository.ProjectID,
 		repository.GitURL,
 		repository.GitBranch,
 		repository.SSHKeyID,
-		repository.Name)
+		repository.Name,
+		repository.Path)
 
 	if err != nil {
 		return

db_lib/AnsibleApp.go

@@ -87,7 +87,7 @@ func (t *AnsibleApp) getRepoPath() string {
 		Client:     CreateDefaultGitClient(),
 	}
 
-	return repo.GetFullPath()
+	return repo.GetAnsiblePath()
 }
 
 func (t *AnsibleApp) installGalaxyRequirementsFile(requirementsType GalaxyRequirementsType, requirementsFilePath string) error {

db_lib/AnsiblePlaybook.go

@@ -20,7 +20,7 @@ type AnsiblePlaybook struct {
 
 func (p AnsiblePlaybook) makeCmd(command string, args []string, environmentVars []string) *exec.Cmd {
 	cmd := exec.Command(command, args...) //nolint: gas
-	cmd.Dir = p.GetFullPath()
+	cmd.Dir = p.getAnsiblePath()
 
 	cmd.Env = append(cmd.Env, "PYTHONUNBUFFERED=1")
 	cmd.Env = append(cmd.Env, "ANSIBLE_FORCE_COLOR=True")
@@ -82,7 +82,7 @@ func (p AnsiblePlaybook) RunGalaxy(args []string) error {
 	return p.runCmd("ansible-galaxy", args)
 }
 
-func (p AnsiblePlaybook) GetFullPath() (path string) {
-	path = p.Repository.GetFullPath(p.TemplateID)
+func (p AnsiblePlaybook) getAnsiblePath() (path string) {
+	path = p.Repository.GetAnsiblePath(p.TemplateID)
 	return
 }

db_lib/GitRepository.go

@@ -34,6 +34,10 @@ type GitRepository struct {
 	Client     GitClient
 }
 
+func (r GitRepository) GetAnsiblePath() string {
+	return path.Join(r.GetFullPath(), r.Repository.Path)
+}
+
 func (r GitRepository) GetFullPath() string {
 	if r.TmpDirName != "" {
 		return path.Join(util.Config.TmpPath, r.TmpDirName)

db_lib/TerraformApp.go

@@ -88,7 +88,7 @@ func (t *TerraformApp) runCmd(command string, args []string) error {
 }
 
 func (t *TerraformApp) GetFullPath() string {
-	return path.Join(t.Repository.GetFullPath(t.Template.ID), strings.TrimPrefix(t.Template.Playbook, "/"))
+	return path.Join(t.Repository.GetAnsiblePath(t.Template.ID), strings.TrimPrefix(t.Template.Playbook, "/"))
 }
 
 func (t *TerraformApp) SetLogger(logger task_logger.Logger) task_logger.Logger {

services/project/backup_test.go

@@ -37,6 +37,7 @@ func TestBackupProject(t *testing.T) {
 		Name:      "Test",
 		GitURL:    "[email protected]:test/test",
 		GitBranch: "master",
+		Path:      "deployment/ansible",
 	})
 	assert.NoError(t, err)
 

web/src/components/RepositoryForm.vue

@@ -93,6 +93,15 @@
         </v-tooltip>
       </template>
     </v-select>
+
+    <v-text-field
+      v-model.trim="item.path"
+      :label="$t('path')"
+      :rules="[v => isValidPath(v) != false || $t('invalidPath')]"
+      required
+      :disabled="formSaving || type === 'local'"
+    ></v-text-field>
+
   </v-form>
 </template>
 <script>
@@ -186,6 +195,16 @@ export default {
     getSingleItemUrl() {
       return `/api/project/${this.projectId}/repositories/${this.itemId}`;
     },
+
+    isValidPath(path) {
+      // TODO Write this.
+      // Always accept an empty path
+      if (path == null || path === '') {
+        return true;
+      }
+      // For now, always accept any path
+      return true;
+    },
   },
 };
 </script>

web/src/lang/en.js

@@ -306,4 +306,5 @@ export default {
   status_success: 'Success',
   status_failed: 'Failed',
   status_stopped: 'Stopped',
+  invalidPath: 'Invalid path',
 };

web/src/views/project/Repositories.vue

@@ -63,6 +63,10 @@
         {{ keys.find((k) => k.id === item.ssh_key_id).name }}
       </template>
 
+      <template v-slot:item.path="{ item }">
+        {{ item.path }}
+      </template>
+
       <template v-slot:item.actions="{ item }">
         <v-btn-toggle dense :value-comparator="() => false">
           <v-btn @click="askDeleteItem(item.id)">
@@ -104,7 +108,7 @@ export default {
       return [{
         text: this.$i18n.t('name'),
         value: 'name',
-        width: '25%',
+        width: '20%',
       },
       {
         text: this.$i18n.t('gitUrl'),
@@ -114,7 +118,12 @@ export default {
       {
         text: this.$i18n.t('sshKey'),
         value: 'ssh_key_id',
-        width: '25%',
+        width: '15%',
+      },
+      {
+        text: this.$i18n.t('path'),
+        value: 'path',
+        width: '15%',
       },
       {
         text: this.$i18n.t('actions'),