feat: add s3 and gcs connection structs

connection/aws.go

@@ -11,17 +11,12 @@ type AWSConnection struct {
 	// ConnectionName of the connection. It'll be used to populate the endpoint, accessKey and secretKey.
 	ConnectionName string       `yaml:"connection,omitempty" json:"connection,omitempty"`
 	AccessKey      types.EnvVar `yaml:"accessKey" json:"accessKey,omitempty"`
-	Bucket         string       `yaml:"bucket,omitempty" json:"bucket,omitempty"`
 	SecretKey      types.EnvVar `yaml:"secretKey" json:"secretKey,omitempty"`
 	SessionToken   types.EnvVar `yaml:"sessionToken,omitempty" json:"sessionToken,omitempty"`
 	Region         string       `yaml:"region,omitempty" json:"region,omitempty"`
 	Endpoint       string       `yaml:"endpoint,omitempty" json:"endpoint,omitempty"`
 	// Skip TLS verify when connecting to aws
 	SkipTLSVerify bool `yaml:"skipTLSVerify,omitempty" json:"skipTLSVerify,omitempty"`
-	// glob path to restrict matches to a subset
-	ObjectPath string `yaml:"objectPath,omitempty" json:"objectPath,omitempty"`
-	// Use path style path: http://s3.amazonaws.com/BUCKET/KEY instead of http://BUCKET.s3.amazonaws.com/KEY
-	UsePathStyle bool `yaml:"usePathStyle,omitempty" json:"usePathStyle,omitempty"`
 }
 
 func (t *AWSConnection) GetUsername() types.EnvVar {
@@ -35,7 +30,6 @@ func (t *AWSConnection) GetPassword() types.EnvVar {
 func (t *AWSConnection) GetProperties() map[string]string {
 	return map[string]string{
 		"region": t.Region,
-		"bucket": t.Bucket,
 	}
 }
 

connection/gcp.go

@@ -9,7 +9,6 @@ import (
 type GCPConnection struct {
 	// ConnectionName of the connection. It'll be used to populate the endpoint and credentials.
 	ConnectionName string        `yaml:"connection,omitempty" json:"connection,omitempty"`
-	Bucket         string        `yaml:"bucket,omitempty" json:"bucket,omitempty"`
 	Endpoint       string        `yaml:"endpoint" json:"endpoint,omitempty"`
 	Credentials    *types.EnvVar `yaml:"credentials" json:"credentials,omitempty"`
 }
@@ -18,6 +17,7 @@ func (g *GCPConnection) Validate() *GCPConnection {
 	if g == nil {
 		return &GCPConnection{}
 	}
+
 	return g
 }
 
@@ -44,9 +44,3 @@ func (t *GCPConnection) GetCertificate() types.EnvVar {
 func (t *GCPConnection) GetURL() types.EnvVar {
 	return types.EnvVar{ValueStatic: t.Endpoint}
 }
-
-func (t *GCPConnection) GetProperties() map[string]string {
-	return map[string]string{
-		"bucket": t.Bucket,
-	}
-}

connection/gcs.go

@@ -0,0 +1,44 @@
+package connection
+
+import (
+	"github.com/flanksource/duty/types"
+)
+
+// +kubebuilder:object:generate=true
+type GCSConnection struct {
+	GCPConnection `json:",inline"`
+	Bucket        string `yaml:"bucket,omitempty" json:"bucket,omitempty"`
+}
+
+func (g *GCSConnection) Validate() *GCSConnection {
+	if g == nil {
+		return &GCSConnection{}
+	}
+
+	return g
+}
+
+// HydrateConnection attempts to find the connection by name
+// and populate the endpoint and credentials.
+func (g *GCSConnection) HydrateConnection(ctx ConnectionContext) error {
+	connection, err := ctx.HydrateConnectionByURL(g.ConnectionName)
+	if err != nil {
+		return err
+	}
+
+	if connection != nil {
+		g.Credentials = &types.EnvVar{ValueStatic: connection.Certificate}
+		g.Endpoint = connection.URL
+		if val, ok := connection.Properties["bucket"]; ok {
+			g.Bucket = val
+		}
+	}
+
+	return nil
+}
+
+func (t *GCSConnection) GetProperties() map[string]string {
+	return map[string]string{
+		"bucket": t.Bucket,
+	}
+}

connection/s3.go

@@ -0,0 +1,60 @@
+package connection
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/flanksource/commons/collections"
+)
+
+// +kubebuilder:object:generate=true
+type S3Connection struct {
+	AWSConnection `yaml:",inline"`
+	Bucket        string `yaml:"bucket,omitempty" json:"bucket,omitempty"`
+	// glob path to restrict matches to a subset
+	ObjectPath string `yaml:"objectPath,omitempty" json:"objectPath,omitempty"`
+	// Use path style path: http://s3.amazonaws.com/BUCKET/KEY instead of http://BUCKET.s3.amazonaws.com/KEY
+	UsePathStyle bool `yaml:"usePathStyle,omitempty" json:"usePathStyle,omitempty"`
+}
+
+func (t *S3Connection) GetProperties() map[string]string {
+	return collections.MergeMap(
+		t.AWSConnection.GetProperties(),
+		map[string]string{
+			"bucket":       t.Bucket,
+			"objectPath":   t.ObjectPath,
+			"usePathStyle": strconv.FormatBool(t.UsePathStyle),
+		})
+}
+
+// Populate populates an AWSConnection with credentials and other information.
+// If a connection name is specified, it'll be used to populate the endpoint, accessKey and secretKey.
+func (t *S3Connection) Populate(ctx ConnectionContext) error {
+	if err := t.AWSConnection.Populate(ctx); err != nil {
+		return err
+	}
+
+	if t.ConnectionName != "" {
+		connection, err := ctx.HydrateConnectionByURL(t.ConnectionName)
+		if err != nil {
+			return fmt.Errorf("could not parse EC2 access key: %v", err)
+		}
+
+		if region, ok := connection.Properties["bucket"]; ok {
+			t.Bucket = region
+		}
+
+		if objectPath, ok := connection.Properties["objectPath"]; ok {
+			t.ObjectPath = objectPath
+		}
+
+		if usePathStyle, ok := connection.Properties["usePathStyle"]; ok {
+			if val, err := strconv.ParseBool(usePathStyle); err == nil {
+				t.UsePathStyle = val
+			}
+		}
+
+	}
+
+	return nil
+}

models/connections.go

@@ -30,6 +30,7 @@ const (
 	ConnectionTypeEmail          = "email"
 	ConnectionTypeFolder         = "folder"
 	ConnectionTypeGCP            = "google_cloud"
+	ConnectionTypeGCS            = "gcs"
 	ConnectionTypeGenericWebhook = "generic_webhook"
 	ConnectionTypeGit            = "git"
 	ConnectionTypeGithub         = "github"