Skip to content

Commit 04ae5c4

Browse files
committed
feat(subscription): show number of runners/tf states
1 parent f2a9335 commit 04ae5c4

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

api/router.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func Route(
108108
terraformInventoryController := proProjects.NewTerraformInventoryController(terraformStore)
109109
userController := NewUserController(subscriptionService)
110110
usersController := NewUsersController(subscriptionService)
111-
subscriptionController := proApi.NewSubscriptionController(store, store)
111+
subscriptionController := proApi.NewSubscriptionController(store, store, store, terraformStore)
112112
projectRunnerController := proProjects.NewProjectRunnerController(subscriptionService)
113113
taskController := projects.NewTaskController(ansibleTaskRepo)
114114
rolesController := proApi.NewRolesController(store)

db/TerraformInventoryStore_pro.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ type TerraformStore interface {
1212
GetTerraformInventoryState(projectID int, inventoryId int, stateID int) (TerraformInventoryState, error)
1313
GetTerraformInventoryStates(projectID, inventoryID int, params RetrieveQueryParams) ([]TerraformInventoryState, error)
1414
DeleteTerraformInventoryState(projectID int, inventoryId int, stateID int) error
15+
GetTerraformStateCount() (int, error)
1516
}

pro/api/subscriptions.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package api
22

33
import (
4+
"net/http"
5+
46
"github.com/semaphoreui/semaphore/db"
57
"github.com/semaphoreui/semaphore/pro_interfaces"
6-
"net/http"
78
)
89

910
func NewSubscriptionController(
1011
optionsRepo db.OptionsManager,
1112
userRepo db.UserManager,
13+
runnerRepo db.RunnerManager,
14+
tfRepo db.TerraformStore,
1215
) pro_interfaces.SubscriptionController {
1316
return &subscriptionControllerImpl{}
1417
}

pro/db/sql/terraform_inventory.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,7 @@ func (d *TerraformStoreImpl) DeleteTerraformInventoryState(projectID int, invent
4646
func (d *TerraformStoreImpl) GetTerraformInventoryState(projectID int, inventoryId int, stateID int) (res db.TerraformInventoryState, err error) {
4747
return
4848
}
49+
50+
func (d *TerraformStoreImpl) GetTerraformStateCount() (n int, err error) {
51+
return
52+
}

web/src/components/SubscriptionForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<v-list-item-content>
158158
<v-list-item-title>Terraform backends</v-list-item-title>
159159
<v-list-item-subtitle>
160-
{{ item.terraform_backends_used }} / {{ item.terraform_backends }}
160+
{{ item.terraform_states_used }} / {{ item.terraform_states }}
161161
</v-list-item-subtitle>
162162
</v-list-item-content>
163163
</v-list-item>

0 commit comments

Comments
 (0)