Skip to content

[CSPL-1283] Fix AWS & minio S3 client code to support App framework on GCS #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 7, 2021
Merged

[CSPL-1283] Fix AWS & minio S3 client code to support App framework on GCS #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac09999
Fix minio S3 client code
jryb Sep 2, 2021
4fc7fdb
Fix incorrect minio initContainer ut
jryb Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions pkg/splunk/client/minioclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package client
import (
"context"
"fmt"
"path/filepath"
"strings"

"github.com/minio/minio-go/v7"
Expand Down Expand Up @@ -114,7 +115,7 @@ func InitMinioClientSession(appS3Endpoint string, accessKeyID string, secretAcce
func (client *MinioClient) GetAppsList() (S3Response, error) {
scopedLog := log.WithName("GetAppsList")

scopedLog.Info("Getting Apps list", " S3 Bucket", client.BucketName)
scopedLog.Info("Getting Apps list", " S3 Bucket", client.BucketName, "Prefix", client.Prefix)
s3Resp := S3Response{}
s3Client := client.Client

Expand All @@ -132,7 +133,15 @@ func (client *MinioClient) GetAppsList() (S3Response, error) {
return s3Resp, nil
}
scopedLog.Info("Got an object", "object", object)
s3Resp.Objects = append(s3Resp.Objects, &RemoteObject{Etag: &object.ETag, Key: &object.Key, LastModified: &object.LastModified, Size: &object.Size, StorageClass: &object.StorageClass})

// Create a new object to add to append to the response
newETag := object.ETag
newKey := object.Key
newLastModified := object.LastModified
newSize := object.Size
newStorageClass := object.StorageClass
newRemoteObject := RemoteObject{Etag: &newETag, Key: &newKey, LastModified: &newLastModified, Size: &newSize, StorageClass: &newStorageClass}
s3Resp.Objects = append(s3Resp.Objects, &newRemoteObject)
}

return s3Resp, nil
Expand All @@ -145,5 +154,8 @@ func (client *MinioClient) GetInitContainerImage() string {

// GetInitContainerCmd returns the init container command on a per app source basis to be used by the initContainer
func (client *MinioClient) GetInitContainerCmd(endpoint string, bucket string, path string, appSrcName string, appMnt string) []string {
return ([]string{fmt.Sprintf("--endpoint-url=%s", endpoint), "s3", "sync", fmt.Sprintf("s3://%s/%s", bucket, path), fmt.Sprintf("%s/%s", appMnt, appSrcName)})
s3AppSrcPath := filepath.Join(bucket, path) + "/"
podSyncPath := filepath.Join(appMnt, appSrcName) + "/"

return ([]string{fmt.Sprintf("--endpoint-url=%s", endpoint), "s3", "sync", fmt.Sprintf("s3://%s", s3AppSrcPath), podSyncPath})
}
2 changes: 1 addition & 1 deletion pkg/splunk/client/minioclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestMinioGetInitContainerImage(t *testing.T) {
}

func TestGetMinioInitContainerCmd(t *testing.T) {
wantCmd := []string{"--endpoint-url=https://s3.us-west-2.amazonaws.com", "s3", "sync", "s3://sample_bucket/admin", "/mnt/apps-local//admin"}
wantCmd := []string{"--endpoint-url=https://s3.us-west-2.amazonaws.com", "s3", "sync", "s3://sample_bucket/admin/", "/mnt/apps-local/admin/"}

minioClient := &MinioClient{}
gotCmd := minioClient.GetInitContainerCmd("https://s3.us-west-2.amazonaws.com", "sample_bucket", "admin", "admin", "/mnt/apps-local/")
Expand Down