Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2024-12-04 23:31:05 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(tf): remove semaphore_vars

Browse Source
This commit is contained in:
Denis Gukov 2024-12-02 01:49:10 +05:00
parent 63b02a8e17
commit c91b428de4
2 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/tasks/LocalJob.go
View File

@ -249,14 +249,10 @@ func (t *LocalJob) getTerraformArgs(username string, incomingVersion *string) (a
}
for name, value := range extraVars {
var v []byte
v, err = json.Marshal(value)
if err != nil {
return
if name == "semaphore_vars" {
continue
}
args = append(args, "-var", fmt.Sprintf("%s=%s", name, v))
args = append(args, "-var", fmt.Sprintf("%s=%s", name, value))
}
for _, secret := range t.Environment.Secrets {

59
web/src/components/TaskParamsForm.vue
View File

@ -37,24 +37,43 @@
</v-row>
</div>
<div v-else-if="app === 'terraform' || app === 'tofu'">
<v-checkbox
class="mt-0"
:input-value="params.plan"
@change="updateValue('plan', $event)"
>
<template v-slot:label>
<div class="text-no-wrap">{{ $t('Plan') }}</div>
</template>
</v-checkbox>
<v-checkbox
class="mt-0"
:input-value="params.auto_approve"
@change="updateValue('auto_approve', $event)"
>
<template v-slot:label>
<div class="text-no-wrap">{{ $t('Auto Approve') }} <code>-auto-approve</code></div>
</template>
</v-checkbox>
<v-row no-gutters class="mt-6">
<v-col cols="12" sm="6">
<v-checkbox
class="mt-0"
:input-value="params.plan"
@change="updateValue('plan', $event)"
>
<template v-slot:label>
<div class="text-no-wrap">{{ $t('Plan') }}</div>
</template>
</v-checkbox>
</v-col>
<v-col cols="12" sm="6">
<v-checkbox
class="mt-0"
:input-value="params.destroy"
@change="updateValue('destroy', $event)"
>
<template v-slot:label>
<div class="text-no-wrap">{{ $t('Destroy') }} <code>-destroy</code></div>
</template>
</v-checkbox>
</v-col>
<v-col cols="12" sm="6">
<v-checkbox
class="mt-0"
:input-value="params.auto_approve"
@change="updateValue('auto_approve', $event)"
>
<template v-slot:label>
<div class="text-no-wrap">{{ $t('Auto Approve') }} <code>-auto-approve</code></div>
</template>
</v-checkbox>
</v-col>
</v-row>
</div>
<div v-else></div>
</template>
@ -66,8 +85,8 @@
<script>
const APP_PARAMS = {
terraform: ['plan', 'auto_approve'],
tofu: ['plan', 'auto_approve'],
terraform: ['plan', 'auto_approve', 'destroy'],
tofu: ['plan', 'auto_approve', 'destroy'],
ansible: ['diff', 'debug', 'dry_run'],
};