Merge branch 'master' of ssh://github.com/armosec/opa-utils

gitregostore/gitstoremethods.go

@@ -92,6 +92,15 @@ func (gs *GitRegoStore) GetOPAControlByID(controlID string) (*opapolicy.Control,
 	return nil, fmt.Errorf("control '%s' not found", controlID)
 }
 
+// GetOPAControl returns specific control by the name or ID
+func (gs *GitRegoStore) GetOPAControl(c string) (*opapolicy.Control, error) {
+	if isControlID(c) {
+		return gs.GetOPAControlByID(c)
+	} else {
+		return gs.GetOPAControlByName(c)
+	}
+}
+
 // GetOPAControls returns all the controls of given customer
 func (gs *GitRegoStore) GetOPAControls() ([]opapolicy.Control, error) {
 	gs.controlsLock.RLock()

gitregostore/gitstoremethods_test.go

@@ -2,6 +2,8 @@ package gitregostore
 
 import (
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestInitDefaultGitRegoStore(t *testing.T) {
@@ -112,11 +114,10 @@ func TestGetPoliciesMethods(t *testing.T) {
 	}
 }
 
-func contains(list []string, str string) bool {
-	for _, a := range list {
-		if a == str {
-			return true
-		}
-	}
-	return false
+func TestIsControlID(t *testing.T) {
+	assert.True(t, isControlID("c-0001"))
+	assert.True(t, isControlID("C-0001"))
+	assert.False(t, isControlID("c-00012"))
+	assert.False(t, isControlID("t-0001"))
+	assert.False(t, isControlID("my name"))
 }

gitregostore/gitstoreutils.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -396,3 +397,10 @@ func HTTPRespToString(resp *http.Response) (string, error) {
 
 	return respStr, err
 }
+
+func isControlID(c string) bool {
+	if m, err := regexp.MatchString(`^[c|C][\-][0-9]{4}$`, c); err == nil {
+		return m
+	}
+	return false
+}