chore: Sensor related packages refactory (#1022)

store/configmap.go → sensors/artifacts/configmap.go

@@ -1,4 +1,4 @@
-package store
+package artifacts
 
 import (
 	"github.com/argoproj/argo-events/common"

store/configmap_test.go → sensors/artifacts/configmap_test.go

@@ -1,4 +1,4 @@
-package store
+package artifacts
 
 import (
 	"context"

store/file.go → sensors/artifacts/file.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"errors"

store/file_test.go → sensors/artifacts/file_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"io/ioutil"

store/git.go → sensors/artifacts/git.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"fmt"

store/git_test.go → sensors/artifacts/git_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"testing"

store/inline.go → sensors/artifacts/inline.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"errors"

store/inline_test.go → sensors/artifacts/inline_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"testing"

store/resource.go → sensors/artifacts/resource.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"encoding/json"

store/resource_test.go → sensors/artifacts/resource_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"testing"

store/s3.go → sensors/artifacts/s3.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"fmt"

store/s3_test.go → sensors/artifacts/s3_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"testing"

store/store.go → sensors/artifacts/store.go

@@ -14,13 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
 	"fmt"
+	"strings"
 
+	"github.com/argoproj/argo-events/common"
 	"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
 	"github.com/ghodss/yaml"
+	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
@@ -40,6 +43,31 @@ func FetchArtifact(reader ArtifactReader) (*unstructured.Unstructured, error) {
 	return decodeAndUnstructure(obj)
 }
 
+type Credentials struct {
+	accessKey string
+	secretKey string
+}
+
+// GetCredentials for this minio
+func GetCredentials(art *v1alpha1.ArtifactLocation) (*Credentials, error) {
+	if art.S3 != nil {
+		accessKey, err := common.GetSecretFromVolume(art.S3.AccessKey)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to retrieve accessKey")
+		}
+		secretKey, err := common.GetSecretFromVolume(art.S3.SecretKey)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to retrieve secretKey")
+		}
+		return &Credentials{
+			accessKey: strings.TrimSpace(accessKey),
+			secretKey: strings.TrimSpace(secretKey),
+		}, nil
+	}
+
+	return nil, nil
+}
+
 // GetArtifactReader returns the ArtifactReader for this location
 func GetArtifactReader(loc *v1alpha1.ArtifactLocation, creds *Credentials) (ArtifactReader, error) {
 	if loc.S3 != nil {

store/store_test.go → sensors/artifacts/store_test.go

@@ -14,14 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package store
+package artifacts
 
 import (
+	"context"
 	"io/ioutil"
 	"testing"
 
 	"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
 	"github.com/stretchr/testify/assert"
+	apiv1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes/fake"
 )
 
 type FakeWorkflowArtifactReader struct{}
@@ -38,6 +42,26 @@ func TestFetchArtifact(t *testing.T) {
 	assert.Equal(t, "Workflow", obj.GetKind())
 }
 
+func TestGetCredentials(t *testing.T) {
+	fakeClient := fake.NewSimpleClientset()
+
+	mySecretCredentials := &apiv1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test",
+			Namespace: "testing",
+		},
+		Data: map[string][]byte{"access": []byte("token"), "secret": []byte("value")},
+	}
+	_, err := fakeClient.CoreV1().Secrets("testing").Create(context.TODO(), mySecretCredentials, metav1.CreateOptions{})
+	assert.Nil(t, err)
+
+	// creds should be nil for unknown minio type
+	unknownArtifact := &v1alpha1.ArtifactLocation{}
+	creds, err := GetCredentials(unknownArtifact)
+	assert.Nil(t, creds)
+	assert.Nil(t, err)
+}
+
 func TestGetArtifactReader(t *testing.T) {
 	// test unknown failure
 	location := &v1alpha1.ArtifactLocation{}
@@ -50,7 +74,7 @@ func TestGetArtifactReader(t *testing.T) {
 }
 
 func TestDecodeSensor(t *testing.T) {
-	b, err := ioutil.ReadFile("../examples/sensors/multi-trigger-sensor.yaml")
+	b, err := ioutil.ReadFile("../../examples/sensors/multi-trigger-sensor.yaml")
 	assert.Nil(t, err)
 	_, err = decodeAndUnstructure(b)
 	assert.Nil(t, err)

store/url.go → sensors/artifacts/url.go

@@ -1,4 +1,4 @@
-package store
+package artifacts
 
 import (
 	"crypto/tls"

store/url_test.go → sensors/artifacts/url_test.go

@@ -1,4 +1,4 @@
-package store
+package artifacts
 
 import (
 	"fmt"

sensors/triggers/fetch.go

@@ -21,22 +21,22 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
-	"github.com/argoproj/argo-events/store"
+	"github.com/argoproj/argo-events/sensors/artifacts"
 )
 
 func FetchKubernetesResource(source *v1alpha1.ArtifactLocation) (*unstructured.Unstructured, error) {
 	if source == nil {
 		return nil, errors.Errorf("trigger source for k8s is empty")
 	}
-	creds, err := store.GetCredentials(source)
+	creds, err := artifacts.GetCredentials(source)
 	if err != nil {
 		return nil, err
 	}
-	reader, err := store.GetArtifactReader(source, creds)
+	reader, err := artifacts.GetArtifactReader(source, creds)
 	if err != nil {
 		return nil, err
 	}
-	uObj, err := store.FetchArtifact(reader)
+	uObj, err := artifacts.FetchArtifact(reader)
 	if err != nil {
 		return nil, err
 	}

sensors/triggers/standard-k8s/standar-k8s.go

@@ -36,9 +36,9 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/argoproj/argo-events/pkg/apis/sensor/v1alpha1"
+	"github.com/argoproj/argo-events/sensors/artifacts"
 	"github.com/argoproj/argo-events/sensors/policy"
 	"github.com/argoproj/argo-events/sensors/triggers"
-	"github.com/argoproj/argo-events/store"
 )
 
 // StandardK8STrigger implements Trigger interface for standard Kubernetes resources
@@ -74,11 +74,11 @@ func (k8sTrigger *StandardK8sTrigger) FetchResource(ctx context.Context) (interf
 	if trigger.Template.K8s.Source == nil {
 		return nil, errors.Errorf("trigger source for k8s is empty")
 	}
-	creds, err := store.GetCredentials(trigger.Template.K8s.Source)
+	creds, err := artifacts.GetCredentials(trigger.Template.K8s.Source)
 	if err != nil {
 		return nil, err
 	}
-	reader, err := store.GetArtifactReader(trigger.Template.K8s.Source, creds)
+	reader, err := artifacts.GetArtifactReader(trigger.Template.K8s.Source, creds)
 	if err != nil {
 		return nil, err
 	}
@@ -87,7 +87,7 @@ func (k8sTrigger *StandardK8sTrigger) FetchResource(ctx context.Context) (interf
 
 	// uObj will either hold the resource definition stored in the trigger or just
 	// a stub to provide enough information to fetch the object from K8s cluster
-	uObj, err := store.FetchArtifact(reader)
+	uObj, err := artifacts.FetchArtifact(reader)
 	if err != nil {
 		return nil, err
 	}