Fix job cancelation override

kylecarbs · kylecarbs · commit 6117e874398a · 2022-02-06T03:07:38.000Z
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -164,6 +164,7 @@ jobs:
         env:
           DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
           DD_DATABASE: fake
+          GIT_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
         run: go run scripts/datadog-cireport/main.go gotests.xml
 
       - name: Test with PostgreSQL Database
@@ -177,6 +178,7 @@ jobs:
         env:
           DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
           DD_DATABASE: postgresql
+          GIT_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
         run: go run scripts/datadog-cireport/main.go gotests.xml
 
       - uses: codecov/codecov-action@v2
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -377,6 +377,13 @@ func (server *provisionerdServer) CancelJob(ctx context.Context, cancelJob *prot
 	if err != nil {
 		return nil, xerrors.Errorf("parse job id: %w", err)
 	}
+	job, err := server.Database.GetProvisionerJobByID(ctx, jobID)
+	if err != nil {
+		return nil, xerrors.Errorf("get provisioner job: %w", err)
+	}
+	if job.CompletedAt.Valid {
+		return nil, xerrors.Errorf("job already completed")
+	}
 	err = server.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{
 		ID: jobID,
 		CompletedAt: sql.NullTime{
diff --git a/scripts/datadog-cireport/main.go b/scripts/datadog-cireport/main.go
@@ -49,7 +49,7 @@ func main() {
 		pipelineURL += fmt.Sprintf("/attempts/%s", os.Getenv("GITHUB_RUN_ATTEMPT"))
 	}
 
-	commitMessage, err := exec.Command("git", "show", "-s", "--format=%s").CombinedOutput()
+	commitMessage, err := exec.Command("git", "log", "-1", "--pretty=format:%s").CombinedOutput()
 	if err != nil {
 		log.Fatalf("Get commit message: %s", err)
 	}
@@ -63,7 +63,7 @@ func main() {
 		"service":              "coder",
 		"_dd.cireport_version": "2",
 
-		"database": os.Getenv("DD_DATABASE"),
+		"test.traits": fmt.Sprintf(`{"database":"%s"}`, os.Getenv("DD_DATABASE")),
 
 		// Additional tags found in DataDog docs. See:
 		// https://docs.datadoghq.com/continuous_integration/setup_tests/junit_upload/#collecting-environment-configuration-metadata
@@ -82,7 +82,7 @@ func main() {
 		"git.commit.sha":     githubSHA,
 		"git.repository_url": fmt.Sprintf("%s/%s.git", githubServerURL, githubRepository),
 
-		"git.commit.message":         strings.TrimSpace(string(commitMessage)),
+		"git.commit.message":         string(commitMessage),
 		"git.commit.author.name":     commitParts[0],
 		"git.commit.author.email":    commitParts[1],
 		"git.commit.author.date":     commitParts[2],
@@ -174,5 +174,11 @@ func main() {
 	if err != nil {
 		log.Fatalf("Pretty print: %s", err)
 	}
-	_, _ = fmt.Printf("Status code: %d\nResponse: %s\n", res.StatusCode, msg)
+	_, _ = fmt.Println(string(msg))
+	msg, err = json.MarshalIndent(tags, "", "\t")
+	if err != nil {
+		log.Fatalf("Marshal tags: %s", err)
+	}
+	_, _ = fmt.Println(string(msg))
+	_, _ = fmt.Printf("Status: %d\n", res.StatusCode)
 }
