Changes and tests

Author: shiv-am0

main.go

@@ -81,7 +81,7 @@ func main() {
 		},
 		cli.StringFlag{
 			Name:   "strip-prefix",
-			Usage:  "strip the prefix from the target",
+			Usage:  "used to add or remove a prefix from the source/target path",
 			EnvVar: "PLUGIN_STRIP_PREFIX",
 		},
 		cli.StringSliceFlag{
@@ -96,7 +96,7 @@ func main() {
 		},
 		cli.BoolFlag{
 			Name:   "download",
-			Usage:  "switch to download mode, which will fetch `target`'s files from s3 bucket and place them according to `strip-prefix`",
+			Usage:  "switch to download mode, which will fetch `source`'s files from s3 bucket",
 			EnvVar: "PLUGIN_DOWNLOAD",
 		},
 		cli.BoolFlag{

plugin.go

@@ -110,44 +110,11 @@ func (p *Plugin) Exec() error {
 	}
 
 	// create the client
-	conf := &aws.Config{
-		Region:           aws.String(p.Region),
-		Endpoint:         &p.Endpoint,
-		DisableSSL:       aws.Bool(strings.HasPrefix(p.Endpoint, "http://")),
-		S3ForcePathStyle: aws.Bool(p.PathStyle),
-	}
-
-	if p.Key != "" && p.Secret != "" {
-		conf.Credentials = credentials.NewStaticCredentials(p.Key, p.Secret, "")
-	} else if p.AssumeRole != "" {
-		conf.Credentials = assumeRole(p.AssumeRole, p.AssumeRoleSessionName, p.ExternalID)
-	} else {
-		log.Warn("AWS Key and/or Secret not provided (falling back to ec2 instance profile)")
-	}
-
-	var client *s3.S3
-	sess, err := session.NewSession(conf)
-	if err != nil {
-		log.WithError(err).Errorln("could not instantiate session")
-		return err
-	}
-
-	// If user role ARN is set then assume role here
-	if len(p.UserRoleArn) > 0 {
-		confRoleArn := aws.Config{
-			Region:      aws.String(p.Region),
-			Credentials: stscreds.NewCredentials(sess, p.UserRoleArn),
-		}
-
-		client = s3.New(sess, &confRoleArn)
-	} else {
-		client = s3.New(sess)
-	}
+	client := p.createS3Client()
 
 	// If in download mode, call the downloadS3Objects method
 	if p.Download {
 		sourceDir := normalizePath(p.Source)
-		client := p.createS3Client()
 
 		return p.downloadS3Objects(client, sourceDir)
 	}

plugin_unix_test.go

@@ -83,3 +83,48 @@ func TestNormalizePath(t *testing.T) {
 		}
 	}
 }
+
+func TestResolveSource(t *testing.T) {
+	tests := []struct {
+		sourceDir   string
+		source      string
+		stripPrefix string
+		expected    string
+	}{
+		// Test case 1
+		{
+			sourceDir:   "/home/user/documents",
+			source:      "/home/user/documents/file.txt",
+			stripPrefix: "output-",
+			expected:    "output-file.txt",
+		},
+		// Test case 2
+		{
+			sourceDir:   "assets",
+			source:      "assets/images/logo.png",
+			stripPrefix: "",
+			expected:    "images/logo.png",
+		},
+		// Test case 3
+		{
+			sourceDir:   "/var/www/html",
+			source:      "/var/www/html/pages/index.html",
+			stripPrefix: "web",
+			expected:    "webpages/index.html",
+		},
+		// Test case 4
+		{
+			sourceDir:   "dist",
+			source:      "dist/js/app.js",
+			stripPrefix: "public",
+			expected:    "publicjs/app.js",
+		},
+	}
+
+	for _, tc := range tests {
+		result := resolveSource(tc.sourceDir, tc.source, tc.stripPrefix)
+		if result != tc.expected {
+			t.Errorf("Expected: %s, Got: %s", tc.expected, result)
+		}
+	}
+}

plugin_windows_test.go

@@ -97,3 +97,48 @@ func TestNormalizePath(t *testing.T) {
 		}
 	}
 }
+
+func TestResolveSource(t *testing.T) {
+	tests := []struct {
+		sourceDir   string
+		source      string
+		stripPrefix string
+		expected    string
+	}{
+		// Test case 1
+		{
+			sourceDir:   "/home/user/documents",
+			source:      "/home/user/documents/file.txt",
+			stripPrefix: "output-",
+			expected:    "output-file.txt",
+		},
+		// Test case 2
+		{
+			sourceDir:   "assets",
+			source:      "assets/images/logo.png",
+			stripPrefix: "",
+			expected:    "images/logo.png",
+		},
+		// Test case 3
+		{
+			sourceDir:   "/var/www/html",
+			source:      "/var/www/html/pages/index.html",
+			stripPrefix: "web",
+			expected:    "webpages/index.html",
+		},
+		// Test case 4
+		{
+			sourceDir:   "dist",
+			source:      "dist/js/app.js",
+			stripPrefix: "public",
+			expected:    "publicjs/app.js",
+		},
+	}
+
+	for _, tc := range tests {
+		result := resolveSource(tc.sourceDir, tc.source, tc.stripPrefix)
+		if result != tc.expected {
+			t.Errorf("Expected: %s, Got: %s", tc.expected, result)
+		}
+	}
+}