fix(api,ui): audit on pipeline with template is now correct (#4930)

Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
ovh · Feb 4, 2020 · 1141bd7 · 1141bd7
1 parent 41c348e
commit 1141bd7
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/engine/api/pipeline/audit.go b/engine/api/pipeline/audit.go
@@ -40,7 +40,7 @@ const (
 	AuditUpdateStage    = "updateStage"
 	AuditDeleteStage    = "deleteStage"
 	AuditMoveStage      = "moveStage"
-	AuditUpdatePipeline = "updateStage"
+	AuditUpdatePipeline = "updatePipeline"
 )
 
 // CreateAudit insert current pipeline version on audit table

diff --git a/engine/api/pipeline/pipeline_parser.go b/engine/api/pipeline/pipeline_parser.go
@@ -50,6 +50,15 @@ func ParseAndImport(ctx context.Context, db gorp.SqlExecutor, cache cache.Store,
 		}
 	}(&msgList)
 
+	previousPip := pip
+	if exist {
+		prevPip, err := LoadPipeline(ctx, db, proj.Key, pip.Name, true)
+		if err != nil {
+			return pip, nil, sdk.WrapError(err, "cannot load previous pipeline")
+		}
+		previousPip = prevPip
+	}
+
 	var globalError error
 	if exist && !opts.Force {
 		return pip, nil, sdk.ErrPipelineAlreadyExists
@@ -63,7 +72,7 @@ func ParseAndImport(ctx context.Context, db gorp.SqlExecutor, cache cache.Store,
 	done.Wait()
 
 	if globalError == nil {
-		if err := CreateAudit(db, pip, AuditUpdatePipeline, u); err != nil {
+		if err := CreateAudit(db, previousPip, AuditUpdatePipeline, u); err != nil {
 			log.Error(ctx, "%v", sdk.WrapError(err, "cannot create audit"))
 		}
 	}

diff --git a/ui/src/app/shared/diff/diff.ts b/ui/src/app/shared/diff/diff.ts
@@ -53,7 +53,10 @@ export function calculateWorkflowTemplateDiff(before: WorkflowTemplate, after: W
             })
     }
 
-    let applicationsLength = Math.max(before ? before.applications.length : 0, after ? after.applications.length : 0);
+    let applicationsLength = Math.max(
+        before ? before.applications && before.applications.length : 0,
+        after ? after.applications && after.applications.length : 0
+    );
     for (let i = 0; i < applicationsLength; i++) {
         diffItems.push(
             <Item>{
@@ -65,7 +68,10 @@ export function calculateWorkflowTemplateDiff(before: WorkflowTemplate, after: W
             })
     }
 
-    let environmentsLength = Math.max(before ? before.environments.length : 0, after ? after.environments.length : 0);
+    let environmentsLength = Math.max(
+        before ? before.environments && before.environments.length : 0,
+        after ? after.environments && after.environments.length : 0
+    );
     for (let i = 0; i < environmentsLength; i++) {
         diffItems.push(
             <Item>{

diff --git a/ui/src/app/shared/workflow-template/apply-form/workflow-template.apply-form.html b/ui/src/app/shared/workflow-template/apply-form/workflow-template.apply-form.html
@@ -3,10 +3,12 @@
         <div class="wide column">
             <div class="field">
                 <label>{{'workflow_name' | translate}}*</label>
-                <input class="ui input" type="text" name="workflow_name" [(ngModel)]="parameterName" [disabled]="workflowTemplateInstance">
+                <input class="ui input" type="text" name="workflow_name" [(ngModel)]="parameterName"
+                    [disabled]="workflowTemplateInstance">
             </div>
             <app-workflow-template-param-form [project]="project" [workflowTemplate]="workflowTemplate"
-                [workflowTemplateInstance]="workflowTemplateInstance" (paramChange)="changeParam($event)"></app-workflow-template-param-form>
+                [workflowTemplateInstance]="workflowTemplateInstance" (paramChange)="changeParam($event)">
+            </app-workflow-template-param-form>
             <div class="wide field" *ngIf="result">
                 <div class="ui message">
                     <ul>
@@ -16,18 +18,22 @@
             </div>
             <div class="wide field">
                 <div class="ui wide field">
-                    <app-delete-button *ngIf="workflowTemplateInstance && workflowTemplateInstance.id" class="left floated"
-                        (event)="clickDetach()" [loading]="loading" [title]="'workflow_template_detach'"></app-delete-button>
+                    <app-delete-button *ngIf="workflowTemplateInstance && workflowTemplateInstance.id"
+                        class="left floated" (event)="clickDetach()" [loading]="loading"
+                        [title]="'workflow_template_detach'"></app-delete-button>
                     <div class="ui checked checkbox" *ngIf="!workflowTemplateInstance && !result">
                         <input type="checkbox" [ngModel]="detached" [ngModelOptions]="{standalone: true}"
                             (ngModelChange)="onSelectDetachChange($event)">
                         <label>{{'workflow_template_apply_detach' | translate}}</label>
                     </div>
                     <button class="ui green button right floated" type="button" (click)="applyTemplate()"
+                        *ngIf="workflowTemplateInstance.workflow_template_version !== workflowTemplate.version"
                         [class.loading]="loading">{{ 'btn_apply' | translate }}</button>
-                    <button class="ui primary button right floated" type="button" (click)="goToWorkflow()" *ngIf="result && !withClose">{{
+                    <button class="ui primary button right floated" type="button" (click)="goToWorkflow()"
+                        *ngIf="result && !withClose">{{
                         'btn_goto_workflow' | translate}}</button>
-                    <button class="ui secondary button right floated" [disabled]="loading" (click)="clickClose()" *ngIf="withClose">{{
+                    <button class="ui secondary button right floated" [disabled]="loading" (click)="clickClose()"
+                        *ngIf="withClose">{{
                         'btn_close' | translate }}</button>
                 </div>
             </div>

diff --git a/ui/src/app/views/pipeline/show/audit/pipeline.audit.component.ts b/ui/src/app/views/pipeline/show/audit/pipeline.audit.component.ts
@@ -123,6 +123,9 @@ export class PipelineAuditComponent implements OnInit {
                 case 'updateStage':
                     diff = this.getUpdateStageDiff(pathSplitted, pipTo, pipFrom);
                     break;
+                case 'updatePipeline':
+                    diff = this.getUpdateJobDiff(path, pathSplitted, pipTo, pipFrom);
+                    break;
                 case 'deleteStage':
                     diff = this.getDeleteStageDiff(pathSplitted, pipFrom);
                     break;