Merge branch 'main' into release

Author: jnewland

README.md

@@ -19,7 +19,7 @@ on:
 #  deploy:
 #    steps:
 
-      - uses: urcomputeringpal/label-mutex@main
+      - uses: urcomputeringpal/label-mutex@v0.3.0
         id: label-mutex
         env:
           AWS_DEFAULT_REGION: us-east-1
@@ -54,7 +54,7 @@ on:
 #  unlock:
 #    steps:
 
-      - uses: urcomputeringpal/label-mutex@v0.0.1
+      - uses: urcomputeringpal/label-mutex@v0.3.0
         id: label-mutex
         env:
           AWS_DEFAULT_REGION: us-east-1

action.yml

@@ -30,4 +30,4 @@ outputs:
 runs:
   using: docker
   # image: Dockerfile
-  image: 'docker://urcomputeringpal/label-mutex:v0.2.0'
+  image: 'docker://urcomputeringpal/label-mutex:v0.3.0'

labelMutex.go

@@ -1,12 +1,10 @@
 package main
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"log"
 	"net/http"
 
@@ -66,19 +64,10 @@ func (lm *LabelMutex) process() error {
 	if lm.eventName == "pull_request" {
 		return lm.processPR()
 	}
-	if lm.eventName == "push" {
-		return lm.processPush()
-	}
-	return fmt.Errorf("Unknown event %s", lm.eventName)
+	return lm.processOther()
 }
 
-func (lm *LabelMutex) processPush() error {
-	var push github.PushEvent
-	bytes := lm.clearJSONRepoOrgField(bytes.NewReader(lm.event))
-	err := json.Unmarshal(bytes, &push)
-	if err != nil {
-		return err
-	}
+func (lm *LabelMutex) processOther() error {
 	value, err := lm.uriLocker.Read()
 	if err == dynalock.ErrKeyNotFound {
 		lm.locked = false
@@ -95,24 +84,6 @@ func (lm *LabelMutex) processPush() error {
 	return nil
 }
 
-func (lm *LabelMutex) clearJSONRepoOrgField(reader io.Reader) []byte {
-	// workaround for https://github.com/google/go-github/issues/131
-	var o map[string]interface{}
-	dec := json.NewDecoder(reader)
-	dec.UseNumber()
-	dec.Decode(&o)
-	if o != nil {
-		repo := o["repository"]
-		if repo != nil {
-			if repo, ok := repo.(map[string]interface{}); ok {
-				delete(repo, "organization")
-			}
-		}
-	}
-	b, _ := json.MarshalIndent(o, "", "  ")
-	return b
-}
-
 func (lm *LabelMutex) processPR() error {
 	var resultErr *multierror.Error
 	var pr github.PullRequestEvent